Skip to content

Commit a64b48b

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: [ci skip] NEWS Fix null pointer dereferences in case of allocation failure
2 parents 574b057 + dd8a945 commit a64b48b

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

NEWS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PHP NEWS
1313
. Fix registerNodeClass with abstract class crashing. (nielsdos)
1414
. Fix compile error when php_libxml.h header is included in C++.
1515
(Remi, nielsdos)
16+
. Add missing NULL pointer error check. (icy17)
1617

1718
- Fiber:
1819
. Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi)
@@ -48,6 +49,12 @@ PHP NEWS
4849
. Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers).
4950
(Jakub Zelenka)
5051

52+
- XMLReader:
53+
. Add missing NULL pointer error check. (icy17)
54+
55+
- XMLWriter:
56+
. Add missing NULL pointer error check. (icy17)
57+
5158
- XSL:
5259
. Add missing module dependency. (nielsdos)
5360

ext/dom/document.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,9 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p
11571157
int isFileUri = 0;
11581158

11591159
uri = xmlCreateURI();
1160+
if (uri == NULL) {
1161+
return NULL;
1162+
}
11601163
escsource = xmlURIEscapeStr((xmlChar *) source, (xmlChar *) ":");
11611164
xmlParseURIReference(uri, (char *) escsource);
11621165
xmlFree(escsource);

ext/xmlreader/php_xmlreader.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int reso
212212
int isFileUri = 0;
213213

214214
uri = xmlCreateURI();
215+
if (uri == NULL) {
216+
return NULL;
217+
}
215218
escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *)":");
216219
xmlParseURIReference(uri, (const char *)escsource);
217220
xmlFree(escsource);

ext/xmlwriter/php_xmlwriter.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, i
109109
int isFileUri = 0;
110110

111111
uri = xmlCreateURI();
112+
if (uri == NULL) {
113+
return NULL;
114+
}
112115
escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *) ":");
113116
xmlParseURIReference(uri, (char *)escsource);
114117
xmlFree(escsource);

0 commit comments

Comments
 (0)