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

(-)libxml2/error.c.fix (-7 / +8 lines)
Lines 464-479 __xmlRaiseError(xmlStructuredErrorFunc s Link Here
464
    }
464
    }
465
    /*
465
    /*
466
     * Check if structured error handler set
466
     * Check if structured error handler set
467
     */
467
     */
468
    if (schannel == NULL) {
468
    if (schannel == NULL)
469
	schannel = xmlStructuredError;
469
	schannel = xmlStructuredError;
470
	/*
470
471
	 * if user has defined handler, change data ptr to user's choice
472
	 */
473
	if (schannel != NULL)
474
	    data = xmlStructuredErrorContext;
475
    }
476
    if ((domain == XML_FROM_VALID) &&
471
    if ((domain == XML_FROM_VALID) &&
477
        ((channel == xmlParserValidityError) ||
472
        ((channel == xmlParserValidityError) ||
478
	 (channel == xmlParserValidityWarning))) {
473
	 (channel == xmlParserValidityWarning))) {
479
	ctxt = (xmlParserCtxtPtr) ctx;
474
	ctxt = (xmlParserCtxtPtr) ctx;
Lines 483-490 __xmlRaiseError(xmlStructuredErrorFunc s Link Here
483
    }
478
    }
484
    if (code == XML_ERR_OK)
479
    if (code == XML_ERR_OK)
485
        return;
480
        return;
486
    /*
481
    /*
482
     * if user has defined handler, change data ptr to user's choice
483
     */
484
    if (schannel != NULL)
485
        data = xmlStructuredErrorContext;
486
487
    /*
487
     * Formatting the message
488
     * Formatting the message
488
     */
489
     */
489
    if (msg == NULL) {
490
    if (msg == NULL) {
490
        str = (char *) xmlStrdup(BAD_CAST "No error message provided");
491
        str = (char *) xmlStrdup(BAD_CAST "No error message provided");

Return to bug 24379