All pastes #222376 Raw Edit

Untitled

public text v1 · immutable
#222376 ·published 2006-10-26 07:25 UTC
rendered paste body
diff -Nura php-5.1.6.orig/Zend/zend_alloc.c php-5.1.6/Zend/zend_alloc.c
--- php-5.1.6.orig/Zend/zend_alloc.c    2006-08-10 19:16:24.000000000 +0200
+++ php-5.1.6/Zend/zend_alloc.c 2006-10-09 09:36:32.000000000 +0200
@@ -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;
 }