diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 21:27:49 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 21:27:49 +0000 |
| commit | 432b80cefaf9e5ddaa9e2b1d452744029fca27a7 (patch) | |
| tree | 9284bb0e7887c0a91b2e9b0e0be331f10adc1e9c /java | |
| parent | - Update to 0.6.18 (diff) | |
Fix web plugin crash with Firefox 14.
PR: ports/170352
Obtained from: IcedTea Project (PR1106)
Notes
Notes:
svn path=/head/; revision=302483
Diffstat (limited to 'java')
| -rw-r--r-- | java/icedtea-web/Makefile | 1 | ||||
| -rw-r--r-- | java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index db9b0ed21855..a1df183c7a64 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -7,6 +7,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://icedtea.classpath.org/download/source/ diff --git a/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc b/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc new file mode 100644 index 000000000000..6e20ebe7c923 --- /dev/null +++ b/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc @@ -0,0 +1,17 @@ +--- plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 02 09:11:37 2012 -0400 ++++ plugin/icedteanp/IcedTeaNPPlugin.cc Tue Aug 07 10:59:11 2012 -0400 +@@ -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; + } |