diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 16:47:04 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 16:47:04 +0000 |
| commit | bb7bfb81c158268fb242292b7e0fbd2d3b933d09 (patch) | |
| tree | 076068e52ba179565892364fbf82cd5d727b1886 /third_party | |
| parent | 05a5c064849370e84f1fa2a883ab38372d78af0a (diff) | |
| download | chromium_src-bb7bfb81c158268fb242292b7e0fbd2d3b933d09.zip chromium_src-bb7bfb81c158268fb242292b7e0fbd2d3b933d09.tar.gz chromium_src-bb7bfb81c158268fb242292b7e0fbd2d3b933d09.tar.bz2 | |
Fix crash with unexpected DTD nodes in XSLT.
BUG=127417
Review URL: https://chromiumcodereview.appspot.com/10441148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxslt/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt/xsltutils.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/third_party/libxslt/README.chromium b/third_party/libxslt/README.chromium index de18197..4b60c21 100644 --- a/third_party/libxslt/README.chromium +++ b/third_party/libxslt/README.chromium @@ -40,7 +40,8 @@ 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 +- Import pattern parsing fix for commit: http://git.gnome.org/browse/libxslt/commit/?id=fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b +- A fix for XSLT node checking (from upstream, commit pending). To import a new snapshot of libxslt: diff --git a/third_party/libxslt/libxslt/xsltutils.h b/third_party/libxslt/libxslt/xsltutils.h index 3886be3..c986a9c 100644 --- a/third_party/libxslt/libxslt/xsltutils.h +++ b/third_party/libxslt/libxslt/xsltutils.h @@ -52,8 +52,8 @@ extern "C" { * Checks that the element pertains to XSLT namespace. */ #define IS_XSLT_ELEM(n) \ - (((n) != NULL) && ((n)->ns != NULL) && \ - (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE))) + (((n) != NULL) && ((n)->type == XML_ELEMENT_NODE) && \ + ((n)->ns != NULL) && (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE))) /** * IS_XSLT_NAME: |