summaryrefslogtreecommitdiffstats
path: root/src/core/string.c
diff options
context:
space:
mode:
authorMichael Brown2014-05-18 22:05:39 +0200
committerMichael Brown2014-05-18 22:09:49 +0200
commit2b4be69eee372e1010af2302e82c3d0cf1d875e9 (patch)
tree29a68f744d7df70437b8e3ede82e98c3d4c9de9e /src/core/string.c
parent[test] Add self-tests for strdup() (diff)
downloadipxe-2b4be69eee372e1010af2302e82c3d0cf1d875e9.tar.gz
ipxe-2b4be69eee372e1010af2302e82c3d0cf1d875e9.tar.xz
ipxe-2b4be69eee372e1010af2302e82c3d0cf1d875e9.zip
[libc] Prevent strndup() from reading beyond the end of the string
strndup() may be called on a string which is not NUL-terminated. Use strnlen() instead of strlen() to ensure that we do not read beyond the end of such a string. Add self-tests for strndup(), including a test case with an unterminated string. Originally-fixed-by: Marin Hannache <git@mareo.fr> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/core/string.c')
-rw-r--r--src/core/string.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/string.c b/src/core/string.c
index 190007a4..e53c283c 100644
--- a/src/core/string.c
+++ b/src/core/string.c
@@ -337,11 +337,9 @@ void * memchr(const void *s, int c, size_t n)
char * strndup(const char *s, size_t n)
{
- size_t len = strlen(s);
+ size_t len = strnlen(s,n);
char *new;
- if (len>n)
- len = n;
new = malloc(len+1);
if (new) {
new[len] = '\0';