svn commit: r417848 - in branches/2016Q2/textproc/expat2: . files

[Mark Felder]

Author: feld
Date: Thu Jun 30 22:36:53 2016
New Revision: 417848
URL: https://svnweb.freebsd.org/changeset/ports/417848

Log:
  MFH: r417847
  
  textproc/expat2: Patch vulnerability
  
  This patch resolves a vulnerability that may still exist due to
  compiler optimizations. The previous patches for CVE-2015-1283 and
  CVE-2015-2716 may not work as intended in some situations.
  
  Security:	CVE-2016-4472
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2016Q2/textproc/expat2/files/patch-CVE-2016-4472
     - copied unchanged from r417847, head/textproc/expat2/files/patch-CVE-2016-4472
Modified:
  branches/2016Q2/textproc/expat2/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/textproc/expat2/Makefile
==============================================================================
--- branches/2016Q2/textproc/expat2/Makefile	Thu Jun 30 22:36:05 2016	(r417847)
+++ branches/2016Q2/textproc/expat2/Makefile	Thu Jun 30 22:36:53 2016	(r417848)
@@ -3,7 +3,7 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 

Copied: branches/2016Q2/textproc/expat2/files/patch-CVE-2016-4472 (from r417847, head/textproc/expat2/files/patch-CVE-2016-4472)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/textproc/expat2/files/patch-CVE-2016-4472	Thu Jun 30 22:36:53 2016	(r417848, copy of r417847, head/textproc/expat2/files/patch-CVE-2016-4472)
@@ -0,0 +1,26 @@
+ expat/CMakeLists.txt |  3 +++
+ expat/lib/xmlparse.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 44 insertions(+), 7 deletions(-)
+
+--- lib/xmlparse.c.orig	2016-06-30 22:23:11 UTC
++++ lib/xmlparse.c
+@@ -1693,7 +1693,8 @@ XML_GetBuffer(XML_Parser parser, int len
+   }
+ 
+   if (len > bufferLim - bufferEnd) {
+-    int neededSize = len + (int)(bufferEnd - bufferPtr);
++    /* Do not invoke signed arithmetic overflow: */
++    int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr));
+     if (neededSize < 0) {
+       errorCode = XML_ERROR_NO_MEMORY;
+       return NULL;
+@@ -1725,7 +1726,8 @@ XML_GetBuffer(XML_Parser parser, int len
+       if (bufferSize == 0)
+         bufferSize = INIT_BUFFER_SIZE;
+       do {
+-        bufferSize *= 2;
++        /* Do not invoke signed arithmetic overflow: */
++        bufferSize = (int) (2U * (unsigned) bufferSize);
+       } while (bufferSize < neededSize && bufferSize > 0);
+       if (bufferSize <= 0) {
+         errorCode = XML_ERROR_NO_MEMORY;