- Completed the fix for bug #52010

# Fixing pdo drivers
16 years ago · 31321a87ac
3 changed files with 4 additions and 2 deletions
--- a/2
+++ b/2
@ -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)
--- 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) {
--- 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) {