Fix checking the result of malloc (#4878)

* Fix checking the result of malloc

Also make FIRCoreDiagnostics project generable again

* Fix compilation error

* Update CHANGELOGs

Author: mikehaney24

Firebase/CoreDiagnostics/CHANGELOG.md

@@ -1,5 +1,6 @@
 # v1.2.1
 - Fixed a bug that would manifest if a proto ended up being > 16,320 bytes.
+- Now checks the result of malloc. (#4872)
 
 # v1.2.0
 - Added basic watchOS support.

Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

@@ -237,8 +237,10 @@ + (NSString *)deviceModel {
  */
 pb_bytes_array_t *FIREncodeData(NSData *data) {
   pb_bytes_array_t *pbBytes = malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(data.length));
-  memcpy(pbBytes->bytes, [data bytes], data.length);
-  pbBytes->size = (pb_size_t)data.length;
+  if (pbBytes != NULL) {
+    memcpy(pbBytes->bytes, [data bytes], data.length);
+    pbBytes->size = (pb_size_t)data.length;
+  }
   return pbBytes;
 }
 
@@ -510,6 +512,9 @@ void FIRPopulateProtoWithInstalledServices(logs_proto_mobilesdk_ios_ICoreConfigu
   logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType *servicesInstalled =
       malloc(sizeof(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType) *
              sdkServiceInstalledArray.count);
+  if (servicesInstalled == NULL) {
+    return;
+  }
   for (NSUInteger i = 0; i < sdkServiceInstalledArray.count; i++) {
     NSNumber *typeEnum = sdkServiceInstalledArray[i];
     logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType serviceType =

Firebase/CoreDiagnostics/generate_project.sh

@@ -22,4 +22,4 @@ readonly REPO_DIR="$( git rev-parse --show-toplevel )"
   exit 1
 }
 
-pod gen "${REPO_DIR}/FirebaseCoreDiagnostics.podspec" --auto-open --gen-directory="${REPO_DIR}/gen" --local-sources="${REPO_DIR}/" --clean
+pod gen "${REPO_DIR}/FirebaseCoreDiagnostics.podspec" --auto-open --gen-directory="${REPO_DIR}/gen" --local-sources="${REPO_DIR}/" --platforms=ios,macos,tvos --clean

FirebaseCoreDiagnostics.podspec

@@ -52,6 +52,7 @@ non-Cocoapod integration. This library also respects the Firebase global data co
   s.dependency 'nanopb', '~> 0.3.901'
 
   s.test_spec 'unit' do |unit_tests|
+    unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
     unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
     unit_tests.dependency 'GoogleUtilities/UserDefaults', '~> 6.2'
     unit_tests.dependency 'OCMock'

GoogleDataTransportCCTSupport/CHANGELOG.md

@@ -1,6 +1,7 @@
 # v1.4.1
 - Fixed a bug that would manifest if a proto ended up being > 16,320 bytes.
 - Fix an Xcode 11.4 analyze error. (#4863)
+- Now checks the result of malloc. (#4871)
 
 # v1.4.0
 - Added the CSH backend and consolidated the CCT, FLL, and CSH backends.

GoogleDataTransportCCTSupport/GDTCCTLibrary/GDTCCTNanopbHelpers.m

@@ -39,8 +39,10 @@
 
 pb_bytes_array_t *GDTCCTEncodeData(NSData *data) {
   pb_bytes_array_t *pbBytes = malloc(PB_BYTES_ARRAY_T_ALLOCSIZE(data.length));
-  memcpy(pbBytes->bytes, [data bytes], data.length);
-  pbBytes->size = (pb_size_t)data.length;
+  if (pbBytes != NULL) {
+    memcpy(pbBytes->bytes, [data bytes], data.length);
+    pbBytes->size = (pb_size_t)data.length;
+  }
   return pbBytes;
 }
 
@@ -72,6 +74,9 @@ gdt_cct_BatchedLogRequest GDTCCTConstructBatchedLogRequest(
   gdt_cct_BatchedLogRequest batchedLogRequest = gdt_cct_BatchedLogRequest_init_default;
   NSUInteger numberOfLogRequests = logMappingIDToLogSet.count;
   gdt_cct_LogRequest *logRequests = malloc(sizeof(gdt_cct_LogRequest) * numberOfLogRequests);
+  if (logRequests == NULL) {
+    return batchedLogRequest;
+  }
 
   __block int i = 0;
   [logMappingIDToLogSet enumerateKeysAndObjectsUsingBlock:^(
@@ -102,6 +107,9 @@ gdt_cct_LogRequest GDTCCTConstructLogRequest(int32_t logSource,
   logRequest.client_info = GDTCCTConstructClientInfo();
   logRequest.has_client_info = 1;
   logRequest.log_event = malloc(sizeof(gdt_cct_LogEvent) * logSet.count);
+  if (logRequest.log_event == NULL) {
+    return logRequest;
+  }
   int i = 0;
   for (GDTCORStoredEvent *log in logSet) {
     gdt_cct_LogEvent logEvent = GDTCCTConstructLogEvent(log);