Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: exif: Fix possible memory leak when tag is empty
2026-03-24 00:02:20 +01:00 · 2025-10-15 20:24:22 +02:00
parent 4b0ad46e3f 56af25cc1c
commit d1018bec6d
2 changed files with 4 additions and 0 deletions
--- a/3
+++ b/3
@@ -14,6 +14,9 @@ PHP                                                                        NEWS
  . Partially fixed bug GH-16317 (DOM classes do not allow
    __debugInfo() overrides to work). (nielsdos)

+- Exif:
+  . Fix possible memory leak when tag is empty. (nielsdos)
+
 - FPM:
  . Fixed bug GH-19974 (fpm_status_export_to_zval segfault for parallel
    execution). (Jakub Zelenka, txuna)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -3249,6 +3249,7 @@ static bool exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * val

 #define REQUIRE_NON_EMPTY() do { \
 	if (byte_count == 0) { \
+		EFREE_IF(outside); \
 		exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Cannot be empty", tag, exif_get_tagname_debug(tag, tag_table)); \
 		return false; \
 	} \