svn: /php/php-src/ branches/PHP_5_3/ext/curl/interface.c branches/PHP_5_4/ext/curl/interface.c trunk/ext/curl/interface.c

pajoye Thu, 28 Jul 2011 10:31:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313826 Log: - Fix #55301 (curl part) check if malloc succeded Bug: https://bugs.php.net/55301 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/interface.c U php/php-src/branches/PHP_5_4/ext/curl/interface.c U php/php-src/trunk/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-07-28 10:27:23 UTC (rev 313825) +++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-07-28 10:31:34 UTC (rev 313826) @@ -821,6 +821,9 @@ int i, c = CRYPTO_num_locks(); php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T)); + if (!php_curl_openssl_tsl) { + return FAILURE; + } for (i = 0; i < c; ++i) { php_curl_openssl_tsl[i] = tsrm_mutex_alloc(); Modified: php/php-src/branches/PHP_5_4/ext/curl/interface.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-07-28 10:27:23 UTC (rev 313825) +++ php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-07-28 10:31:34 UTC (rev 313826) @@ -819,6 +819,9 @@ int i, c = CRYPTO_num_locks(); php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T)); + if (!php_curl_openssl_tsl) { + return FAILURE; + } for (i = 0; i < c; ++i) { php_curl_openssl_tsl[i] = tsrm_mutex_alloc(); Modified: php/php-src/trunk/ext/curl/interface.c =================================================================== --- php/php-src/trunk/ext/curl/interface.c 2011-07-28 10:27:23 UTC (rev 313825) +++ php/php-src/trunk/ext/curl/interface.c 2011-07-28 10:31:34 UTC (rev 313826) @@ -819,6 +819,9 @@ int i, c = CRYPTO_num_locks(); php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T)); + if (!php_curl_openssl_tsl) { + return FAILURE; + } for (i = 0; i < c; ++i) { php_curl_openssl_tsl[i] = tsrm_mutex_alloc();