Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 18 years ago
parent
commit
dc30c93c5a
2 changed files with 32 additions and 1 deletions
  1. +1
    -1
      package/alessandro/php/php.desc
  2. +31
    -0
      package/alessandro/php/php5/CVE-2006-4812.patch

+ 1
- 1
package/alessandro/php/php.desc

@ -44,7 +44,7 @@
#endif #endif
#if xpkg == php5 #if xpkg == php5
[V] 5.1.6
[V] 5.1.6 1
[O] pear_version=2006-05-17 [O] pear_version=2006-05-17
[D] 499767077 php-5.1.6.tar.bz2 http://static.php.net/www.php.net/distributions/ [D] 499767077 php-5.1.6.tar.bz2 http://static.php.net/www.php.net/distributions/
[D] 3500472770 install-pear-nozlib-2006-05-17.phar !http://pear.php.net/install-pear-nozlib.phar [D] 3500472770 install-pear-nozlib-2006-05-17.phar !http://pear.php.net/install-pear-nozlib.phar

+ 31
- 0
package/alessandro/php/php5/CVE-2006-4812.patch

@ -0,0 +1,31 @@
diff -Nura php-5.1.6.orig/Zend/zend_alloc.c php-5.1.6/Zend/zend_alloc.c
--- ./Zend/zend_alloc.c 2006-08-10 19:16:24.000000000 +0200
+++ ./Zend/zend_alloc.c 2006-10-09 09:36:32.000000000 +0200
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_alloc.c,v 1.144.2.4 2006/08/10 17:16:24 iliaa Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.5 2006/09/30 17:15:23 iliaa Exp $ */
#include "zend.h"
#include "zend_alloc.h"
@@ -328,15 +328,14 @@
ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
void *p;
- int final_size = size*nmemb;
-
+
HANDLE_BLOCK_INTERRUPTIONS();
- p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+ p = _safe_emalloc(nmemb, size, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
if (!p) {
HANDLE_UNBLOCK_INTERRUPTIONS();
return (void *) p;
}
- memset(p, 0, final_size);
+ memset(p, 0, size * nmemb);
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
}

Loading…
Cancel
Save