[libxslt] Fix crash with empty xsl:key/@match attribute
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Fix crash with empty xsl:key/@match attribute
- Date: Sun, 21 Oct 2012 23:14:57 +0000 (UTC)
commit dc11b6b379a882418093ecc8adf11f6166682e8d
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Sun Oct 21 19:02:25 2012 +0200
Fix crash with empty xsl:key/@match attribute
See https://bugzilla.gnome.org/show_bug.cgi?id=685328
Also improve some xsl:key error messages.
libxslt/keys.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/libxslt/keys.c b/libxslt/keys.c
index a995338..b8f1455 100644
--- a/libxslt/keys.c
+++ b/libxslt/keys.c
@@ -312,8 +312,8 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
end = skipPredicate(match, end);
if (end <= 0) {
xsltTransformError(NULL, style, inst,
- "key pattern is malformed: %s",
- key->match);
+ "xsl:key : 'match' pattern is malformed: %s",
+ key->match);
if (style != NULL) style->errors++;
goto error;
}
@@ -322,7 +322,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
}
if (current == end) {
xsltTransformError(NULL, style, inst,
- "key pattern is empty\n");
+ "xsl:key : 'match' pattern is empty\n");
if (style != NULL) style->errors++;
goto error;
}
@@ -345,6 +345,12 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
}
current = end;
}
+ if (pattern == NULL) {
+ xsltTransformError(NULL, style, inst,
+ "xsl:key : 'match' pattern is empty\n");
+ if (style != NULL) style->errors++;
+ goto error;
+ }
#ifdef WITH_XSLT_DEBUG_KEYS
xsltGenericDebug(xsltGenericDebugContext,
" resulting pattern %s\n", pattern);
@@ -364,7 +370,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
#endif
if (key->comp == NULL) {
xsltTransformError(NULL, style, inst,
- "xsl:key : XPath pattern compilation failed '%s'\n",
+ "xsl:key : 'match' pattern compilation failed '%s'\n",
pattern);
if (style != NULL) style->errors++;
}
@@ -375,7 +381,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
#endif
if (key->usecomp == NULL) {
xsltTransformError(NULL, style, inst,
- "xsl:key : XPath pattern compilation failed '%s'\n",
+ "xsl:key : 'use' expression compilation failed '%s'\n",
use);
if (style != NULL) style->errors++;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]