Date: Mon, 13 Aug 2012 21:27:49 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302483 - in head/java/icedtea-web: . files Message-ID: <201208132127.q7DLRnk3096228@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Aug 13 21:27:49 2012 New Revision: 302483 URL: http://svn.freebsd.org/changeset/ports/302483 Log: Fix web plugin crash with Firefox 14. PR: ports/170352 Obtained from: IcedTea Project (PR1106) Added: head/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc (contents, props changed) Modified: head/java/icedtea-web/Makefile Modified: head/java/icedtea-web/Makefile ============================================================================== --- head/java/icedtea-web/Makefile Mon Aug 13 19:56:30 2012 (r302482) +++ head/java/icedtea-web/Makefile Mon Aug 13 21:27:49 2012 (r302483) @@ -7,6 +7,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://icedtea.classpath.org/download/source/ Added: head/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/icedtea-web/files/patch-plugin-icedteanp-IcedTeaNPPlugin.cc Mon Aug 13 21:27:49 2012 (r302483) @@ -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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208132127.q7DLRnk3096228>