diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:53:21 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:53:21 +0000 |
| commit | d82b03d21f7e581f9206ef1fec4959ae7b06b8eb (patch) | |
| tree | e36b43b2770ebdf782f238eb29bdf122a885fc9e /third_party/libxml | |
| parent | 4291ada136f51a558b9ffab86e46b5b9989f9d56 (diff) | |
| download | chromium_src-d82b03d21f7e581f9206ef1fec4959ae7b06b8eb.zip chromium_src-d82b03d21f7e581f9206ef1fec4959ae7b06b8eb.tar.gz chromium_src-d82b03d21f7e581f9206ef1fec4959ae7b06b8eb.tar.bz2 | |
Pull entity fix from upstream.
BUG=107128
Review URL: http://codereview.chromium.org/9072008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml')
| -rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libxml/src/parser.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index 83e4a2c..2fe4461 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -19,6 +19,7 @@ Modifications: - And a follow-on fix to the previous two fixes, committed upstream: http://git.gnome.org/browse/libxml2/commit/?id=f5048b3e71fc30ad096970b8df6e7af073bae4cb (slightly differently, but we can drop our local fix on the next roll). - 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 To import a new snapshot of libxml: diff --git a/third_party/libxml/src/parser.c b/third_party/libxml/src/parser.c index 61c9f46..c181071 100644 --- a/third_party/libxml/src/parser.c +++ b/third_party/libxml/src/parser.c @@ -2587,7 +2587,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, buffer[nbchars++] = '&'; if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); + growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); } for (;i > 0;i--) buffer[nbchars++] = *cur++; |