diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 00:11:53 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 00:11:53 +0000 |
| commit | 3a766e0115e9799db766a88554b9ab12ee5bf2a4 (patch) | |
| tree | 5767f156ea22882e9d5dc8c4434b68b8c83b7cfe | |
| parent | 9a74a26771416216d2df194b1cdc9b960c5286be (diff) | |
| download | chromium_src-3a766e0115e9799db766a88554b9ab12ee5bf2a4.zip chromium_src-3a766e0115e9799db766a88554b9ab12ee5bf2a4.tar.gz chromium_src-3a766e0115e9799db766a88554b9ab12ee5bf2a4.tar.bz2 | |
Apply libxml fix for undefined namespaces.
BUG=93472
Review URL: http://codereview.chromium.org/7747031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98359 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libxml/src/xpath.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index 139a30b..970b287 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -17,6 +17,7 @@ Modifications: - Import additional XPath fix http://git.gnome.org/browse/libxml2/commit/?id=df83c17e5a2646bd923f75e5e507bc80d73c9722 - Import follow-on fix for above commit: http://git.gnome.org/browse/libxml2/commit/?id=fec31bcd452e77c10579467ca87a785b41115de6 - And a follow-on fix to the previous two fixes, commit upstream is pending. +- Add a fix for handling of unknown namespaces, commit upstream is pending. To import a new snapshot of libxml: diff --git a/third_party/libxml/src/xpath.c b/third_party/libxml/src/xpath.c index c7d69b5..fbacce7 100644 --- a/third_party/libxml/src/xpath.c +++ b/third_party/libxml/src/xpath.c @@ -13351,6 +13351,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", (char *) op->value4, (char *)op->value5); + ctxt->error = XPATH_UNDEF_PREFIX_ERROR; return (total); } val = xmlXPathVariableLookupNS(ctxt->context, @@ -13399,6 +13400,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) xmlGenericError(xmlGenericErrorContext, "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", (char *)op->value4, (char *)op->value5); + ctxt->error = XPATH_UNDEF_PREFIX_ERROR; return (total); } func = xmlXPathFunctionLookupNS(ctxt->context, |