Browse Source

Daniel Jahre:

updated php5 to version 5.2.0
	this is a SECURITY update


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7963 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Daniel Jahre 18 years ago
parent
commit
ae773c8467
2 changed files with 2 additions and 33 deletions
  1. +2
    -2
      package/alessandro/php/php.desc
  2. +0
    -31
      package/alessandro/php/php5/CVE-2006-4812.patch

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

@ -44,9 +44,9 @@
#endif
#if xpkg == php5
[V] 5.1.6 1
[V] 5.2.0
[O] pear_version=2006-05-17
[D] 499767077 php-5.1.6.tar.bz2 http://static.php.net/www.php.net/distributions/
[D] 3372399683 php-5.2.0.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
#endif

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

@ -1,31 +0,0 @@
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