diff options
| author | aarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 05:12:59 +0000 |
|---|---|---|
| committer | aarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 05:12:59 +0000 |
| commit | e6bed1d28778864c4cf514b209d3e9488d5996d9 (patch) | |
| tree | 687152ab2211c9ce62baa8c73c4484f392c4d281 /third_party | |
| parent | 094c773bb6c144f07b004ff3d1886100f157f4f6 (diff) | |
| download | chromium_src-e6bed1d28778864c4cf514b209d3e9488d5996d9.zip chromium_src-e6bed1d28778864c4cf514b209d3e9488d5996d9.tar.gz chromium_src-e6bed1d28778864c4cf514b209d3e9488d5996d9.tar.bz2 | |
Import UTF-8 fix from upstream: http://git.gnome.org/browse/libxml2/commit/?id=0795348aeb86648723bc391e4d02e20631c10bca
BUG=110978
Review URL: https://chromiumcodereview.appspot.com/9204008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libxml/src/xmlsave.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index 2fe4461..33b674e 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -20,6 +20,7 @@ Modifications: - Add a fix for handling of unknown namespaces, commit upstream is pending. - Add fixes for ending the parse properly if a SAX callback calls xmlStopParser(), commit upstream is pending. - Add fix for entities, commit upstream is http://git.gnome.org/browse/libxml2/commit/?id=5bd3c061823a8499b27422aee04ea20aae24f03e +- Import UTF-8 fix from upstream: http://git.gnome.org/browse/libxml2/commit/?id=0795348aeb86648723bc391e4d02e20631c10bca To import a new snapshot of libxml: diff --git a/third_party/libxml/src/xmlsave.c b/third_party/libxml/src/xmlsave.c index aaa5da8..9b43075 100644 --- a/third_party/libxml/src/xmlsave.c +++ b/third_party/libxml/src/xmlsave.c @@ -248,7 +248,7 @@ xmlEscapeEntities(unsigned char* out, int *outlen, /* * We assume we have UTF-8 input. */ - if (outend - out < 10) break; + if (outend - out < 11) break; if (*in < 0xC0) { xmlSaveErr(XML_SAVE_NOT_UTF8, NULL, NULL); @@ -1928,7 +1928,7 @@ xmlAttrSerializeTxtContent(xmlBufferPtr buf, xmlDocPtr doc, /* * We assume we have UTF-8 content. */ - unsigned char tmp[10]; + unsigned char tmp[12]; int val = 0, l = 1; if (base != cur) |