From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 29 Apr 2012 22:14:20 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fa45a9399922f324a4fe7e4af8d6f40b0592172;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
---

7fa45a9399922f324a4fe7e4af8d6f40b0592172