diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-06-22 11:12:23 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-06-22 11:12:23 +0200 |
| commit | 0da4c34f0e5957f4370a22bfcc0043efb1f59955 (patch) | |
| tree | d13ff3d75cb70515b72f10a883d4e0dbbf615773 | |
| parent | ed418312a5937389c3b2aa486291bfeb5ffde4c2 (diff) | |
| download | php-git-0da4c34f0e5957f4370a22bfcc0043efb1f59955.tar.gz | |
Fixed bug #69897 (segfault when manually constructing SQLite3Result)
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ -PHP NEWS +PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| 25 Jun 2015, PHP 7.0.0 Alpha 2 @@ -57,6 +57,10 @@ PHP NEWS - SPL . Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken). (Dmitry) +- SQLite3 + . Fixed bug #69897 (segfault when manually constructing SQLite3Result). + (Kalle) + - Standard . Fixed bug #62922 (Truncating entire string should result in string). (Nikita) diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index f9bcb311f5..00560450fe 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2103,7 +2103,7 @@ static void php_sqlite3_result_object_free_storage(zend_object *object) /* {{{ * } if (!Z_ISNULL(intern->stmt_obj_zval)) { - if (intern->stmt_obj->initialised) { + if (intern->stmt_obj && intern->stmt_obj->initialised) { sqlite3_reset(intern->stmt_obj->stmt); } |