[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sqlite3/sqlite3.c trunk/ext/sqlite3/sqlite3.c

[Ilia Alshanetsky]

iliaa                                    Wed, 09 Jun 2010 16:04:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300318

Log:
Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).

Bug: http://bugs.php.net/52010 (Open) open_basedir restrictions mismatch on 
vacuum command
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c
    U   php/php-src/trunk/ext/sqlite3/sqlite3.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-06-09 15:48:22 UTC (rev 300317)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-06-09 16:04:54 UTC (rev 300318)
@@ -67,6 +67,8 @@
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)

+- Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).
+  (Ilia)
 - Fixed bug #51991 (spl_autoload and *nix support with namespace). (Felipe)
 - Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with
   constant array). (Felipe)

Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c  2010-06-09 15:48:22 UTC 
(rev 300317)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c  2010-06-09 16:04:54 UTC 
(rev 300318)
@@ -1788,7 +1788,7 @@
        switch (access_type) {
                case SQLITE_ATTACH:
                {
-                       if (strncmp(arg3, ":memory:", sizeof(":memory:")-1)) {
+                       if (strncmp(arg3, ":memory:", sizeof(":memory:")-1) && 
*arg3) {
                                TSRMLS_FETCH();

 #if PHP_API_VERSION < 20100412

Modified: php/php-src/trunk/ext/sqlite3/sqlite3.c
===================================================================
--- php/php-src/trunk/ext/sqlite3/sqlite3.c     2010-06-09 15:48:22 UTC (rev 
300317)
+++ php/php-src/trunk/ext/sqlite3/sqlite3.c     2010-06-09 16:04:54 UTC (rev 
300318)
@@ -1788,7 +1788,7 @@
        switch (access_type) {
                case SQLITE_ATTACH:
                {
-                       if (strncmp(arg3, ":memory:", sizeof(":memory:")-1)) {
+                       if (strncmp(arg3, ":memory:", sizeof(":memory:")-1) && 
*arg3) {
                                TSRMLS_FETCH();

 #if PHP_API_VERSION < 20100412


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php