diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-13 18:03:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-13 18:03:06 +0100 |
| commit | 30d5432bfe2b44819cd01b47a8687912e1091e9d (patch) | |
| tree | cb6668213c9e6afc5f4062846c5e46d1c527daa7 /ext/sqlite3 | |
| parent | f43fe8cb4c7d70eab536ddae50a38824a5b32af9 (diff) | |
| parent | fece24f8f4750d4fb75b89f8b9bd69046edeb5a9 (diff) | |
| download | php-git-30d5432bfe2b44819cd01b47a8687912e1091e9d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/sqlite3')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 6f2656ab51..912cc9cb2d 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -117,7 +117,8 @@ 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))) { zend_throw_exception(zend_ce_exception, "Unable to expand filepath", 0); return; |