diff options
| author | Danack <Danack@basereality.com> | 2015-01-06 22:09:13 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 16:46:02 -0700 |
| commit | 0c27a8eb61813f04c92caf578d24bb3b76eb6651 (patch) | |
| tree | 18bc1b7a55b2822f9937cb6bd850786b59a9ee0d | |
| parent | a759c40872a7287a5bef0e54b068695404566c88 (diff) | |
| download | php-git-0c27a8eb61813f04c92caf578d24bb3b76eb6651.tar.gz | |
Fix #68760: Fix freeing null segfault. Added test for behaviour.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 17 | ||||
| -rw-r--r-- | ext/sqlite3/tests/bug68760.phpt | 36 |
3 files changed, 51 insertions, 6 deletions
@@ -37,6 +37,10 @@ PHP NEWS . Fixed bug #69227 (Use after free in zval_scan caused by spl_object_storage_get_gc). (adam dot scarr at 99designs dot com) +- SQLITE: + . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception). + (Dan Ackroyd) + 19 Mar 2015, PHP 5.5.23 - Core: diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 3ff0242cc4..8178d4f3b2 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -898,16 +898,21 @@ static int php_sqlite3_callback_compare(void *coll, int a_len, const void *a, in efree(zargs[1]); efree(zargs); - //retval ought to contain a ZVAL_LONG by now - // (the result of a comparison, i.e. most likely -1, 0, or 1) - //I suppose we could accept any scalar return type, though. - if (Z_TYPE_P(retval) != IS_LONG){ + if (!retval) { + //Exception was thrown by callback, default to 0 for compare + ret = 0; + } else if (Z_TYPE_P(retval) != IS_LONG) { + //retval ought to contain a ZVAL_LONG by now + // (the result of a comparison, i.e. most likely -1, 0, or 1) + //I suppose we could accept any scalar return type, though. php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the compare callback (invalid return type). Collation behaviour is undefined."); - }else{ + } else { ret = Z_LVAL_P(retval); } - zval_ptr_dtor(&retval); + if (retval) { + zval_ptr_dtor(&retval); + } return ret; } diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt new file mode 100644 index 0000000000..de89a2cf22 --- /dev/null +++ b/ext/sqlite3/tests/bug68760.phpt @@ -0,0 +1,36 @@ +--TEST-- +Bug #68760 (Callback throws exception behaviour. Segfault in 5.6) +--SKIPIF-- +<?php +if (!extension_loaded('sqlite3')) die('skip'); +?> +--FILE-- +<?php +function oopsFunction($a, $b) { + echo "callback"; + throw new \Exception("oops"); +} + +$db = new SQLite3(":memory:"); +$db->exec("CREATE TABLE test (col1 string)"); +$db->exec("INSERT INTO test VALUES ('a1')"); +$db->exec("INSERT INTO test VALUES ('a10')"); +$db->exec("INSERT INTO test VALUES ('a2')"); + +try { + $db->createCollation('NATURAL_CMP', 'oopsFunction'); + $naturalSort = $db->query("SELECT col1 FROM test ORDER BY col1 COLLATE NATURAL_CMP"); + while ($row = $naturalSort->fetchArray()) { + echo $row['col1'], "\n"; + } + $db->close(); +} +catch(\Exception $e) { + echo "Exception: ".$e->getMessage(); +} +?> +--EXPECTF-- +callback +Warning: SQLite3::query(): An error occurred while invoking the compare callback in %a/bug68760.php on line %i +Exception: oops + |