Hello community, here is the log from the commit of package icedtea-web for openSUSE:12.2 checked in at 2012-08-08 21:54:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/icedtea-web (Old) and /work/SRC/openSUSE:12.2/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web", Maintainer is "bnc-team-j...@forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:12.2/icedtea-web/icedtea-web.changes 2012-08-04 09:15:56.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.icedtea-web.new/icedtea-web.changes 2012-08-08 21:54:53.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 8 12:55:43 UTC 2012 - mvysko...@suse.cz + +- fix PR1106: Icedtea 1.2.1 crashes Firefox 14 + * http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1106 + +------------------------------------------------------------------- New: ---- icedtea-web-pr1106-firefox-crash.patch icetea-web-1.2.1-old-xulrunner-typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.fNXvUj/_old 2012-08-08 21:54:53.000000000 +0200 +++ /var/tmp/diff_new_pack.fNXvUj/_new 2012-08-08 21:54:53.000000000 +0200 @@ -65,6 +65,11 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch +#PATCH-FIX-OPENSUSE: for old mozilla-xulrunner, already upstream +Patch2: icetea-web-1.2.1-old-xulrunner-typo.patch +#PATCH-FIX-UPSTREAM: crash with FF 14 +#http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1106 +Patch3: icedtea-web-pr1106-firefox-crash.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-1_7_0-openjdk-devel @@ -125,6 +130,10 @@ %setup -q %patch0 -p1 %patch1 -p1 +%if 0%{suse_version} <= 1120 +%patch2 -p1 +%endif +%patch3 -p1 %patch1000 -p1 ++++++ icedtea-web-pr1106-firefox-crash.patch ++++++ Index: icedtea-web-1.2.1/ChangeLog =================================================================== --- icedtea-web-1.2.1.orig/ChangeLog 2012-07-24 20:38:05.154359763 +0200 +++ icedtea-web-1.2.1/ChangeLog 2012-08-08 14:44:47.042059960 +0200 @@ -1,3 +1,10 @@ +2012-08-07 Adam Domurad <adomu...@redhat.com> + + Fixes PR1106, plugin crashing with firefox + archlinux/gentoo + * plugin/icedteanp/IcedTeaNPPlugin.cc + (initialize_browser_functions): Account for the fact that + browserTable->size can be larger than sizeof(NPNetscapeFuncs) + 2012-07-24 Deepak Bhole <dbh...@redhat.com> * configure.ac: Prepare for 1.2.1 Index: icedtea-web-1.2.1/NEWS =================================================================== --- icedtea-web-1.2.1.orig/NEWS 2012-07-24 20:38:05.155359749 +0200 +++ icedtea-web-1.2.1/NEWS 2012-08-08 14:45:12.747058745 +0200 @@ -17,6 +17,7 @@ - PR811: javaws is not handling urls with spaces (and other characters needing encoding) correctly - 816592: icedtea-web not loading GeoGebra java applets in Firefox or Chrome * Plugin + - PR1106: Buffer overflow in plugin table- - PR863: Error passing strings to applet methods in Chromium - PR895: IcedTea-Web searches for missing classes on each loadClass or findClass - PR518: NPString.utf8characters not guaranteed to be nul-terminated Index: icedtea-web-1.2.1/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== --- icedtea-web-1.2.1.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-08-08 14:43:56.826062333 +0200 +++ icedtea-web-1.2.1/plugin/icedteanp/IcedTeaNPPlugin.cc 2012-08-08 14:44:09.008061757 +0200 @@ -2053,8 +2053,13 @@ //Ensure any unused fields are NULL memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); + + //browserTable->size can be larger than sizeof(NPNetscapeFuncs) (PR1106) + size_t copySize = browserTable->size < sizeof(NPNetscapeFuncs) ? + browserTable->size : sizeof(NPNetscapeFuncs); + //Copy fields according to given size - memcpy(&browser_functions, browserTable, browserTable->size); + memcpy(&browser_functions, browserTable, copySize); return true; } ++++++ icetea-web-1.2.1-old-xulrunner-typo.patch ++++++ Index: icedtea-web-1.2.1/plugin/icedteanp/IcedTeaPluginUtils.cc =================================================================== --- icedtea-web-1.2.1.orig/plugin/icedteanp/IcedTeaPluginUtils.cc 2012-08-02 10:56:32.954210938 +0200 +++ icedtea-web-1.2.1/plugin/icedteanp/IcedTeaPluginUtils.cc 2012-08-02 11:13:41.286162332 +0200 @@ -903,9 +903,9 @@ IcedTeaPluginUtilities::NPVariantAsString(NPVariant variant) { #if MOZILLA_VERSION_COLLAPSED < 1090200 - return std::string(( + return std::string( NPVARIANT_TO_STRING(variant).utf8characters, - NPVARIANT_TO_STRING(variant).utf8ength); + NPVARIANT_TO_STRING(variant).utf8length); #else return std::string( NPVARIANT_TO_STRING(variant).UTF8Characters, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
