rasmus                                   Thu, 12 Nov 2009 01:09:16 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=290570

Log:
Fix bug #49098

Bug: http://bugs.php.net/49098 (Open) Using custom session handler causes 
segfault in session_save_state
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c     2009-11-12 
01:08:10 UTC (rev 290569)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c     2009-11-12 
01:09:16 UTC (rev 290570)
@@ -46,7 +46,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

Reply via email to