Skip to content

Commit dd8a945

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: [ci skip] NEWS Fix null pointer dereferences in case of allocation failure
2 parents 7320f33 + 98908db commit dd8a945

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

NEWS

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ PHP NEWS
1111

1212
- DOM:
1313
. Fix registerNodeClass with abstract class crashing. (nielsdos)
14+
. Add missing NULL pointer error check. (icy17)
1415

1516
- Fiber:
1617
. Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi)
@@ -25,8 +26,8 @@ PHP NEWS
2526
upgrading to 8.1.3 due to corrupt on-disk file cache). (turchanov)
2627

2728
- OpenSSL:
28-
Fixed bug GH-12489 (Missing sigbio creation checking in openssl_cms_verify).
29-
(Jakub Zelenka)
29+
. Fixed bug GH-12489 (Missing sigbio creation checking in openssl_cms_verify).
30+
(Jakub Zelenka)
3031

3132
- SOAP:
3233
. Fixed bug GH-12392 (Segmentation fault on SoapClient::__getTypes).
@@ -42,6 +43,12 @@ PHP NEWS
4243
. Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers).
4344
(Jakub Zelenka)
4445

46+
- XMLReader:
47+
. Add missing NULL pointer error check. (icy17)
48+
49+
- XMLWriter:
50+
. Add missing NULL pointer error check. (icy17)
51+
4552
- XSL:
4653
. Add missing module dependency. (nielsdos)
4754

ext/dom/document.c

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

11501150
uri = xmlCreateURI();
1151+
if (uri == NULL) {
1152+
return NULL;
1153+
}
11511154
escsource = xmlURIEscapeStr((xmlChar *) source, (xmlChar *) ":");
11521155
xmlParseURIReference(uri, (char *) escsource);
11531156
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
@@ -110,6 +110,9 @@ static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, i
110110
int isFileUri = 0;
111111

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

0 commit comments

Comments
 (0)