]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorAnatol Belski <ab@php.net>
Thu, 11 Jun 2020 11:23:35 +0000 (13:23 +0200)
committerAnatol Belski <ab@php.net>
Thu, 11 Jun 2020 11:23:35 +0000 (13:23 +0200)
* PHP-7.4:
  sqlite3: Fix possible use after free

1  2 
ext/sqlite3/sqlite3.c

index 895a1b0cfd739103b68975a4ef030184bfb6868f,80f57a450868c9bacbbc8461edac2885d76ac786..c309d5d545e053cbcc2a2460f931907459bf43d6
@@@ -148,12 -149,12 +148,12 @@@ PHP_METHOD(SQLite3, open
                return;
        }
  
 -#if SQLITE_HAS_CODEC
 +#ifdef SQLITE_HAS_CODEC
        if (encryption_key_len > 0) {
                if (sqlite3_key(db_obj->db, encryption_key, encryption_key_len) != SQLITE_OK) {
-                       sqlite3_close(db_obj->db);
                        zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s", sqlite3_errmsg(db_obj->db));
 -                      return;
+                       sqlite3_close(db_obj->db);
 +                      RETURN_THROWS();
                }
        }
  #endif