We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 6f00cf0 commit 3bb0078Copy full SHA for 3bb0078
ObjectiveGit/GTRepository+Merging.m
@@ -240,13 +240,7 @@ - (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourS
240
return nil;
241
}
242
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);
+ NSString *mergedContent = [[NSString alloc] initWithBytes:result.ptr length:result.len encoding:NSUTF8StringEncoding];
250
251
git_merge_file_result_free(&result);
252
0 commit comments