Fix ubsan issues in GDT (#3910)

Author: paulb777

GoogleDataTransport/GDTCORLibrary/GDTCOREvent.m

@@ -23,7 +23,7 @@
 
 @implementation GDTCOREvent
 
-- (instancetype)initWithMappingID:(NSString *)mappingID target:(NSInteger)target {
+- (nullable instancetype)initWithMappingID:(NSString *)mappingID target:(NSInteger)target {
   GDTCORAssert(mappingID.length > 0, @"Please give a valid mapping ID");
   GDTCORAssert(target > 0, @"A target cannot be negative or 0");
   if (mappingID == nil || mappingID.length == 0 || target <= 0) {

GoogleDataTransport/GDTCORLibrary/GDTCORStorage.m

@@ -120,9 +120,10 @@ - (void)storeEvent:(GDTCOREvent *)event {
     // Write state to disk.
     if (self->_runningInBackground) {
       if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
+        NSError *error;
         NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
                                              requiringSecureCoding:YES
-                                                             error:nil];
+                                                             error:&error];
         [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
       } else {
 #if !defined(TARGET_OS_MACCATALYST)
@@ -217,8 +218,9 @@ - (void)addEventToTrackingCollections:(GDTCORStoredEvent *)event {
 
 - (void)appWillForeground:(GDTCORApplication *)app {
   if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
+    NSError *error;
     NSData *data = [NSData dataWithContentsOfFile:[GDTCORStorage archivePath]];
-    [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTCORStorage class] fromData:data error:nil];
+    [NSKeyedUnarchiver unarchivedObjectOfClass:[GDTCORStorage class] fromData:data error:&error];
   } else {
 #if !defined(TARGET_OS_MACCATALYST)
     [NSKeyedUnarchiver unarchiveObjectWithFile:[GDTCORStorage archivePath]];
@@ -230,9 +232,10 @@ - (void)appWillBackground:(GDTCORApplication *)app {
   self->_runningInBackground = YES;
   dispatch_async(_storageQueue, ^{
     if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
+      NSError *error;
       NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
                                            requiringSecureCoding:YES
-                                                           error:nil];
+                                                           error:&error];
       [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
     } else {
 #if !defined(TARGET_OS_MACCATALYST)
@@ -258,9 +261,10 @@ - (void)appWillBackground:(GDTCORApplication *)app {
 
 - (void)appWillTerminate:(GDTCORApplication *)application {
   if (@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)) {
+    NSError *error;
     NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self
                                          requiringSecureCoding:YES
-                                                         error:nil];
+                                                         error:&error];
     [data writeToFile:[GDTCORStorage archivePath] atomically:YES];
   } else {
 #if !defined(TARGET_OS_MACCATALYST)

GoogleDataTransport/GDTCORLibrary/GDTCORTransport.m

@@ -25,9 +25,10 @@
 
 @implementation GDTCORTransport
 
-- (instancetype)initWithMappingID:(NSString *)mappingID
-                     transformers:(nullable NSArray<id<GDTCOREventTransformer>> *)transformers
-                           target:(NSInteger)target {
+- (nullable instancetype)initWithMappingID:(NSString *)mappingID
+                              transformers:
+                                  (nullable NSArray<id<GDTCOREventTransformer>> *)transformers
+                                    target:(NSInteger)target {
   GDTCORAssert(mappingID.length > 0, @"A mapping ID cannot be nil or empty");
   GDTCORAssert(target > 0, @"A target cannot be negative or 0");
   if (mappingID == nil || mappingID.length == 0 || target <= 0) {

GoogleDataTransport/GDTCORLibrary/GDTCORUploadCoordinator.m

@@ -242,7 +242,9 @@ - (void)packageDelivered:(GDTCORUploadPackage *)package successful:(BOOL)success
         [prioritizer packageDelivered:package successful:successful];
       }
     }
-    [self.storage removeEvents:package.events];
+    if (package.events != nil) {
+      [self.storage removeEvents:package.events];
+    }
   });
 }
 

GoogleDataTransport/GDTCORLibrary/Public/GDTCOREvent.h

@@ -79,8 +79,8 @@ typedef NS_ENUM(NSInteger, GDTCOREventQoS) {
  * @param target The event's target identifier.
  * @return An instance of this class.
  */
-- (instancetype)initWithMappingID:(NSString *)mappingID
-                           target:(NSInteger)target NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithMappingID:(NSString *)mappingID
+                                    target:(NSInteger)target NS_DESIGNATED_INITIALIZER;
 
 /** Returns the GDTCORStoredEvent equivalent of self.
  *

GoogleDataTransport/GDTCORLibrary/Public/GDTCORTransport.h

@@ -35,9 +35,10 @@ NS_ASSUME_NONNULL_BEGIN
  * @param target The target backend of this transport.
  * @return A transport that will send events.
  */
-- (instancetype)initWithMappingID:(NSString *)mappingID
-                     transformers:(nullable NSArray<id<GDTCOREventTransformer>> *)transformers
-                           target:(NSInteger)target NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithMappingID:(NSString *)mappingID
+                              transformers:
+                                  (nullable NSArray<id<GDTCOREventTransformer>> *)transformers
+                                    target:(NSInteger)target NS_DESIGNATED_INITIALIZER;
 
 /** Copies and sends an internal telemetry event. Events sent using this API are lower in priority,
  * and sometimes won't be sent on their own.