mirror of
https://github.com/python/cpython
synced 2024-09-19 14:31:27 +00:00
Issue25814: Propagate all errors from custom XML parser handlers
in ElementTree.iterparse().
This commit is contained in:
parent
6364094f49
commit
7efaf95934
|
@ -2448,6 +2448,23 @@ treebuilder_add_subelement(PyObject *element, PyObject *child)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOCAL(int)
|
||||||
|
treebuilder_append_event(TreeBuilderObject *self, PyObject *action,
|
||||||
|
PyObject *node)
|
||||||
|
{
|
||||||
|
if (action != NULL) {
|
||||||
|
PyObject *res = PyTuple_Pack(2, action, node);
|
||||||
|
if (res == NULL)
|
||||||
|
return -1;
|
||||||
|
if (PyList_Append(self->events, res) < 0) {
|
||||||
|
Py_DECREF(res);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
Py_DECREF(res);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/* handlers */
|
/* handlers */
|
||||||
|
|
||||||
|
@ -2515,16 +2532,8 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
|
||||||
Py_INCREF(node);
|
Py_INCREF(node);
|
||||||
self->last = node;
|
self->last = node;
|
||||||
|
|
||||||
if (self->start_event_obj) {
|
if (treebuilder_append_event(self, self->start_event_obj, node) < 0)
|
||||||
PyObject* res;
|
goto error;
|
||||||
PyObject* action = self->start_event_obj;
|
|
||||||
res = PyTuple_Pack(2, action, node);
|
|
||||||
if (res) {
|
|
||||||
PyList_Append(self->events, res);
|
|
||||||
Py_DECREF(res);
|
|
||||||
} else
|
|
||||||
PyErr_Clear(); /* FIXME: propagate error */
|
|
||||||
}
|
|
||||||
|
|
||||||
return node;
|
return node;
|
||||||
|
|
||||||
|
@ -2604,65 +2613,13 @@ treebuilder_handle_end(TreeBuilderObject* self, PyObject* tag)
|
||||||
self->last = self->this;
|
self->last = self->this;
|
||||||
self->this = item;
|
self->this = item;
|
||||||
|
|
||||||
if (self->end_event_obj) {
|
if (treebuilder_append_event(self, self->end_event_obj, self->last) < 0)
|
||||||
PyObject* res;
|
return NULL;
|
||||||
PyObject* action = self->end_event_obj;
|
|
||||||
PyObject* node = (PyObject*) self->last;
|
|
||||||
res = PyTuple_Pack(2, action, node);
|
|
||||||
if (res) {
|
|
||||||
PyList_Append(self->events, res);
|
|
||||||
Py_DECREF(res);
|
|
||||||
} else
|
|
||||||
PyErr_Clear(); /* FIXME: propagate error */
|
|
||||||
}
|
|
||||||
|
|
||||||
Py_INCREF(self->last);
|
Py_INCREF(self->last);
|
||||||
return (PyObject*) self->last;
|
return (PyObject*) self->last;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOCAL(void)
|
|
||||||
treebuilder_handle_namespace(TreeBuilderObject* self, int start,
|
|
||||||
PyObject *prefix, PyObject *uri)
|
|
||||||
{
|
|
||||||
PyObject* res;
|
|
||||||
PyObject* action;
|
|
||||||
PyObject* parcel;
|
|
||||||
|
|
||||||
if (!self->events)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (start) {
|
|
||||||
if (!self->start_ns_event_obj)
|
|
||||||
return;
|
|
||||||
action = self->start_ns_event_obj;
|
|
||||||
parcel = Py_BuildValue("OO", prefix, uri);
|
|
||||||
if (!parcel)
|
|
||||||
return;
|
|
||||||
Py_INCREF(action);
|
|
||||||
} else {
|
|
||||||
if (!self->end_ns_event_obj)
|
|
||||||
return;
|
|
||||||
action = self->end_ns_event_obj;
|
|
||||||
Py_INCREF(action);
|
|
||||||
parcel = Py_None;
|
|
||||||
Py_INCREF(parcel);
|
|
||||||
}
|
|
||||||
|
|
||||||
res = PyTuple_New(2);
|
|
||||||
|
|
||||||
if (res) {
|
|
||||||
PyTuple_SET_ITEM(res, 0, action);
|
|
||||||
PyTuple_SET_ITEM(res, 1, parcel);
|
|
||||||
PyList_Append(self->events, res);
|
|
||||||
Py_DECREF(res);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Py_DECREF(action);
|
|
||||||
Py_DECREF(parcel);
|
|
||||||
PyErr_Clear(); /* FIXME: propagate error */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/* methods (in alphabetical order) */
|
/* methods (in alphabetical order) */
|
||||||
|
|
||||||
|
@ -3100,45 +3057,39 @@ static void
|
||||||
expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix,
|
expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix,
|
||||||
const XML_Char *uri)
|
const XML_Char *uri)
|
||||||
{
|
{
|
||||||
PyObject* sprefix = NULL;
|
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
|
||||||
PyObject* suri = NULL;
|
PyObject *parcel;
|
||||||
|
|
||||||
if (PyErr_Occurred())
|
if (PyErr_Occurred())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (uri)
|
if (!target->events || !target->start_ns_event_obj)
|
||||||
suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict");
|
|
||||||
else
|
|
||||||
suri = PyUnicode_FromString("");
|
|
||||||
if (!suri)
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (prefix)
|
if (!uri)
|
||||||
sprefix = PyUnicode_DecodeUTF8(prefix, strlen(prefix), "strict");
|
uri = "";
|
||||||
else
|
if (!prefix)
|
||||||
sprefix = PyUnicode_FromString("");
|
prefix = "";
|
||||||
if (!sprefix) {
|
|
||||||
Py_DECREF(suri);
|
parcel = Py_BuildValue("ss", prefix, uri);
|
||||||
|
if (!parcel)
|
||||||
return;
|
return;
|
||||||
}
|
treebuilder_append_event(target, target->start_ns_event_obj, parcel);
|
||||||
|
Py_DECREF(parcel);
|
||||||
treebuilder_handle_namespace(
|
|
||||||
(TreeBuilderObject*) self->target, 1, sprefix, suri
|
|
||||||
);
|
|
||||||
|
|
||||||
Py_DECREF(sprefix);
|
|
||||||
Py_DECREF(suri);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in)
|
expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in)
|
||||||
{
|
{
|
||||||
|
TreeBuilderObject *target = (TreeBuilderObject*) self->target;
|
||||||
|
|
||||||
if (PyErr_Occurred())
|
if (PyErr_Occurred())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
treebuilder_handle_namespace(
|
if (!target->events)
|
||||||
(TreeBuilderObject*) self->target, 0, NULL, NULL
|
return;
|
||||||
);
|
|
||||||
|
treebuilder_append_event(target, target->end_ns_event_obj, Py_None);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in a new issue