Blame SOURCES/php-5.4.16-CVE-2015-0232.patch
|
 |
af9dc8 |
Adapted for 5.4.16
|
|
|
af9dc8 |
Upstream test dropped as binary patch not supported
|
|
|
af9dc8 |
|
|
|
af9dc8 |
From 2fc178cf448d8e1b95d1314e47eeef610729e0df Mon Sep 17 00:00:00 2001
|
|
|
af9dc8 |
From: Stanislav Malyshev <stas@php.net>
|
|
|
af9dc8 |
Date: Sun, 11 Jan 2015 00:51:05 -0800
|
|
|
af9dc8 |
Subject: [PATCH] Fix bug #68799: Free called on unitialized pointer
|
|
|
af9dc8 |
|
|
|
af9dc8 |
---
|
|
|
af9dc8 |
ext/exif/exif.c | 2 +-
|
|
|
af9dc8 |
ext/exif/tests/bug68799.jpg | Bin 0 -> 735 bytes
|
|
|
af9dc8 |
ext/exif/tests/bug68799.phpt | 63 +++++++++++++++++++++++++++++++++++++++++++
|
|
|
af9dc8 |
3 files changed, 64 insertions(+), 1 deletion(-)
|
|
|
af9dc8 |
create mode 100644 ext/exif/tests/bug68799.jpg
|
|
|
af9dc8 |
create mode 100644 ext/exif/tests/bug68799.phpt
|
|
|
af9dc8 |
|
|
|
af9dc8 |
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
|
|
|
af9dc8 |
index 637ebf9..7f95ff4 100644
|
|
|
af9dc8 |
--- a/ext/exif/exif.c
|
|
|
af9dc8 |
+++ b/ext/exif/exif.c
|
|
|
af9dc8 |
@@ -2700,7 +2700,7 @@
|
|
|
af9dc8 |
static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_field, int tag, char *szValuePtr, int ByteCount TSRMLS_DC)
|
|
|
af9dc8 |
{
|
|
|
af9dc8 |
xp_field->tag = tag;
|
|
|
af9dc8 |
-
|
|
|
af9dc8 |
+ xp_field->value = NULL;
|
|
|
af9dc8 |
/* Copy the comment */
|
|
|
af9dc8 |
if (zend_multibyte_encoding_converter(
|
|
|
af9dc8 |
(unsigned char**)&xp_field->value,
|
|
|
af9dc8 |
--
|
|
|
af9dc8 |
2.1.4
|
|
|
af9dc8 |
|