diff options
| author | Felipe Pena <felipe@php.net> | 2010-06-20 14:12:06 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-06-20 14:12:06 +0000 |
| commit | 31321a87ac7c69defc7c43e8147b49fb964cd985 (patch) | |
| tree | d66b93a48b060fcf03da4fcf7be92ca83281354a | |
| parent | eb6862369b95ed1abca96546457761dbddac6ded (diff) | |
| download | php-git-31321a87ac7c69defc7c43e8147b49fb964cd985.tar.gz | |
- Completed the fix for bug #52010
# Fixing pdo drivers
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 2 | ||||
| -rw-r--r-- | ext/sqlite/pdo_sqlite2.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jun 2010, PHP 5.2.14 - Fixed bug #52061 (memory_limit above 2G). (Felipe) +- Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command). + (Ilia, Felipe) 17 Jun 2010, PHP 5.2.14RC1 - Upgraded bundled PCRE to version 8.02. (Ilia) diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index d11d5735be..4173c0b8f7 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -642,7 +642,7 @@ static struct pdo_dbh_methods sqlite_methods = { static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { diff --git a/ext/sqlite/pdo_sqlite2.c b/ext/sqlite/pdo_sqlite2.c index 9943b3e086..3533e4b994 100644 --- a/ext/sqlite/pdo_sqlite2.c +++ b/ext/sqlite/pdo_sqlite2.c @@ -515,7 +515,7 @@ static struct pdo_dbh_methods sqlite2_methods = { static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { |