[Pkg-php-commits] r1070 - php4/branches/etch/debian/patches

[Sean Finney]

Author: seanius
Date: 2008-05-13 21:41:33 +0000 (Tue, 13 May 2008)
New Revision: 1070

Modified:
   php4/branches/etch/debian/patches/134-CVE-2008-1384.patch
Log:
stab 2

Modified: php4/branches/etch/debian/patches/134-CVE-2008-1384.patch
===================================================================
--- php4/branches/etch/debian/patches/134-CVE-2008-1384.patch	2008-05-13 19:22:50 UTC (rev 1069)
+++ php4/branches/etch/debian/patches/134-CVE-2008-1384.patch	2008-05-13 21:41:33 UTC (rev 1070)
@@ -17,7 +17,7 @@
  
 -	req_size = *pos + MAX(min_width, copy_len) + 1;
 +	if(m_width > INT_MAX - *pos - 1) {
-+		zend_error_noreturn(E_ERROR, "Field width %d is too long", m_width);
++		zend_error(E_ERROR, "Field width %d is too long", m_width);
 +	}
 +
 +	req_size = *pos + m_width + 1;
@@ -25,7 +25,7 @@
  	if (req_size > *size) {
  		while (req_size > *size) {
 +			if(*size > INT_MAX/2) {
-+				zend_error_noreturn(E_ERROR, "Field width %d is too long", req_size); 
++				zend_error(E_ERROR, "Field width %d is too long", req_size); 
 +			}
  			*size <<= 1;
  		}