diff options
| author | Andrew Sidwell <andy@entai.co.uk> | 2008-08-11 15:43:53 +0000 |
|---|---|---|
| committer | Andrew Sidwell <andy@entai.co.uk> | 2008-08-11 15:43:53 +0000 |
| commit | 78e86666d3da1a9fd904e8bfc6b8ead22a1520ec (patch) | |
| tree | 42bce490138d1a16f70d853180a655571c43eb76 /src | |
| parent | 64e00c183001e9bc0282b75ac99725ac24afca5e (diff) | |
| download | libparserutils-78e86666d3da1a9fd904e8bfc6b8ead22a1520ec.tar.gz libparserutils-78e86666d3da1a9fd904e8bfc6b8ead22a1520ec.tar.bz2 | |
Fix valgrind's aliascmp() warning.
svn path=/trunk/libparserutils/; revision=5026
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset/aliases.c | 7 |
1 files changed, 4 insertions, 3 deletions
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++; } |