summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 21:31:06 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 21:31:06 +0000
commitd87315c53973669e4d5ed77af6a60c9a2e9a2c6d (patch)
treec8b0bdb121a18c469b22b5ab3435c481671a2818
parentf295e48b3041f7f09f9807cecfcec8c9547d8e7b (diff)
downloadchromium_src-d87315c53973669e4d5ed77af6a60c9a2e9a2c6d.zip
chromium_src-d87315c53973669e4d5ed77af6a60c9a2e9a2c6d.tar.gz
chromium_src-d87315c53973669e4d5ed77af6a60c9a2e9a2c6d.tar.bz2
Merge 150123 - Handle a bad XSLT expression better.
BUG=138672 Review URL: https://chromiumcodereview.appspot.com/10830177 TBR=cevans@chromium.org Review URL: https://chromiumcodereview.appspot.com/10882041 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@153294 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/libxslt/libxslt/pattern.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/libxslt/libxslt/pattern.c b/third_party/libxslt/libxslt/pattern.c
index da0c535..9e9fbd6 100644
--- a/third_party/libxslt/libxslt/pattern.c
+++ b/third_party/libxslt/libxslt/pattern.c
@@ -1787,6 +1787,8 @@ xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) {
SKIP_BLANKS;
if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
xsltCompileIdKeyPattern(ctxt, name, 1, novar, 0);
+ if (ctxt->error)
+ return;
if ((CUR == '/') && (NXT(1) == '/')) {
PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
NEXT;