php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Browse Source 
* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
This commit is contained in:
Dmitry Stogov
2013-11-27 14:58:54 +04:00
parent 16d59aa171 12fe4e90be
commit 504c60dc44
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+3
View File
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2013, PHP 5.4.24
- Date:
. Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi)
?? ??? 2013, PHP 5.4.23
- Core:
ext/date/lib/parse_iso_intervals.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Mon Dec 5 22:02:27 2011 */
/* Generated by re2c 0.13.5 on Wed Nov 27 11:10:58 2013 */
#line 1 "ext/date/lib/parse_iso_intervals.re"
/*
+----------------------------------------------------------------------+
@@ -415,7 +415,7 @@ yy6:
break;
}
ptr++;
} while (*ptr);
} while (!s->errors->error_count && *ptr);
s->have_period = 1;
TIMELIB_DEINIT;
return TIMELIB_PERIOD;
ext/date/lib/parse_iso_intervals.re
+1 -1
View File
@@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekofyear;
break;
}
ptr++;
} while (*ptr);
} while (!s->errors->error_count && *ptr);
s->have_period = 1;
TIMELIB_DEINIT;
return TIMELIB_PERIOD;