1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Fix web plugin crash with Firefox 14.

PR:		ports/170352
Obtained from:	IcedTea Project (PR1106)
This commit is contained in:
Jung-uk Kim 2012-08-13 21:27:49 +00:00
parent fe6e4612ca
commit 432b80cefa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=302483
2 changed files with 18 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= icedtea-web
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= java www
MASTER_SITES= http://icedtea.classpath.org/download/source/

View File

@ -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;
}