Mercurial > hg > release > icedtea6-1.13
view patches/pr2513-layoutengine_reset.patch @ 3229:ae390d52ddeb
Add backports destined for the next update, 1.13.9.
S6440786, PR363: Cannot create a ZIP file containing zero entries
S6599383, PR363: Unable to open zip files more than 2GB in size
S6929479, PR363: Add a system property sun.zip.disableMemoryMapping to disable mmap use in ZipFile
S7105461, PR2662: Large JTables are not rendered correctly with Xrender pipeline
S7150134, PR2662: JCK api/java_awt/Graphics/index.html#DrawLine fails with OOM for jdk8 with XRender pipeline
PR2513: Reset success following calls in LayoutManager.cpp
2015-10-12 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/6440786-pr363-zero_entry_zips.patch,
* patches/openjdk/6599383-pr363-large_zip_files.patch,
* patches/openjdk/6929479-pr363-disable_mmap_zip.patch,
* patches/openjdk/7105461-pr2662-xrender_jtables.patch,
* patches/openjdk/7150134-pr2662-xrender_drawline_oom.patch,
* patches/pr2513-layoutengine_reset.patch:
New backports for issues to be fixed in 1.13.9.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 27 Oct 2015 18:34:34 +0000 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User andrew # Date 1443896894 -3600 # Sat Oct 03 19:28:14 2015 +0100 # Node ID 32f25e4cc4aa55ed72c9d2d92cdc54d085a0b851 # Parent 7dd31da3f90a3f631be8ee3083264f9815c10973 PR2513: Reset success following calls in LayoutManager.cpp diff -Nru openjdk.orig/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp openjdk/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp --- openjdk.orig/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2015-07-20 17:22:21.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2015-10-05 01:40:33.895560477 +0100 @@ -661,6 +661,10 @@ break; } } else { + if (LE_FAILURE(success)) { + // Reset if gsubTable failed + success = LE_NO_ERROR; + } LEReferenceTo<MorphTableHeader> mortTable(fontInstance, mortTableTag, success); if (LE_SUCCESS(success) && mortTable.isValid() && SWAPL(mortTable->version)==0x00010000) { // mort