Skip to content

Commit 3bb0078

Browse files
committed
Let NSString handle the string copy
1 parent 6f00cf0 commit 3bb0078

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

ObjectiveGit/GTRepository+Merging.m

+1-7
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,7 @@ - (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourS
240240
return nil;
241241
}
242242

243-
char *cString = malloc(result.len * sizeof(char *) + 1);
244-
strncpy(cString, result.ptr, result.len);
245-
cString[result.len] = '\0';
246-
247-
NSString *mergedContent = [[NSString alloc] initWithCString:cString encoding:NSUTF8StringEncoding];
248-
249-
free(cString);
243+
NSString *mergedContent = [[NSString alloc] initWithBytes:result.ptr length:result.len encoding:NSUTF8StringEncoding];
250244

251245
git_merge_file_result_free(&result);
252246

0 commit comments

Comments
 (0)