summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHannah Williams <hannah.williams@intel.com>2015-12-01 09:30:27 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-12-16 01:14:22 +0100
commit03d4ae76841bc9be62b5cc713fd84ccec1de9f12 (patch)
tree9a1d836b441e435025182f4b100a3685ec784232 /src
parentfa6014a6ec8253de8c86b0180221856a1398e70b (diff)
downloadcoreboot-03d4ae76841bc9be62b5cc713fd84ccec1de9f12.tar.xz
lib: Fix strncmp
strncmp continues to compare the characters in the input strings past any null termination it may encounter. Null termination check is added. Reviewed-on: https://chromium-review.googlesource.com/314815 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Commit-Queue: Hannah Williams <hannah.williams@intel.com> Tested-by: Hannah Williams <hannah.williams@intel.com> (cherry picked from commit ca7022752115eddbcb776f0c0d778249555ddf32) Reviewed-on: https://chromium-review.googlesource.com/315130 Change-Id: Ifc378966dcf6023efe3d32b026cc89d69b0bb990 Signed-off-by: Hannah Williams <hannah.williams@intel.com> Reviewed-on: https://review.coreboot.org/12721 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/include/string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/string.h b/src/include/string.h
index b862194979..125c676128 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -112,7 +112,7 @@ static inline int strncmp(const char *s1, const char *s2, int maxlen)
int i;
for (i = 0; i < maxlen; i++) {
- if (s1[i] != s2[i])
+ if ((s1[i] != s2[i]) || (s1[i] == '\0'))
return s1[i] - s2[i];
}