summaryrefslogtreecommitdiffstats
path: root/php-bug77563.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-03-12 11:05:11 +0100
committerRemi Collet <remi@remirepo.net>2019-03-12 11:05:11 +0100
commit54c47c5cbf037ce982bf1868f79051c8af88bad3 (patch)
tree298507977d94b6b6fe84abc80c662e3dc2f73b7c /php-bug77563.patch
parentc2b0e5687f6de20065ad435a37e060f87d03604a (diff)
Fix #77396 Null Pointer Dereference in phar_create_or_parse_filename
Fix #77586 - phar_tar_writeheaders_int() buffer overflow - spl: Fix #77431 openFile() silently truncates after a null byte - security fix synced with https://github.com/Microsoft/php-src/
Diffstat (limited to 'php-bug77563.patch')
-rw-r--r--php-bug77563.patch11
1 files changed, 4 insertions, 7 deletions
diff --git a/php-bug77563.patch b/php-bug77563.patch
index 33b196d..2fc6dea 100644
--- a/php-bug77563.patch
+++ b/php-bug77563.patch
@@ -1,15 +1,12 @@
-Backported for 5.6 from 7.1 by remi
-without binary diff
-
-
-
-From 8ac6fee8562533a15db90062117210ed28b44fea Mon Sep 17 00:00:00 2001
+From ac4a9cd56f8145c0b1226fe977772a40e3a994a9 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Sat, 2 Mar 2019 15:07:40 -0800
Subject: [PATCH] Fix bug #77563 - Uninitialized read in
exif_process_IFD_in_MAKERNOTE
Also fix for bug #77659
+
+(cherry picked from commit 8ac6fee8562533a15db90062117210ed28b44fea)
---
ext/exif/exif.c | 3 ++-
ext/exif/tests/bug77563.jpg | Bin 0 -> 63 bytes
@@ -19,7 +16,7 @@ Also fix for bug #77659
create mode 100644 ext/exif/tests/bug77563.phpt
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
-index ea88a8f115e8..fe89b8547118 100644
+index 5497068fb1..ce8db170c7 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2751,7 +2751,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu