Fix double definition of private method and add handling for unlikely malloc failure

This commit is contained in:
Andreas Linde
2013-05-09 13:43:41 +02:00
parent f07efd3996
commit 89fa399787
2 changed files with 2 additions and 11 deletions

View File

@@ -232,17 +232,6 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
return uuidString;
}
- (NSString *)getDevicePlatform {
size_t size = 0;
sysctlbyname("hw.machine", NULL, &size, NULL, 0);
char *answer = (char*)malloc(size);
sysctlbyname("hw.machine", answer, &size, NULL, 0);
NSString *platform = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
free(answer);
return platform;
}
- (NSString *)userIDForCrashReport {
NSString *userID = @"";

View File

@@ -78,6 +78,8 @@
size_t size;
sysctlbyname("hw.machine", NULL, &size, NULL, 0);
char *answer = (char*)malloc(size);
if (answer == NULL)
return @"";
sysctlbyname("hw.machine", answer, &size, NULL, 0);
NSString *platform = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
free(answer);