From: Stanislav Malyshev <stas@php.net>
Date: Wed, 14 May 2014 00:03:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~281^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=292b2fd3b3694bd188b5cd384c11b92e6a19cee4;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
---

292b2fd3b3694bd188b5cd384c11b92e6a19cee4