libxml2 r3826 - trunk

[veillard svn gnome org]

Author: veillard
Date: Thu Apr  2 12:04:35 2009
New Revision: 3826
URL: http://svn.gnome.org/viewvc/libxml2?rev=3826&view=rev

Log:
* error.c: fix structured error handling problems #564217
daniel


Modified:
   trunk/ChangeLog
   trunk/error.c

Modified: trunk/error.c
==============================================================================
--- trunk/error.c	(original)
+++ trunk/error.c	Thu Apr  2 12:04:35 2009
@@ -600,12 +600,12 @@
 	    channel = ctxt->sax->error;
 	data = ctxt->userData;
     } else if (channel == NULL) {
-        if (xmlStructuredError != NULL)
+        if ((schannel == NULL) && (xmlStructuredError != NULL))
 	    schannel = xmlStructuredError;
 	else
 	    channel = xmlGenericError;
 	if (!data) {
-	data = xmlGenericErrorContext;
+            data = xmlGenericErrorContext;
     }
     }
     if (schannel != NULL) {