archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  [ci skip] NEWS
  Fix null pointer dereferences in case of allocation failure
This commit is contained in:
Niels Dossche 2023-10-24 19:42:59 +02:00
commit f9a9008fea
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/dom/document.c
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);

3
ext/xmlreader/php_xmlreader.c
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);

3
ext/xmlwriter/php_xmlwriter.c
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);