com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/sqlite3/sqlite3.c

From: Date: Sat, 13 Feb 2016 17:03:06 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/sqlite3/sqlite3.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91006@lists.php.net to get a copy of this message
Commit: 30d5432bfe2b44819cd01b47a8687912e1091e9d Author: Nikita Popov <nikic@php.net> Sat, 13 Feb 2016 18:03:06 +0100 Parents: f43fe8cb4c7d70eab536ddae50a38824a5b32af9 fece24f8f4750d4fb75b89f8b9bd69046edeb5a9 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30d5432bfe2b44819cd01b47a8687912e1091e9d Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/sqlite3/sqlite3.c Changed paths: MM ext/sqlite3/sqlite3.c Diff: diff --cc ext/sqlite3/sqlite3.c index 6f2656a,ce9472a..912cc9c --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@@ -117,9 -123,10 +117,10 @@@ PHP_METHOD(sqlite3, open if (strlen(filename) != filename_len) { return; } - if (memcmp(filename, ":memory:", sizeof(":memory:")) != 0) { + if (filename_len != sizeof(":memory:")-1 || + memcmp(filename, ":memory:", sizeof(":memory:")-1) != 0) { - if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) { - zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unable to expand filepath", 0 TSRMLS_CC); + if (!(fullpath = expand_filepath(filename, NULL))) { + zend_throw_exception(zend_ce_exception, "Unable to expand filepath", 0); return; }

« previous php.cvs (#91006) next »