diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-08-20 09:06:13 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-08-20 09:06:13 +0200 |
| commit | bf4af35254bfff38b18848b86bb2bf7cf11085de (patch) | |
| tree | 4357e214a9bbaea82dc6bd318cf2ddaa4c7ba01c /ext/simplexml | |
| parent | d837b4550418036e76d6adb3c7dad94b1e3a5a6a (diff) | |
| download | php-bf4af35254bfff38b18848b86bb2bf7cf11085de.tar.gz | |
New upstream version 5.5.2+dfsgupstream/5.5.2+dfsg
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/config.m4 | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 index 2145e23d8..387a24ea2 100644 --- a/ext/simplexml/config.m4 +++ b/ext/simplexml/config.m4 @@ -6,7 +6,7 @@ PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) + [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) fi if test "$PHP_SIMPLEXML" != "no"; then diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index e7c2f2984..eba46b909 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1070,7 +1070,7 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{ int namelen; int test; char use_iter; - zval *iter_data; + zval *iter_data = NULL; use_iter = 0; |