darlinghq/darling-libxml2
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-libxml2.git synced 2025-03-01 06:56:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed problem with detecting external dtd encoding (bug 135229). minor

Browse Source 
* parser.c: fixed problem with detecting external dtd
  encoding (bug 135229).
* Makefile.am: minor change to test label
This commit is contained in:
William M. Brack 2004-04-16 15:58:29 +00:00
parent 5d8d10bba3
commit a0c48addfc
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Apr 16 23:58:42 HKT 2004 William Brack <wbrack@mmm.com.hk>
* parser.c: fixed problem with detecting external dtd
encoding (bug 135229).
* Makefile.am: minor change to test label
Fri Apr 16 16:09:31 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xinclude.c: fixed problem causing duplicate fallback

2
Makefile.am
View File

@ -899,7 +899,7 @@ Relaxtests: xmllint$(EXEEXT)
diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \
err.$$name | grep -v "error detected at";\
fi ; grep Unimplemented err.$$name`; \
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
rm res.$$name err.$$name ; \
fi ; fi ; \
done; done)

6
parser.c
View File

@ -1825,9 +1825,13 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
* Get the 4 first bytes and decode the charset
* if enc != XML_CHAR_ENCODING_NONE
* plug some encoding conversion routines.
* Note that, since we may have some non-UTF8
* encoding (like UTF16, bug 135229), the 'length'
* is not known, but we can calculate based upon
* the amount of data in the buffer.
*/
GROW
if (entity->length >= 4) {
if ((ctxt->input->end - ctxt->input->cur)>=4) {
start[0] = RAW;
start[1] = NXT(1);
start[2] = NXT(2);