From 78e86666d3da1a9fd904e8bfc6b8ead22a1520ec Mon Sep 17 00:00:00 2001 From: Andrew Sidwell Date: Mon, 11 Aug 2008 15:43:53 +0000 Subject: Fix valgrind's aliascmp() warning. svn path=/trunk/libparserutils/; revision=5026 --- src/charset/aliases.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/charset') diff --git a/src/charset/aliases.c b/src/charset/aliases.c index 68bc0ec..a720950 100644 --- a/src/charset/aliases.c +++ b/src/charset/aliases.c @@ -270,15 +270,16 @@ bool parserutils_charset_mibenum_is_unicode(uint16_t mibenum) */ int aliascmp(const char *s1, const char *s2, size_t s2_len) { - assert(s2_len != 0); + if (s1 == NULL || s2_len == 0) + return 1; size_t s2_pos = 0; while (true) { while (IS_PUNCT_OR_SPACE(*s1)) s1++; - while (IS_PUNCT_OR_SPACE(s2[s2_pos]) && - s2_pos < s2_len) { + while (s2_pos < s2_len && + IS_PUNCT_OR_SPACE(s2[s2_pos])) { s2_pos++; } -- cgit v1.2.3