Merge pull request #20 from m6w6/fix-19

fix #19

package.xml

@@ -59,7 +59,7 @@ Requirements: ext/hash (now a part of PHP core)
   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
   <notes>
 <![CDATA[
-* WIP
+* Fix gh issue #19: Segfault in checkOAuthRequest()
 ]]>
   </notes>
   <contents>

provider.c

@@ -753,7 +753,10 @@ SOP_METHOD(checkOAuthRequest)
 		long cb_res;
 
 		retval = oauth_provider_call_cb(INTERNAL_FUNCTION_PARAM_PASSTHRU, OAUTH_PROVIDER_CONSUMER_CB);
-		if (retval) {
+		if (EG(exception)) {
+			/* pass exceptions */
+			break;
+		} else if (retval) {
 			convert_to_long(retval);
 			cb_res = Z_LVAL_P(retval);
 			zval_ptr_dtor(retval);
@@ -762,9 +765,6 @@ SOP_METHOD(checkOAuthRequest)
 				soo_handle_error(NULL, cb_res, "Invalid consumer key", NULL, additional_info);
 				break;
 			}
-		} else if (EG(exception)) {
-			/* pass exceptions */
-			break;
 		}
 
 		if (is_token_required) {

tests/issue019.phpt

@@ -0,0 +1,30 @@
+--TEST--
+GH issue #19 - Segfault in checkOAuthRequest()
+--FILE--
+<?php
+require 'oauth.inc';
+$ret = "0";
+
+try {
+    $provider = new OAuthProvider(creationParams());
+	$provider->consumerHandler(function() use (&$ret) {
+		foo();
+    });
+	$provider->timestampNonceHandler(function() {
+		bar();
+    });
+	$provider->tokenHandler(function() {
+		global $ret;
+		baz();
+    });
+
+    $provider->checkOAuthRequest("http://localhost/request_token.php", OAUTH_HTTP_METHOD_GET);
+
+} catch (OAuthException $E) {
+    echo OAuthProvider::reportProblem($E);
+} catch (Throwable $T) {
+	echo "Caught ", get_class($T), "\n";
+}
+?>
+--EXPECT--
+Caught Error