summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 05:06:58 +0000
committeraarya@google.com <aarya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 05:06:58 +0000
commit094c773bb6c144f07b004ff3d1886100f157f4f6 (patch)
tree2a3ff876aee260d9d68f4c315b681ef4b6d05ad7
parentafe1e885fcd2fec54c4d107644c6f574c6817b92 (diff)
downloadchromium_src-094c773bb6c144f07b004ff3d1886100f157f4f6.zip
chromium_src-094c773bb6c144f07b004ff3d1886100f157f4f6.tar.gz
chromium_src-094c773bb6c144f07b004ff3d1886100f157f4f6.tar.bz2
Fix issue with pattern parsing in xsltCompilePatternInternal.
Import pattern parsing fix for commit: http://git.gnome.org/browse/libxslt/commit/?id=fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b BUG=110277 Review URL: https://chromiumcodereview.appspot.com/9275001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118654 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/libxslt/README.chromium2
-rw-r--r--third_party/libxslt/libxslt/pattern.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/third_party/libxslt/README.chromium b/third_party/libxslt/README.chromium
index 9870f12..de18197 100644
--- a/third_party/libxslt/README.chromium
+++ b/third_party/libxslt/README.chromium
@@ -1,6 +1,7 @@
Name: libxslt
URL: http://xmlsoft.org/XSLT
Version: 1.1.26
+Security Critical: yes
Description:
This directory contains a partial snapshot of the libxslt library
@@ -39,6 +40,7 @@ done ---
Current version: 1.1.26, plus the following patches:
- A fix to get more compact generated IDs (http://git.gnome.org/browse/libxslt/commit/?id=ecb6bcb8d1b7e44842edde3929f412d46b40c89f)
+- Import pattern parsing fix for commit: http://git.gnome.org/browse/libxslt/commit/?id=fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b
To import a new snapshot of libxslt:
diff --git a/third_party/libxslt/libxslt/pattern.c b/third_party/libxslt/libxslt/pattern.c
index 8ce74e3..da0c535 100644
--- a/third_party/libxslt/libxslt/pattern.c
+++ b/third_party/libxslt/libxslt/pattern.c
@@ -1864,6 +1864,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
while ((pattern[end] != 0) && (pattern[end] != '"'))
end++;
}
+ if (pattern[end] == 0)
+ break;
end++;
}
if (current == end) {