Mercurial > hg > release > icedtea6-1.12
view patches/openjdk/7006270-regressions.patch @ 3004:08ce3247b5b0
Add 2013/06/18 security patches.
2013-06-22 Andrew John Hughes <gnu.andrew@member.fsf.org>
* patches/idresolver_fix.patch:
Removed. Part of 6469266.
* Makefile.am:
(SECURITY_PATCHES): Add new ones.
(SPECIAL_SECURITY_PATCH_1): Renamed from
SPECIAL_SECURITY_PATCH.
(SPECIAL_SECURITY_PATCH_2): Add 8009071, which
needs to be applied after some AWT backports.
(ICEDTEA_PATCHES): Use SPECIAL_SECURITY_PATCH_{1,2}.
Move 8005615, 8007393 & 8007611 to SECURITY_PATCHES
as must be applied before 8004584. Add 7171223 to
end.
* patches/openjdk/6307603-xrender-01.patch,
* patches/openjdk/6469266-xmlsec_1.4.2.patch,
* patches/openjdk/6656651-windows_lcd_glyphs.patch,
* patches/openjdk/6786028-wcag_bold_tags.patch,
* patches/openjdk/6786682-wcag_lang.patch,
* patches/openjdk/6786688-wcag_table.patch,
* patches/openjdk/6786690-wcag_dl.patch,
* patches/openjdk/6802694-no_deprecated.patch,
* patches/openjdk/6851834-restructure.patch,
* patches/openjdk/6888167-medialib_memory_leaks.patch,
* patches/openjdk/6961178-doclet_xml.patch,
* patches/openjdk/6990754-use_native_memory_for_symboltable.patch,
* patches/openjdk/7006270-regressions.patch,
* patches/openjdk/7008809-report_class_in_arraystoreexception.patch,
* patches/openjdk/7014851-unused_parallel_compaction_code.patch,
* patches/openjdk/7017732-move_static_fields_to_class.patch,
* patches/openjdk/7036747-elfstringtable.patch,
* patches/openjdk/7086585-flexible_field_injection.patch,
* patches/openjdk/7171223-strict_aliasing.patch,
* patches/openjdk/7195301-no_instanceof_node.patch,
* patches/security/20130618/6741606-apache_santuario.patch,
* patches/security/20130618/7158805-nested_subroutine_rewriting.patch,
* patches/security/20130618/7170730-windows_network_stack.patch,
* patches/security/20130618/8000638-improve_deserialization.patch,
* patches/security/20130618/8000642-better_transportation_handling.patch,
* patches/security/20130618/8001032-restrict_object_access-corba.patch,
* patches/security/20130618/8001032-restrict_object_access-jdk.patch,
* patches/security/20130618/8001033-refactor_address_handling.patch,
* patches/security/20130618/8001034-memory_management.patch,
* patches/security/20130618/8001038-resourcefully_handle_resources.patch,
* patches/security/20130618/8001043-clarify_definition_restrictions.patch,
* patches/security/20130618/8001309-better_handling_of_annotation_interfaces.patch,
* patches/security/20130618/8001318-6_fixup.patch,
* patches/security/20130618/8001318-socket_getlocaladdress_consistency.patch,
* patches/security/20130618/8001330-checking_order_improvement.patch,
* patches/security/20130618/8001330-improve_checking_order.patch,
* patches/security/20130618/8003703-update_rmi_connection_dialog.patch,
* patches/security/20130618/8004584-augment_applet_contextualization.patch,
* patches/security/20130618/8005007-better_glyph_processing.patch,
* patches/security/20130618/8006328-6_fixup.patch,
* patches/security/20130618/8006328-sound_class_robustness.patch,
* patches/security/20130618/8006611-improve_scripting.patch,
* patches/security/20130618/8007467-improve_jmx_internal_api_robustness.patch,
* patches/security/20130618/8007471-6_fixup.patch,
* patches/security/20130618/8007471-improve_mbean_notifications.patch,
* patches/security/20130618/8007812-getenclosingmethod.patch,
* patches/security/20130618/8008120-improve_jmx_class_checking.patch,
* patches/security/20130618/8008124-better_compliance_testing.patch,
* patches/security/20130618/8008128-better_jmx_api_coherence.patch,
* patches/security/20130618/8008132-better_serialization.patch,
* patches/security/20130618/8008585-jmx_data_handling.patch,
* patches/security/20130618/8008593-better_urlclassloader.patch,
* patches/security/20130618/8008603-jmx_provider_provision.patch,
* patches/security/20130618/8008611-6_fixup.patch,
* patches/security/20130618/8008611-jmx_annotations.patch,
* patches/security/20130618/8008615-jmx_internal_api_robustness.patch,
* patches/security/20130618/8008623-mbeanserver_handling.patch,
* patches/security/20130618/8008744-6741606_rework.patch,
* patches/security/20130618/8008982-jmx_interface_changes.patch,
* patches/security/20130618/8009004-rmi_connection_improvement.patch,
* patches/security/20130618/8009013-t2k_glyphs.patch,
* patches/security/20130618/8009034-jmx_notification_improvement.patch,
* patches/security/20130618/8009038-jmx_notification_support_improvement.patch,
* patches/security/20130618/8009067-improve_key_storing.patch,
* patches/security/20130618/8009071-improve_shape_handling.patch,
* patches/security/20130618/8009235-improve_tsa_data_handling.patch,
* patches/security/20130618/8009554-serialjavaobject.patch,
* patches/security/20130618/8011243-improve_imaginglib.patch,
* patches/security/20130618/8011248-better_component_rasters.patch,
* patches/security/20130618/8011253-better_short_component_rasters.patch,
* patches/security/20130618/8011257-better_byte_component_rasters.patch,
* patches/security/20130618/8011557-improve_reflection.patch,
* patches/security/20130618/8012375-javadoc_framing.patch,
* patches/security/20130618/8012421-better_positioning.patch,
* patches/security/20130618/8012438-better_image_validation.patch,
* patches/security/20130618/8012597-better_image_channel_validation.patch,
* patches/security/20130618/8012601-better_layout_validation.patch,
* patches/security/20130618/8014281-better_xml_signature_checking.patch,
* patches/security/20130618/8015997-more_javadoc_framing.patch,
* patches/security/20130618/diamond_fix.patch,
* patches/security/20130618/handle_npe.patch,
* patches/security/20130618/hs_merge-01.patch,
* patches/security/20130618/hs_merge-02.patch,
* patches/security/20130618/hs_merge-03.patch,
* patches/security/20130618/hs_merge-04.patch,
* patches/security/20130618/javac_issue.patch,
* patches/security/20130618/langtools_generics.patch,
* patches/security/20130618/langtools_merge-01.patch,
* patches/security/20130618/langtools_merge-02.patch,
* patches/security/20130618/langtools_merge-03.patch:
2013/06/18 security patches.
* patches/apache-xml-internal-fix-bug-38655.patch: Remove.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Sat, 22 Jun 2013 16:38:24 -0500 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User bpatel # Date 1292276687 28800 # Node ID 445134ee98c84b6d139fab0f9a9d8718c686c63b # Parent 5761891cfee48bc9382dd68e5e1bf164cff9bfbf 7006270: Several javadoc regression tests are failing on windows Reviewed-by: jjg diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java @@ -239,7 +239,7 @@ Type superclass = Util.getFirstVisibleSuperClass(classDoc, configuration()); if (superclass != null) { - pre.addContent("\n"); + pre.addContent(DocletConstants.NL); pre.addContent("extends "); Content link = new RawHtml(getLink(new LinkInfoImpl( LinkInfoImpl.CONTEXT_CLASS_SIGNATURE_PARENT_NAME, @@ -257,7 +257,7 @@ continue; } if (counter == 0) { - pre.addContent("\n"); + pre.addContent(DocletConstants.NL); pre.addContent(isInterface? "extends " : "implements "); } else { pre.addContent(", "); diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java @@ -144,11 +144,12 @@ !configuration.nohelp) { HelpWriter.generate(configuration); } - // If a stylesheet file is not specified, copy the default stylesheet. + // If a stylesheet file is not specified, copy the default stylesheet + // and replace newline with platform-specific newline. if (configuration.stylesheetfile.length() == 0) { Util.copyFile(configuration, "stylesheet.css", Util.RESOURCESDIR, (configdestdir.isEmpty()) ? - System.getProperty("user.dir") : configdestdir, false); + System.getProperty("user.dir") : configdestdir, false, true); } } diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java @@ -216,15 +216,15 @@ public Content getAllClassesLinkScript(String id) { HtmlTree script = new HtmlTree(HtmlTag.SCRIPT); script.addAttr(HtmlAttr.TYPE, "text/javascript"); - String scriptCode = "<!--\n" + - " allClassesLink = document.getElementById(\"" + id + "\");\n" + - " if(window==top) {\n" + - " allClassesLink.style.display = \"block\";\n" + - " }\n" + - " else {\n" + - " allClassesLink.style.display = \"none\";\n" + - " }\n" + - " //-->\n"; + String scriptCode = "<!--" + DocletConstants.NL + + " allClassesLink = document.getElementById(\"" + id + "\");" + DocletConstants.NL + + " if(window==top) {" + DocletConstants.NL + + " allClassesLink.style.display = \"block\";" + DocletConstants.NL + + " }" + DocletConstants.NL + + " else {" + DocletConstants.NL + + " allClassesLink.style.display = \"none\";" + DocletConstants.NL + + " }" + DocletConstants.NL + + " //-->" + DocletConstants.NL; Content scriptContent = new RawHtml(scriptCode); script.addContent(scriptContent); Content div = HtmlTree.DIV(script); diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java @@ -82,9 +82,9 @@ */ public void write(StringBuilder contentBuilder) { if (!endsWithNewLine(contentBuilder)) - contentBuilder.append("\n"); + contentBuilder.append(DocletConstants.NL); contentBuilder.append("<!-- "); contentBuilder.append(commentText); - contentBuilder.append(" -->\n"); + contentBuilder.append(" -->" + DocletConstants.NL); } } diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java @@ -48,7 +48,7 @@ */ private DocType(String type, String dtd) { docType = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 " + type + - "//EN\" \"" + dtd + "\">\n"; + "//EN\" \"" + dtd + "\">" + DocletConstants.NL; } /** diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java @@ -753,7 +753,7 @@ */ public void write(StringBuilder contentBuilder) { if (!isInline() && !endsWithNewLine(contentBuilder)) - contentBuilder.append("\n"); + contentBuilder.append(DocletConstants.NL); String tagString = htmlTag.toString(); contentBuilder.append("<" + tagString); Iterator<HtmlAttr> iterator = attrs.keySet().iterator(); @@ -772,6 +772,6 @@ if (htmlTag.endTagRequired()) contentBuilder.append("</" + tagString + ">"); if (!isInline()) - contentBuilder.append("\n"); + contentBuilder.append(DocletConstants.NL); } } diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java @@ -287,11 +287,11 @@ HtmlTree script = new HtmlTree(HtmlTag.SCRIPT); if(winTitle != null && winTitle.length() > 0) { script.addAttr(HtmlAttr.TYPE, "text/javascript"); - String scriptCode = "<!--\n" + - " if (location.href.indexOf('is-external=true') == -1) {\n" + - " parent.document.title=\"" + winTitle + "\";\n" + - " }\n" + - "//-->\n"; + String scriptCode = "<!--" + DocletConstants.NL + + " if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL + + " parent.document.title=\"" + winTitle + "\";" + DocletConstants.NL + + " }" + DocletConstants.NL + + "//-->" + DocletConstants.NL; RawHtml scriptContent = new RawHtml(scriptCode); script.addContent(scriptContent); } @@ -306,15 +306,15 @@ protected Content getFramesetJavaScript(){ HtmlTree script = new HtmlTree(HtmlTag.SCRIPT); script.addAttr(HtmlAttr.TYPE, "text/javascript"); - String scriptCode = "\n targetPage = \"\" + window.location.search;\n" + - " if (targetPage != \"\" && targetPage != \"undefined\")\n" + - " targetPage = targetPage.substring(1);\n" + - " if (targetPage.indexOf(\":\") != -1)\n" + - " targetPage = \"undefined\";\n" + - " function loadFrames() {\n" + - " if (targetPage != \"\" && targetPage != \"undefined\")\n" + - " top.classFrame.location = top.targetPage;\n" + - " }\n"; + String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + + " targetPage = targetPage.substring(1);" + DocletConstants.NL + + " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + + " targetPage = \"undefined\";" + DocletConstants.NL + + " function loadFrames() {" + DocletConstants.NL + + " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + + " top.classFrame.location = top.targetPage;" + DocletConstants.NL + + " }" + DocletConstants.NL; RawHtml scriptContent = new RawHtml(scriptCode); script.addContent(scriptContent); return script; diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java @@ -101,6 +101,6 @@ */ public boolean endsWithNewLine(StringBuilder contentBuilder) { return ((contentBuilder.length() == 0) || - (contentBuilder.substring(contentBuilder.length() - 1).equals("\n"))); + (contentBuilder.toString().endsWith(DocletConstants.NL))); } } diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java --- openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java +++ openjdk/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java @@ -211,14 +211,14 @@ try { while ((len = input.read(bytearr)) != -1) { output.write(bytearr, 0, len); - } + } } catch (FileNotFoundException exc) { } catch (SecurityException exc) { - } finally { + } finally { input.close(); output.close(); + } } - } /** * Copy the given directory contents from the source package directory @@ -330,7 +330,7 @@ String resourcefile, boolean overwrite) { String destresourcesdir = configuration.destDirName + RESOURCESDIR; copyFile(configuration, resourcefile, RESOURCESDIR, destresourcesdir, - overwrite); + overwrite, false); } /** @@ -345,23 +345,46 @@ * @param overwrite A flag to indicate whether the file in the * destination directory will be overwritten if * it already exists. + * @param replaceNewLine true if the newline needs to be replaced with platform- + * specific newline. */ public static void copyFile(Configuration configuration, String file, String source, - String destination, boolean overwrite) { + String destination, boolean overwrite, boolean replaceNewLine) { DirectoryManager.createDirectory(configuration, destination); File destfile = new File(destination, file); if(destfile.exists() && (! overwrite)) return; try { InputStream in = Configuration.class.getResourceAsStream( - source + DirectoryManager.URL_FILE_SEPARATOR + file); + source + DirectoryManager.URL_FILE_SEPARATOR + file); if(in==null) return; OutputStream out = new FileOutputStream(destfile); - byte[] buf = new byte[2048]; - int n; - while((n = in.read(buf))>0) out.write(buf,0,n); - in.close(); - out.close(); - } catch(Throwable t) {} + try { + if (!replaceNewLine) { + byte[] buf = new byte[2048]; + int n; + while((n = in.read(buf))>0) out.write(buf,0,n); + } else { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out)); + try { + String line; + while ((line = reader.readLine()) != null) { + writer.write(line); + writer.write(DocletConstants.NL); + } + } finally { + reader.close(); + writer.close(); + } + } + } finally { + in.close(); + out.close(); + } + } catch (IOException ie) { + ie.printStackTrace(); + throw new DocletAbortException(); + } } /** diff --git a/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java b/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java --- openjdk/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java +++ openjdk/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java @@ -44,6 +44,7 @@ private static final String BUGID = "6851834"; private static final String BUGNAME = "TestHtmlDocument"; private static final String FS = System.getProperty("file.separator"); + private static final String LS = System.getProperty("line.separator"); private static String srcdir = System.getProperty("test.src", "."); // Entry point @@ -143,13 +144,17 @@ System.out.println("\nFILE DOES NOT EXIST: " + filename); } BufferedReader in = new BufferedReader(new FileReader(file)); + StringBuilder fileString = new StringBuilder(); // Create an array of characters the size of the file - char[] allChars = new char[(int)file.length()]; - // Read the characters into the allChars array - in.read(allChars, 0, (int)file.length()); - in.close(); - // Convert to a string - String allCharsString = new String(allChars); - return allCharsString; + try { + String line; + while ((line = in.readLine()) != null) { + fileString.append(line); + fileString.append(LS); + } + } finally { + in.close(); + } + return fileString.toString(); } }