From: Stanislav Malyshev <stas@php.net>
Date: Mon, 23 Mar 2015 01:31:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fce9a856e73cfb6d9a4521d5b8ea2c15417f3145;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct
---

fce9a856e73cfb6d9a4521d5b8ea2c15417f3145
diff --cc NEWS
index 2b4479c550,ae6c25a8f4..22e47a4b24
--- a/NEWS
+++ b/NEWS
@@@ -24,14 -26,16 +24,17 @@@ PH
    . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
      Welch)
  
 -- Mbstring:
 -   . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
 -    (Masaki Kagaya)
 -
 -- OpenSSL:
 -   . Fixed bug #67403 (Add signatureType to openssl_x509_parse).
 +- OpenSSL
 +  . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
 +    in stream_select() contexts) (Chris Wright)
 +  . Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
 +    (Daniel Lowrey)
 +  . Fixed bug #69215 (Crypto servers should send client CA list)
 +    (Daniel Lowrey)
  
+ - Postgres:
+   . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Xinchen Hui)
+ 
  - SPL:
     . Fixed bug #69227 (Use after free in zval_scan caused by
       spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)