From: Stanislav Malyshev <stas@php.net>
Date: Mon, 16 Dec 2019 18:07:15 +0000 (-0800)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dfff646a22ddddf5ca8cecad3b72655402aec7a;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test
  Fix bug #78793
  Fix build - no model field anymore
  Fixed bug #78910
  Fix #78878: Buffer underflow in bc_shift_addsub
  Fix test
  Fix #78862: link() silently truncates after a null byte on Windows
  Fix #78863: DirectoryIterator class silently truncates after a null byte
  Fix #78943: mail() may release string with refcount==1 twice
---

0dfff646a22ddddf5ca8cecad3b72655402aec7a
diff --cc ext/exif/exif.c
index 433f33e763,b686ec2fd4..65e6a2ce76
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@@ -3062,9 -3126,11 +3062,10 @@@ static int exif_process_IFD_in_MAKERNOT
  
  		maker_note = maker_note_array+i;
  
 -		/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/
  		if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make)))
  			continue;
- 		if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
+ 		if (maker_note->id_string && value_len >= maker_note->id_string_len
+ 				&& strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len))
  			continue;
  		break;
  	}