Change clear_handlers argument to indicate whether this is an initialization.

loewis · loewis · commit 5b68ce3122a7 · 2001-10-21T08:53:52.000Z
Do not set the Expat handlers if it is. Fixes PyXML bug #473195.
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -290,12 +290,12 @@ conv_string_len_to_utf8(const XML_Char *str,  int len)
 
 /* Callback routines */
 
-static void clear_handlers(xmlparseobject *self, int decref);
+static void clear_handlers(xmlparseobject *self, int initial);
 
 static void
 flag_error(xmlparseobject *self)
 {
-    clear_handlers(self, 1);
+    clear_handlers(self, 0);
 }
 
 static PyCodeObject*
@@ -1017,7 +1017,7 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
         Py_DECREF(new_parser);
         return PyErr_NoMemory();
     }
-    clear_handlers(new_parser, 0);
+    clear_handlers(new_parser, 1);
 
     /* then copy handlers from self */
     for (i = 0; handler_info[i].name != NULL; i++) {
@@ -1193,7 +1193,7 @@ newxmlparseobject(char *encoding, char *namespace_separator)
 	    Py_DECREF(self);
 	    return PyErr_NoMemory();
     }
-    clear_handlers(self, 0);
+    clear_handlers(self, 1);
 
     return (PyObject*)self;
 }
@@ -1367,7 +1367,7 @@ xmlparse_traverse(xmlparseobject *op, visitproc visit, void *arg)
 static int
 xmlparse_clear(xmlparseobject *op)
 {
-    clear_handlers(op, 1);
+    clear_handlers(op, 0);
     return 0;
 }
 #endif
@@ -1676,19 +1676,20 @@ MODULE_INITFUNC(void)
 }
 
 static void
-clear_handlers(xmlparseobject *self, int decref)
+clear_handlers(xmlparseobject *self, int initial)
 {
     int i = 0;
     PyObject *temp;
 
     for (; handler_info[i].name!=NULL; i++) {
-        if (decref) {
+        if (initial)
+	    self->handlers[i]=NULL;
+	else {
             temp = self->handlers[i];
             self->handlers[i] = NULL;
             Py_XDECREF(temp);
+	    handler_info[i].setter(self->itself, NULL);
         }
-        self->handlers[i]=NULL;
-        handler_info[i].setter(self->itself, NULL);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -290,12 +290,12 @@ conv_string_len_to_utf8(const XML_Char *str, int len)`
`290`	`290`
`291`	`291`	`/* Callback routines */`
`292`	`292`
`293`		`-static void clear_handlers(xmlparseobject *self, int decref);`
	`293`	`+static void clear_handlers(xmlparseobject *self, int initial);`
`294`	`294`
`295`	`295`	`static void`
`296`	`296`	`flag_error(xmlparseobject *self)`
`297`	`297`	`{`
`298`		`- clear_handlers(self, 1);`
	`298`	`+ clear_handlers(self, 0);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`static PyCodeObject*`
`@@ -1017,7 +1017,7 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject self, PyObject args)`
`1017`	`1017`	`Py_DECREF(new_parser);`
`1018`	`1018`	`return PyErr_NoMemory();`
`1019`	`1019`	`}`
`1020`		`- clear_handlers(new_parser, 0);`
	`1020`	`+ clear_handlers(new_parser, 1);`
`1021`	`1021`
`1022`	`1022`	`/* then copy handlers from self */`
`1023`	`1023`	`for (i = 0; handler_info[i].name != NULL; i++) {`
`@@ -1193,7 +1193,7 @@ newxmlparseobject(char encoding, char namespace_separator)`
`1193`	`1193`	`Py_DECREF(self);`
`1194`	`1194`	`return PyErr_NoMemory();`
`1195`	`1195`	`}`
`1196`		`- clear_handlers(self, 0);`
	`1196`	`+ clear_handlers(self, 1);`
`1197`	`1197`
`1198`	`1198`	`return (PyObject*)self;`
`1199`	`1199`	`}`
`@@ -1367,7 +1367,7 @@ xmlparse_traverse(xmlparseobject op, visitproc visit, void arg)`
`1367`	`1367`	`static int`
`1368`	`1368`	`xmlparse_clear(xmlparseobject *op)`
`1369`	`1369`	`{`
`1370`		`- clear_handlers(op, 1);`
	`1370`	`+ clear_handlers(op, 0);`
`1371`	`1371`	`return 0;`
`1372`	`1372`	`}`
`1373`	`1373`	`#endif`
`@@ -1676,19 +1676,20 @@ MODULE_INITFUNC(void)`
`1676`	`1676`	`}`
`1677`	`1677`
`1678`	`1678`	`static void`
`1679`		`-clear_handlers(xmlparseobject *self, int decref)`
	`1679`	`+clear_handlers(xmlparseobject *self, int initial)`
`1680`	`1680`	`{`
`1681`	`1681`	`int i = 0;`
`1682`	`1682`	`PyObject *temp;`
`1683`	`1683`
`1684`	`1684`	`for (; handler_info[i].name!=NULL; i++) {`
`1685`		`- if (decref) {`
	`1685`	`+ if (initial)`
	`1686`	`+ self->handlers[i]=NULL;`
	`1687`	`+ else {`
`1686`	`1688`	`temp = self->handlers[i];`
`1687`	`1689`	`self->handlers[i] = NULL;`
`1688`	`1690`	`Py_XDECREF(temp);`
	`1691`	`+ handler_info[i].setter(self->itself, NULL);`
`1689`	`1692`	`}`
`1690`		`- self->handlers[i]=NULL;`
`1691`		`- handler_info[i].setter(self->itself, NULL);`
`1692`	`1693`	`}`
`1693`	`1694`	`}`
`1694`	`1695`