From: Anatol Belski <ab@php.net>
Date: Tue, 19 Aug 2014 10:51:05 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e8c20edc90947f53f6495db7a18e1cd0fc4a8a5;p=php

Merge branch 'master' of git.php.net:php-src

# By Stanislav Malyshev (5) and Remi Collet (1)
# Via Stanislav Malyshev
* 'master' of git.php.net:php-src:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
---

0e8c20edc90947f53f6495db7a18e1cd0fc4a8a5