strndup_chk関数の修正とユニットテスト追加

[YACASL2.git] / src / cmem.c

diff --git a/src/cmem.c b/src/cmem.c
index ef7a9dd..17535d8 100644 (file)
--- a/src/cmem.c
+++ b/src/cmem.c
@@ -37,8 +37,12 @@ char *strndup_chk(const char *s, size_t len, char *tag)
     assert(s != NULL);
     char *t;
 
-    t = malloc_chk(len + 1, tag);
-    strncpy(t, s, len);
-    t[len] = '\0';
+    if(len < strlen(s)) {
+        t = malloc_chk(len + 1, tag);
+        strncpy(t, s, len);
+        t[len] = '\0';
+    } else {
+        t = strdup_chk(s, tag);
+    }
     return t;
 }