From 7a0793114b0b261906d8a0b4eaa9cce33b9d610e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Tue, 27 Mar 2012 13:01:28 +0200 Subject: There's no need to check pre-validated input elfHash and friends are used solely from do_translate, which already checks for null strings. There's no need to do it again here. Change-Id: I90a16d2623ca753a444e53952539001988568bdb Reviewed-by: Oswald Buddenhagen --- src/corelib/kernel/qtranslator.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/corelib/kernel/qtranslator.cpp') diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 284176dc9b..6120ab24ae 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -106,14 +106,12 @@ static void elfHash_continue(const char *name, uint &h) const uchar *k; uint g; - if (name) { - k = (const uchar *) name; - while (*k) { - h = (h << 4) + *k++; - if ((g = (h & 0xf0000000)) != 0) - h ^= g >> 24; - h &= ~g; - } + k = (const uchar *) name; + while (*k) { + h = (h << 4) + *k++; + if ((g = (h & 0xf0000000)) != 0) + h ^= g >> 24; + h &= ~g; } } -- cgit v1.2.3