pajoye Thu, 28 Jul 2011 11:01:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313835
Log: - Fix #55301 (mssql 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/mssql/php_mssql.c U php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c U php/php-src/trunk/ext/mssql/php_mssql.c Modified: php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC (rev 313834) +++ php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC (rev 313835) @@ -685,6 +685,13 @@ /* hash it up */ mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link)); + if (!mssql_ptr) { + efree(hashed_details); + dbfreelogin(mssql.login); + dbclose(mssql.link); + RETURN_FALSE; + } + memcpy(mssql_ptr, &mssql, sizeof(mssql_link)); Z_TYPE(new_le) = le_plink; new_le.ptr = mssql_ptr; Modified: php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC (rev 313834) +++ php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC (rev 313835) @@ -685,6 +685,13 @@ /* hash it up */ mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link)); + if (!mssql_ptr) { + efree(hashed_details); + dbfreelogin(mssql.login); + dbclose(mssql.link); + RETURN_FALSE; + } + memcpy(mssql_ptr, &mssql, sizeof(mssql_link)); Z_TYPE(new_le) = le_plink; new_le.ptr = mssql_ptr; Modified: php/php-src/trunk/ext/mssql/php_mssql.c =================================================================== --- php/php-src/trunk/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC (rev 313834) +++ php/php-src/trunk/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC (rev 313835) @@ -685,6 +685,13 @@ /* hash it up */ mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link)); + if (!mssql_ptr) { + efree(hashed_details); + dbfreelogin(mssql.login); + dbclose(mssql.link); + RETURN_FALSE; + } + memcpy(mssql_ptr, &mssql, sizeof(mssql_link)); Z_TYPE(new_le) = le_plink; new_le.ptr = mssql_ptr;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
