From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 13 21:27:50 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BB03106566B;
	Mon, 13 Aug 2012 21:27:50 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25E328FC14;
	Mon, 13 Aug 2012 21:27:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DLRnmL096231;
	Mon, 13 Aug 2012 21:27:50 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7DLRnk3096228;
	Mon, 13 Aug 2012 21:27:49 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201208132127.q7DLRnk3096228@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 13 Aug 2012 21:27:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302483 - in head/java/icedtea-web: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2012 21:27:50 -0000

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