diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-02-15 10:29:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-02-15 10:29:28 +0800 |
| commit | 5e152f54ae2d431d983476edd822eb522f39743f (patch) | |
| tree | 2efddaa4a34215ffaec576cd086f49f980d644f2 /ext/sqlite3/sqlite3.c | |
| parent | 35f6f9b0dbc683812badf3a8e38d1ec110fd7925 (diff) | |
| parent | aa10fc6092ab190751abafcf4b51713344aa583a (diff) | |
| download | php-git-5e152f54ae2d431d983476edd822eb522f39743f.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:/php-src:
update NEWS
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Check length of string before comparing to :memory:
Fix bounds check in strip_tags()
Fix test description
FIx bug #71569
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -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 f7f76cd3fb..ce9472a714 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -123,7 +123,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 TSRMLS_CC))) { zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Unable to expand filepath", 0 TSRMLS_CC); return; |