From: Anatol Belski <ab@php.net>
Date: Thu, 11 Jun 2020 11:23:35 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5e9950c7a491bb945888401196c8d685aaba61b;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  sqlite3: Fix possible use after free
---

a5e9950c7a491bb945888401196c8d685aaba61b
diff --cc ext/sqlite3/sqlite3.c
index 895a1b0cfd,80f57a4508..c309d5d545
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -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));
+ 			sqlite3_close(db_obj->db);
 -			return;
 +			RETURN_THROWS();
  		}
  	}
  #endif