From 89fa39978785445bd2e1f643caa00a044b6e0fb2 Mon Sep 17 00:00:00 2001
From: Andreas Linde <mail@andreaslinde.de>
Date: Thu, 9 May 2013 13:43:41 +0200
Subject: [PATCH] Fix double definition of private method and add handling for
 unlikely malloc failure

---
 Classes/BITCrashManager.m      | 11 -----------
 Classes/BITHockeyBaseManager.m |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
index 136904802d..78f06cedfd 100644
--- a/Classes/BITCrashManager.m
+++ b/Classes/BITCrashManager.m
@@ -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 = @"";
   
diff --git a/Classes/BITHockeyBaseManager.m b/Classes/BITHockeyBaseManager.m
index 2da44b8402..d48e795da6 100644
--- a/Classes/BITHockeyBaseManager.m
+++ b/Classes/BITHockeyBaseManager.m
@@ -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);