use strncpy #283

2 files changed, 7 insertions, 6 deletions

diff --git a/src/emscripten-optimizer/istring.h b/src/emscripten-optimizer/istring.h
index 498c7c27c..8e91d044d 100644
--- a/src/emscripten-optimizer/istring.h
+++ b/src/emscripten-optimizer/istring.h
@@ -72,8 +72,9 @@ struct IString {
     } else {
       auto existing = strings->find(s);
       if (existing == strings->end()) {
-        char *copy = (char*)malloc(strlen(s)+1); // XXX leaked
-        strcpy(copy, s);
+        size_t len = strlen(s) + 1;
+        char *copy = (char*)malloc(len); // XXX leaked
+        strncpy(copy, s, len);
         s = copy;
         strings->insert(s);
       } else {
@@ -147,9 +148,9 @@ class IStringSet : public std::unordered_set<IString> {
 public:
   IStringSet() {}
   IStringSet(const char *init) { // comma-delimited list
-    int size = strlen(init);
-    char *curr = new char[size+1]; // leaked!
-    strcpy(curr, init);
+    int size = strlen(init) + 1;
+    char *curr = new char[size]; // leaked!
+    strncpy(curr, init, size);
     while (1) {
       char *end = strchr(curr, ' ');
       if (end) *end = 0;
diff --git a/src/emscripten-optimizer/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index 73037815f..75b7987be 100644
--- a/src/emscripten-optimizer/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
@@ -626,7 +626,7 @@ struct JSPrinter {
     maybeSpace(*s);
     int len = strlen(s);
     ensure(len+1);
-    strcpy(buffer + used, s);
+    strncpy(buffer + used, s, len+1);
     used += len;
   }