Merge branch 'pull-request/1091'

smalyshev · smalyshev · commit 5a5b63774b12 · 2015-03-22T16:48:54.000-07:00
* pull-request/1091:
  Stop trying to call the callback after it has thrown an exception. Also, as an exception has been thrown, there is no need to have a separate error message.
  Fix freeing null segfault. Added test for behaviour.

Conflicts:
	ext/sqlite3/tests/bug68760.phpt
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
@@ -860,18 +860,23 @@ static int php_sqlite3_callback_compare(void *coll, int a_len, const void *a, in
 
 	collation->fci.fci.params = zargs;
 
-	if ((ret = zend_call_function(&collation->fci.fci, &collation->fci.fcc)) == FAILURE) {
-		php_error_docref(NULL, E_WARNING, "An error occurred while invoking the compare callback");
+	if (!EG(exception)) {
+		//Exception occurred on previous callback. Don't attempt to call function
+		if ((ret = zend_call_function(&collation->fci.fci, &collation->fci.fcc)) == FAILURE) {
+			php_error_docref(NULL, E_WARNING, "An error occurred while invoking the compare callback");
+		}
 	}
 
 	zval_ptr_dtor(&zargs[0]);
 	zval_ptr_dtor(&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(retval) != IS_LONG){
+	if (EG(exception)) {
+		ret = 0;
+	} else if (Z_TYPE(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, E_WARNING, "An error occurred while invoking the compare callback (invalid return type).  Collation behaviour is undefined.");
 	}else{
 		ret = Z_LVAL(retval);
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded('sqlite3')) die('skip');
 --FILE--
 <?php
 function oopsFunction($a, $b) {
-	echo "callback";
+	echo "callback".PHP_EOL;
 	throw new \Exception("oops");
 }
 
@@ -31,6 +31,5 @@ catch(\Exception $e) {
 ?>
 --EXPECTF--
 callback
-Warning: SQLite3::query(): An error occurred while invoking the compare callback in %a/bug68760.php on line %i
 Exception: oops
 
