rpms/php/FC-5 php-5.1.6-CVE-2006-4812.patch,NONE,1.1

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/php/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26927

Added Files:
	php-5.1.6-CVE-2006-4812.patch 
Log Message:
- add the patch


php-5.1.6-CVE-2006-4812.patch:
 zend_alloc.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE php-5.1.6-CVE-2006-4812.patch ---
--- php-5.1.6/Zend/zend_alloc.c.ecalloc
+++ php-5.1.6/Zend/zend_alloc.c
@@ -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;
 }