Merge pull request #6 from suzukiplan/v1.03

ensures duplicate memory of MML string
suzukiplan · Feb 11, 2016 · e25c704 · e25c704
2 parents 53914d2 + 12277bd
commit e25c704
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 # Changes
 
+## Version 1.03
+- ensures duplicate memory of MML string: https://github.com/AmamiyaRinyuki/vgs-bgm-plugins/issues/1
+
 ## Version 1.02
 - added '\0' terminated check
 - bugfix: https://github.com/suzukiplan/vgs-mml-compiler/issues/3

diff --git a/src/vgsmml.c b/src/vgsmml.c
@@ -150,7 +150,7 @@ struct VgsBgmData* __stdcall vgsmml_compile_from_memory(void* data, size_t size,
     int nLine, cLine;
     int i;
     int* pos;
-    char* buf = (char*)data;
+    char* buf;
 
     if (NULL == err) {
         return NULL;
@@ -161,12 +161,15 @@ struct VgsBgmData* __stdcall vgsmml_compile_from_memory(void* data, size_t size,
         return NULL;
     }
 
-    /* memory check */
-    if ('\0' != ((char*)data)[size - 1]) {
-        strcpy(err->message, "need specify the \'\\0\' terminated string to the data argument.");
-        err->code = VGSMML_ERR_INVALID;
+    /* ensures duplicate memory */
+    buf = (char*)malloc(size + 1);
+    if (NULL == buf) {
+        strcpy(err->message, "no memory");
+        err->code = VGSMML_ERR_NO_MEMORY;
         return NULL;
     }
+    memcpy(buf, data, size);
+    buf[size] = '\0';
 
     /* count line */
     for (nLine = 1, i = 0; buf[i]; i++) {
@@ -177,6 +180,7 @@ struct VgsBgmData* __stdcall vgsmml_compile_from_memory(void* data, size_t size,
     if (NULL == (pos = (int*)malloc((nLine + 1) * sizeof(int)))) {
         strcpy(err->message, "no memory");
         err->code = VGSMML_ERR_NO_MEMORY;
+        free(buf);
         return NULL;
     }
 
@@ -203,6 +207,7 @@ struct VgsBgmData* __stdcall vgsmml_compile_from_memory(void* data, size_t size,
     /* execute next phase */
     result = phase3(buf, pos, err);
     free(pos);
+    free(buf);
     return result;
 }
 

diff --git a/test/test_memchk.c b/test/test_memchk.c
@@ -7,9 +7,8 @@ int main(int argc, char* argv[])
     struct VgsMmlErrorInfo err;
     char foo[4];
     strcpy(foo, "foo");
-    if (NULL == vgsmml_compile_from_memory(foo, 3, &err) && VGSMML_ERR_INVALID == err.code) {
-        puts(err.message);
-        puts("test succeed");
+    if (NULL == vgsmml_compile_from_memory(foo, 3, &err) && VGSMML_ERR_SYNTAX_UNKNOWN == err.code && 1 == err.line) {
+        printf("%s (code=%d, line=%d)\n", err.message, err.code, err.line);
         return 0;
     }
     puts("test failed");