diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2005-07-03 16:19:41 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2005-07-03 16:19:41 +0000 |
| commit | 304e78c6b4f3a8087ac6a395692fd6503058dc47 (patch) | |
| tree | 03a2edac503830fcedc9c1b064374d8e50d10450 /parserInternals.c | |
| parent | 95175012ecb180e9f40f57455a600401f854075c (diff) | |
| download | android_external_libxml2-304e78c6b4f3a8087ac6a395692fd6503058dc47.tar.gz android_external_libxml2-304e78c6b4f3a8087ac6a395692fd6503058dc47.tar.bz2 android_external_libxml2-304e78c6b4f3a8087ac6a395692fd6503058dc47.zip | |
fix bug raised by zamez on IRC regenerated, seems to pop-up leaks in new
* parserInternals.c: fix bug raised by zamez on IRC
* testapi.c: regenerated, seems to pop-up leaks in new tree functions
* tree.c: added comments missing.
* doc/*: regenerated
Daniel
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/parserInternals.c b/parserInternals.c index 0e01deb4..b5e302e1 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -1267,9 +1267,11 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, int xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) { + int ret = 0; + if (handler != NULL) { if (ctxt->input != NULL) { - xmlSwitchInputEncoding(ctxt, ctxt->input, handler); + ret = xmlSwitchInputEncoding(ctxt, ctxt->input, handler); } else { xmlErrInternal(ctxt, "xmlSwitchToEncoding : no input\n", NULL); @@ -1281,7 +1283,7 @@ xmlSwitchToEncoding(xmlParserCtxtPtr ctxt, xmlCharEncodingHandlerPtr handler) ctxt->charset = XML_CHAR_ENCODING_UTF8; } else return(-1); - return(0); + return(ret); } /************************************************************************ |