components/php-5_3/zendopcache/patches/php_20936509.patch
changeset 4987 6a82655eda42
parent 4986 90a869b3f47a
child 4988 4b69c7c7e09b
equal deleted inserted replaced
4986:90a869b3f47a 4987:6a82655eda42
     1 CVE-2015-1351
       
     2 Community BUG:
       
     3 https://bugs.php.net/bug.php?id=68677
       
     4 Community CODE:
       
     5 http://git.php.net/?p=php-src.git;a=commit;h=777c39f4042327eac4b63c7ee87dc1c7a09a3115
       
     6 This patch was created from the community reports above.
       
     7 
       
     8 
       
     9 --- zendopcache-7.0.2/zend_shared_alloc.c_orig	2015-06-10 13:25:02.003036264 -0700
       
    10 +++ zendopcache-7.0.2/zend_shared_alloc.c	2015-06-10 13:25:50.714271495 -0700
       
    11 @@ -346,10 +346,10 @@
       
    12  	retval = ZCG(mem);;
       
    13  	ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size));
       
    14  	memcpy(retval, source, size);
       
    15 +	zend_shared_alloc_register_xlat_entry(source, retval);
       
    16  	if (free_source) {
       
    17  		interned_efree((char*)source);
       
    18  	}
       
    19 -	zend_shared_alloc_register_xlat_entry(source, retval);
       
    20  	return retval;
       
    21  }
       
    22