Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit d1ed8beb2f28 · 2024-12-23T14:23:09.000+01:00
* PHP-8.3:
  Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure
diff --git a/NEWS b/NEWS
@@ -34,6 +34,7 @@ PHP                                                                        NEWS
 
 - FFI:
   . Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
+  . Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure. (nielsdos)
 
 - Fileinfo:
   . Fixed bug GH-17039 (PHP 8.4: Incorrect MIME content type). (nielsdos)
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
@@ -808,6 +808,7 @@ static zend_always_inline zend_result zend_ffi_zval_to_cdata(void *ptr, zend_ffi
 			if (ZSTR_LEN(str) == 1) {
 				*(char*)ptr = ZSTR_VAL(str)[0];
 			} else {
+				zend_tmp_string_release(tmp_str);
 				zend_ffi_assign_incompatible(value, type);
 				return FAILURE;
 			}

Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,7 @@ static zend_always_inline zend_result zend_ffi_zval_to_cdata(void *ptr, zend_ffi`
`808`	`808`	`if (ZSTR_LEN(str) == 1) {`
`809`	`809`	`(char)ptr = ZSTR_VAL(str)[0];`
`810`	`810`	`} else {`
	`811`	`+ zend_tmp_string_release(tmp_str);`
`811`	`812`	`zend_ffi_assign_incompatible(value, type);`
`812`	`813`	`return FAILURE;`
`813`	`814`	`}`