prevent segmentation fault when passing invalid arugment to protocolbufferrs\message::__construct

Author: chobie

message.c

@@ -529,7 +529,8 @@ static void php_protocolbuffers_message_set(INTERNAL_FUNCTION_PARAMETERS, zval *
 
 					if (Z_TYPE_PP(element) == IS_OBJECT) {
 						if (scheme->ce != Z_OBJCE_PP(element)) {
-							zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "expected %s class. given %s class", scheme->ce->name, Z_OBJCE_P(value)->name);
+							zval_ptr_dtor(&outer);
+							zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0 TSRMLS_CC, "expected %s class. given %s class", scheme->ce->name, Z_OBJCE_PP(element)->name);
 							return;
 						} else {
 							m = PHP_PROTOCOLBUFFERS_GET_OBJECT(php_protocolbuffers_message, *element);

tests/999_no41_constructor_should_accept_object.phpt

@@ -148,6 +148,15 @@ foreach ($bar->getUsers() as $user) {
 	echo $user->getId() . PHP_EOL;
 }
 
+try {
+$var = new TestMessage(array('users' => array(
+		array('id' => 1),
+    new StdClass(),
+)));
+	echo "FAULT" . PHP_EOL;
+} catch (InvalidArgumentException $e) {
+	echo "OK" . PHP_EOL;
+}
 --EXPECT--
 1
 2
@@ -157,4 +166,5 @@ foreach ($bar->getUsers() as $user) {
 3
 1
 2
-3
+3
+OK