rasmus Thu, 12 Nov 2009 08:20:57 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290573
Log: Fix for bug #49098 Bug: http://bugs.php.net/49098 (Closed) Using custom session handler causes segfault in session_save_state Changed paths: U php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c Modified: php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c 2009-11-12 07:02:58 UTC (rev 290572) +++ php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c 2009-11-12 08:20:57 UTC (rev 290573) @@ -1003,7 +1003,11 @@ if (MyG(error_msg)) { efree(MyG(error_msg)); } - MyG(error_msg) = estrdup(mysql_err); + if(mysql_err && *mysql_err) { + MyG(error_msg) = estrdup(mysql_err); + } else { + MyG(error_msg) = NULL; + } } /* }}} */ Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2009-11-12 07:02:58 UTC (rev 290572) +++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2009-11-12 08:20:57 UTC (rev 290573) @@ -41,7 +41,11 @@ if (MyG(error_msg)) { efree(MyG(error_msg)); } - MyG(error_msg) = estrdup(mysql_err); + if(mysql_err && *mysql_err) { + MyG(error_msg) = estrdup(mysql_err); + } else { + MyG(error_msg) = NULL; + } } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
