com php-src: Fix typo: unitialized -> uninitialized: NEWS ext/exif/tests/bug68799.phpt ext/pcre/pcrelib/pcre_exec.c ext/xmlwriter/php_xmlwriter.c
ext/zip/php_zip.c
| From: | Lior Kaplan | Date: | Wed, 01 Apr 2015 15:17:53 +0000 |
| Subject: | com php-src: Fix typo: unitialized -> uninitialized: NEWS ext/exif/tests/bug68799.phpt ext/pcre/pcrelib/pcre_exec.c ext/xmlwriter/php_xmlwriter.c ext/zip/php_zip.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86025@lists.php.net to get a copy of this message | ||
Commit: 59c2a55ec7cbc70cc0227a127d3859fdc95566e7
Author: Lior Kaplan <kaplanlior@gmail.com> Wed, 1 Apr 2015 18:07:37 +0300
Parents: a32c8ba719493fd2b4700c4f7db1ef130ceb7661
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59c2a55ec7cbc70cc0227a127d3859fdc95566e7
Log:
Fix typo: unitialized -> uninitialized
Changed paths:
M NEWS
M ext/exif/tests/bug68799.phpt
M ext/pcre/pcrelib/pcre_exec.c
M ext/xmlwriter/php_xmlwriter.c
M ext/zip/php_zip.c
Diff:
diff --git a/NEWS b/NEWS
index d87aea4...6fcc697 100644
--- a/NEWS
+++ b/NEWS
@@ -256,7 +256,7 @@ PHP NEWS
CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
- EXIF:
- . Fixed bug #68799 (Free called on unitialized pointer). (CVE-2015-0232)
+ . Fixed bug #68799 (Free called on uninitialized pointer). (CVE-2015-0232)
(Stas)
- Fileinfo:
diff --git a/ext/exif/tests/bug68799.phpt b/ext/exif/tests/bug68799.phpt
index b09f21c..f50a41b 100644
--- a/ext/exif/tests/bug68799.phpt
+++ b/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--
diff --git a/ext/pcre/pcrelib/pcre_exec.c b/ext/pcre/pcrelib/pcre_exec.c
index a3f0c19..e4da522 100644
--- a/ext/pcre/pcrelib/pcre_exec.c
+++ b/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
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 206d82a..6b5c355 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/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; \
} \
}
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 333050f..c268059 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -417,7 +417,7 @@ static int php_zip_parse_options(zval *options, long *remove_all_path,
ze_zip_object *obj = (ze_zip_object*) zend_object_store_get_object(object TSRMLS_CC); \
intern = obj->za; \
if (!intern) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized Zip object"); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized Zip object"); \
RETURN_FALSE; \
} \
}