Duplicate the string out of the native abstraction class

mattyclarkson · mattyclarkson · commit c84362710b83 · 2015-03-02T17:44:52.000Z
As the class is scoped to the for loop it is destroyed which means that
the memory for the string is cleared. This disallows any strings to be
correctly converted into a git_strarray.
diff --git a/generate/templates/manual/src/str_array_converter.cc b/generate/templates/manual/src/str_array_converter.cc
@@ -25,17 +25,15 @@ git_strarray *StrArrayConverter::Convert(Handle<v8::Value> val) {
 }
 
 git_strarray *StrArrayConverter::ConvertArray(Array *val) {
-  int count = val->Length();
-  char **strings = (char **)malloc(sizeof(char*) * count);
-  git_strarray *result;
+  git_strarray *result = (git_strarray *)malloc(sizeof(git_strarray*));
+  result->count = val->Length();
+  result->strings = (char **)malloc(sizeof(char*) * result->count);
 
-  for(size_t i = 0; i < count; i++) {
+  for(size_t i = 0; i < result->count; i++) {
     NanUtf8String entry(val->Get(i));
-    strings[i] = *entry;
+    result->strings[i] = strdup(*entry);
   }
 
-  result = ConstructStrArray(count, strings);
-  free(strings);
   return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,15 @@ git_strarray *StrArrayConverter::Convert(Handle<v8::Value> val) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`git_strarray StrArrayConverter::ConvertArray(Array val) {`
`28`		`- int count = val->Length();`
`29`		`- char strings = (char )malloc(sizeof(char) count);`
`30`		`- git_strarray *result;`
	`28`	`+ git_strarray result = (git_strarray )malloc(sizeof(git_strarray*));`
	`29`	`+ result->count = val->Length();`
	`30`	`+ result->strings = (char *)malloc(sizeof(char) * result->count);`
`31`	`31`
`32`		`- for(size_t i = 0; i < count; i++) {`
	`32`	`+ for(size_t i = 0; i < result->count; i++) {`
`33`	`33`	`NanUtf8String entry(val->Get(i));`
`34`		`- strings[i] = *entry;`
	`34`	`+ result->strings[i] = strdup(*entry);`
`35`	`35`	`}`
`36`	`36`
`37`		`- result = ConstructStrArray(count, strings);`
`38`		`- free(strings);`
`39`	`37`	`return result;`
`40`	`38`	`}`
`41`	`39`