Browse Source

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix typo: unitialized -> uninitialized
pull/1260/head
Lior Kaplan 11 years ago
parent
commit
2fd74c7f03
  1. 2
      ext/exif/tests/bug68799.phpt
  2. 2
      ext/pcre/pcrelib/pcre_exec.c
  3. 2
      ext/xmlwriter/php_xmlwriter.c

2
ext/exif/tests/bug68799.phpt

@ -1,5 +1,5 @@
--TEST--
Bug #68799 (Free called on unitialized pointer)
Bug #68799 (Free called on uninitialized pointer)
--SKIPIF--
<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
--FILE--

2
ext/pcre/pcrelib/pcre_exec.c

@ -688,7 +688,7 @@ the alternative names that are used. */
#define foc number
#define save_mark data
/* These statements are here to stop the compiler complaining about unitialized
/* These statements are here to stop the compiler complaining about uninitialized
variables. */
#ifdef SUPPORT_UCP

2
ext/xmlwriter/php_xmlwriter.c

@ -113,7 +113,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC)
ze_xmlwriter_object *obj = (ze_xmlwriter_object*) zend_object_store_get_object(object TSRMLS_CC); \
intern = obj->xmlwriter_ptr; \
if (!intern) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized XMLWriter object"); \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
RETURN_FALSE; \
} \
}

Loading…
Cancel
Save