svn: /php/php-src/branches/PHP_5_3/ext/sqlite/ sqlite.c
| From: | Pierre Joye | Date: | Sat, 18 Dec 2010 12:08:50 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/ext/sqlite/ sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64165@lists.php.net to get a copy of this message | ||
pajoye Sat, 18 Dec 2010 12:08:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=306429
Log:
- fix possible crash introduced by the null poisoning patch
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sqlite/sqlite.c
Modified: php/php-src/branches/PHP_5_3/ext/sqlite/sqlite.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite/sqlite.c 2010-12-18 12:06:58 UTC (rev 306428)
+++ php/php-src/branches/PHP_5_3/ext/sqlite/sqlite.c 2010-12-18 12:08:50 UTC (rev 306429)
@@ -1641,8 +1641,10 @@
}
if (strlen(filename) != filename_len) {
+ zend_restore_error_handling(&error_handling TSRMLS_CC);
RETURN_FALSE;
}
+
if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
/* resolve the fully-qualified path name to use as the hash key */
if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
@@ -1697,6 +1699,7 @@
}
if (strlen(filename) != filename_len) {
+ zend_restore_error_handling(&error_handling TSRMLS_CC);
RETURN_FALSE;
}