Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  [ci skip] NEWS
  Fix null pointer dereferences in case of allocation failure
This commit is contained in:
Niels Dossche 2023-10-24 19:42:43 +02:00
commit a64b48ba92
4 changed files with 16 additions and 0 deletions

7
NEWS
View file

@ -13,6 +13,7 @@ PHP NEWS
. Fix registerNodeClass with abstract class crashing. (nielsdos) . Fix registerNodeClass with abstract class crashing. (nielsdos)
. Fix compile error when php_libxml.h header is included in C++. . Fix compile error when php_libxml.h header is included in C++.
(Remi, nielsdos) (Remi, nielsdos)
. Add missing NULL pointer error check. (icy17)
- Fiber: - Fiber:
. Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi) . Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi)
@ -48,6 +49,12 @@ PHP NEWS
. Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers). . Fixed bug #75708 (getimagesize with "&$imageinfo" fails on StreamWrappers).
(Jakub Zelenka) (Jakub Zelenka)
- XMLReader:
. Add missing NULL pointer error check. (icy17)
- XMLWriter:
. Add missing NULL pointer error check. (icy17)
- XSL: - XSL:
. Add missing module dependency. (nielsdos) . Add missing module dependency. (nielsdos)

View file

@ -1157,6 +1157,9 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p
int isFileUri = 0; int isFileUri = 0;
uri = xmlCreateURI(); uri = xmlCreateURI();
if (uri == NULL) {
return NULL;
}
escsource = xmlURIEscapeStr((xmlChar *) source, (xmlChar *) ":"); escsource = xmlURIEscapeStr((xmlChar *) source, (xmlChar *) ":");
xmlParseURIReference(uri, (char *) escsource); xmlParseURIReference(uri, (char *) escsource);
xmlFree(escsource); xmlFree(escsource);

View file

@ -212,6 +212,9 @@ char *_xmlreader_get_valid_file_path(char *source, char *resolved_path, int reso
int isFileUri = 0; int isFileUri = 0;
uri = xmlCreateURI(); uri = xmlCreateURI();
if (uri == NULL) {
return NULL;
}
escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *)":"); escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *)":");
xmlParseURIReference(uri, (const char *)escsource); xmlParseURIReference(uri, (const char *)escsource);
xmlFree(escsource); xmlFree(escsource);

View file

@ -109,6 +109,9 @@ static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, i
int isFileUri = 0; int isFileUri = 0;
uri = xmlCreateURI(); uri = xmlCreateURI();
if (uri == NULL) {
return NULL;
}
escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *) ":"); escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *) ":");
xmlParseURIReference(uri, (char *)escsource); xmlParseURIReference(uri, (char *)escsource);
xmlFree(escsource); xmlFree(escsource);