Merge branch 'PHP-7.4'

dstogov · dstogov · commit d40d0faa90a0 · 2019-09-10T11:02:03.000+03:00
* PHP-7.4:
  Stop after exceptions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
@@ -3794,6 +3794,7 @@ ZEND_METHOD(FFI, cast) /* {{{ */
 			RETURN_OBJ(&cdata->std);
 		} else {
 			zend_wrong_parameter_class_error(2, "FFI\\CData", zv);
+			return;
 		}
 	}
 
@@ -4037,6 +4038,7 @@ ZEND_METHOD(FFI, addr) /* {{{ */
 	ZVAL_DEREF(zv);
 	if (Z_TYPE_P(zv) != IS_OBJECT || Z_OBJCE_P(zv) != zend_ffi_cdata_ce) {
 		zend_wrong_parameter_class_error(1, "FFI\\CData", zv);
+		return;
 	}
 
 	cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);

Original file line number	Diff line number	Diff line change
`@@ -3794,6 +3794,7 @@ ZEND_METHOD(FFI, cast) /* {{{ */`
`3794`	`3794`	`RETURN_OBJ(&cdata->std);`
`3795`	`3795`	`} else {`
`3796`	`3796`	`zend_wrong_parameter_class_error(2, "FFI\\CData", zv);`
	`3797`	`+ return;`
`3797`	`3798`	`}`
`3798`	`3799`	`}`
`3799`	`3800`
`@@ -4037,6 +4038,7 @@ ZEND_METHOD(FFI, addr) /* {{{ */`
`4037`	`4038`	`ZVAL_DEREF(zv);`
`4038`	`4039`	`if (Z_TYPE_P(zv) != IS_OBJECT \|\| Z_OBJCE_P(zv) != zend_ffi_cdata_ce) {`
`4039`	`4040`	`zend_wrong_parameter_class_error(1, "FFI\\CData", zv);`
	`4041`	`+ return;`
`4040`	`4042`	`}`
`4041`	`4043`
`4042`	`4044`	`cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);`