com php-src: Fix bug #68113 (Heap corruption in exif_thumbnai l()): ext/curl/interface.c ext/exif/exif.c ex t/exif/tests/bug68113.jpg
ext/exif/tests/bug6 8113.phpt
| From: | JulienPauli | Date: | Wed, 15 Oct 2014 09:45:54 +0000 |
| Subject: | com php-src: Fix bug #68113 (Heap corruption in exif_thumbnai l()): ext/curl/interface.c ext/exif/exif.c ex t/exif/tests/bug68113.jpg ext/exif/tests/bug6 8113.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82333@lists.php.net to get a copy of this message | ||
Commit: d0a6b7d1242bab3ebd4f1687bfa56b01e6767f67
Author: Stanislav Malyshev <stas@php.net> Sun, 28 Sep 2014 16:57:42 -0700
Committer: Julien Pauli <jpauli@php.net> Wed, 15 Oct 2014 11:45:54 +0200
Parents: cc1fe72bc99ae92d2e14275fd97f34960db24032
Branches: PHP-5.5.18
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0a6b7d1242bab3ebd4f1687bfa56b01e6767f67
Log:
Fix bug #68113 (Heap corruption in exif_thumbnail())
Bugs:
https://bugs.php.net/68113
Changed paths:
M ext/curl/interface.c
M ext/exif/exif.c
A ext/exif/tests/bug68113.jpg
A ext/exif/tests/bug68113.phpt
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index eab2edf..a48e8a3 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -171,7 +171,7 @@ static int php_curl_option_str(php_curl *ch, long option, const char *str, const
if (strlen(str) != len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Curl option contains invalid characters
(\\0)");
- return 0;
+ return FAILURE;
}
#if LIBCURL_VERSION_NUM >= 0x071100
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 38907b4..637ebf9 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2426,11 +2426,11 @@ static void* exif_ifd_make_value(image_info_data *info_data, int
motorola_intel
data_ptr += 8;
break;
case TAG_FMT_SINGLE:
- memmove(data_ptr, &info_data->value.f, byte_count);
+ memmove(data_ptr, &info_value->f, 4);
data_ptr += 4;
break;
case TAG_FMT_DOUBLE:
- memmove(data_ptr, &info_data->value.d, byte_count);
+ memmove(data_ptr, &info_value->d, 8);
data_ptr += 8;
break;
}
diff --git a/ext/exif/tests/bug68113.jpg b/ext/exif/tests/bug68113.jpg
new file mode 100755
index 0000000..3ce7a62
Binary files /dev/null and b/ext/exif/tests/bug68113.jpg differ
diff --git a/ext/exif/tests/bug68113.phpt b/ext/exif/tests/bug68113.phpt
new file mode 100644
index 0000000..0fa4c4a
--- /dev/null
+++ b/ext/exif/tests/bug68113.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #68113 (Heap corruption in exif_thumbnail())
+--SKIPIF--
+<?php
+extension_loaded("exif") or die("skip need exif");
+?>
+--FILE--
+<?php
+var_dump(exif_thumbnail(__DIR__."/bug68113.jpg"));
+?>
+Done
+--EXPECTF--
+Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s/bug68113.php on line 2
+
+Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s/bug68113.php on line 2
+bool(false)
+Done
\ No newline at end of file