Skip to content

gh-155742: Use PyBytesWriter in xml.etree #155749

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

Open
vstinner wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

gh-155742: Use PyBytesWriter in xml.etree #155749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3165,7 +3165,6 @@ makeuniversal(XMLParserObject* self, const char* string)
necessary */

PyObject* tag;
char* p;
Py_ssize_t i;

/* look for namespace separator */
Expand All @@ -3174,22 +3173,28 @@ makeuniversal(XMLParserObject* self, const char* string)
break;
if (i != size) {
/* convert to universal name */
tag = PyBytes_FromStringAndSize(NULL, size+1);
if (tag == NULL) {
PyBytesWriter *writer = PyBytesWriter_Create(1 + size);
if (writer == NULL) {
Py_DECREF(key);
return NULL;
}
p = PyBytes_AS_STRING(tag);
char *p = PyBytesWriter_GetData(writer);
p[0] = '{';
memcpy(p+1, string, size);
size++;

tag = PyBytesWriter_Finish(writer);
if (tag == NULL) {
Py_DECREF(key);
return NULL;
}
} else {
/* plain name; use key as tag */
tag = Py_NewRef(key);
}

/* decode universal name */
p = PyBytes_AS_STRING(tag);
const char *p = PyBytes_AS_STRING(tag);
value = PyUnicode_DecodeUTF8(p, size, "strict");
Py_DECREF(tag);
if (!value) {
Expand Down
Loading