archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure
This commit is contained in:
Niels Dossche 2024-12-23 14:23:09 +01:00
commit d1ed8beb2f
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -34,6 +34,7 @@ PHP NEWS
- FFI: - FFI:
. Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos) . Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
. Fix memory leak on ZEND_FFI_TYPE_CHAR conversion failure. (nielsdos)
- Fileinfo: - Fileinfo:
. Fixed bug GH-17039 (PHP 8.4: Incorrect MIME content type). (nielsdos) . Fixed bug GH-17039 (PHP 8.4: Incorrect MIME content type). (nielsdos)

1
ext/ffi/ffi.c
View file

@ -808,6 +808,7 @@ again:
if (ZSTR_LEN(str) == 1) { if (ZSTR_LEN(str) == 1) {
*(char*)ptr = ZSTR_VAL(str)[0]; *(char*)ptr = ZSTR_VAL(str)[0];
} else { } else {
zend_tmp_string_release(tmp_str);
zend_ffi_assign_incompatible(value, type); zend_ffi_assign_incompatible(value, type);
return FAILURE; return FAILURE;
} }