Skip to content

Fix GH-17223: Memory leak in libxml encoding handling #17254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix GH-17223: Memory leak in libxml encoding handling #17254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a32924
Fix GH-17223: Memory leak in libxml encoding handling
nielsdos Dec 24, 2024
0a1c515
Make test portable
nielsdos Dec 25, 2024
96a3e7e
Even more portable I hope
nielsdos Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ext/dom/tests/gh17223.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
GH-17223 (Memory leak in libxml encoding handling)
--EXTENSIONS--
dom
--FILE--
<?php
$doc = new DOMDocument("1.0", "Shift-JIS");
@$doc->save("%00");
echo "Done\n";
?>
--EXPECT--
Done
11 changes: 8 additions & 3 deletions ext/libxml/libxml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,11 @@ php_libxml_output_buffer_create_filename(const char *URI,
char *unescaped = NULL;

if (URI == NULL)
return(NULL);
goto err;

if (strstr(URI, "%00")) {
php_error_docref(NULL, E_WARNING, "URI must not contain percent-encoded NUL bytes");
return NULL;
goto err;
}

puri = xmlParseURI(URI);
Expand All @@ -615,7 +615,7 @@ php_libxml_output_buffer_create_filename(const char *URI,
}

if (context == NULL) {
return(NULL);
goto err;
}

/* Allocate the Output buffer front-end. */
Expand All @@ -627,6 +627,11 @@ php_libxml_output_buffer_create_filename(const char *URI,
}

return(ret);

err:
/* Similarly to __xmlOutputBufferCreateFilename we should also close the encoder on failure. */
xmlCharEncCloseFunc(encoder);
return NULL;
}

static void _php_libxml_free_error(void *ptr)
Expand Down
Loading