diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-12-28 09:53:54 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-12-28 09:53:54 +0100 |
| commit | 2982afcaf2754b7ee713d634f88acc7451f2127b (patch) | |
| tree | 6cadc1d05008e37ba37015cf1e0e506af72d5efa /php-bug66060.patch | |
| parent | 969a883bb4e40fbd79a2ef10b03188425fdc5b02 (diff) | |
test build of 5.5.8RC1
Diffstat (limited to 'php-bug66060.patch')
| -rw-r--r-- | php-bug66060.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/php-bug66060.patch b/php-bug66060.patch deleted file mode 100644 index 553f708..0000000 --- a/php-bug66060.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 12fe4e90be7bfa2a763197079f68f5568a14e071 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 27 Nov 2013 11:13:16 +0100 -Subject: [PATCH] Fixed bug #66060 (Heap buffer over-read in DateInterval) - ---- - NEWS | 3 +++ - ext/date/lib/parse_iso_intervals.c | 4 ++-- - ext/date/lib/parse_iso_intervals.re | 2 +- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c -index bd1ad05..480ea38 100644 ---- a/ext/date/lib/parse_iso_intervals.c -+++ b/ext/date/lib/parse_iso_intervals.c -@@ -380,7 +380,7 @@ yy6: - break; - } - ptr++; -- } while (*ptr); -+ } while (!s->errors->error_count && *ptr); - s->have_period = 1; - TIMELIB_DEINIT; - return TIMELIB_PERIOD; -diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re -index 56aa34d..c5e9f67 100644 ---- a/ext/date/lib/parse_iso_intervals.re -+++ b/ext/date/lib/parse_iso_intervals.re -@@ -348,7 +348,7 @@ isoweek = year4 "-"? "W" weekofyear; - break; - } - ptr++; -- } while (*ptr); -+ } while (!s->errors->error_count && *ptr); - s->have_period = 1; - TIMELIB_DEINIT; - return TIMELIB_PERIOD; --- -1.8.4.3 - |