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

diff --cc ext/exif/exif.c
index 433f33e7636db225c6d373e98e23db2325b15e49,b686ec2fd4fae2beba772d52033d3e88a3e87902..65e6a2ce76227e080f0d31f1c59eaf18fc37c700
--- 1/ext/exif/exif.c
--- 2/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;
        }

diff --cc ext/spl/spl_directory.c
Simple merge