diff options
| -rw-r--r-- | src/core/string.c | 4 | ||||
| -rw-r--r-- | src/tests/string_test.c | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/core/string.c b/src/core/string.c index 190007a47..e53c283c2 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'; diff --git a/src/tests/string_test.c b/src/tests/string_test.c index 934c537cf..3b48d9f3d 100644 --- a/src/tests/string_test.c +++ b/src/tests/string_test.c @@ -134,6 +134,26 @@ static void string_test_exec ( void ) { ok ( strcmp ( dup, orig ) == 0 ); free ( dup ); } + + /* Test strndup() */ + { + const char *normal = "testing testing"; + const char unterminated[6] = { 'h', 'e', 'l', 'l', 'o', '!' }; + char *dup; + dup = strndup ( normal, 32 ); + ok ( dup != NULL ); + ok ( dup != normal ); + ok ( strcmp ( dup, normal ) == 0 ); + free ( dup ); + dup = strndup ( normal, 4 ); + ok ( dup != NULL ); + ok ( strcmp ( dup, "test" ) == 0 ); + free ( dup ); + dup = strndup ( unterminated, 5 ); + ok ( dup != NULL ); + ok ( strcmp ( dup, "hello" ) == 0 ); + free ( dup ); + } } /** String self-test */ |