View | Details | Raw Unified | Return to bug 24379
Collapse All | Expand All

(-)libxml2-v2.7.8-7-gfec31bc.orig/error.c (+6 lines)
Lines 461-466 Link Here
461
	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
461
	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
462
	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
462
	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
463
	    schannel = ctxt->sax->serror;
463
	    schannel = ctxt->sax->serror;
464
465
	    if(data == NULL)
466
		data = ctxt->userData;
464
    }
467
    }
465
    /*
468
    /*
466
     * Check if structured error handler set
469
     * Check if structured error handler set
Lines 480-485 Link Here
480
	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
483
	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
481
	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
484
	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
482
	    schannel = ctxt->sax->serror;
485
	    schannel = ctxt->sax->serror;
486
487
	    if(data == NULL)
488
		data = ctxt->userData;
483
    }
489
    }
484
    if (code == XML_ERR_OK)
490
    if (code == XML_ERR_OK)
485
        return;
491
        return;

Return to bug 24379