Merge pull request #389 from Countly/fix_mem_acc

Fix invalid memory access while serializing the events

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 25.4.1
+* Mitigated an issue that could occur while serializing events to improve stability, performance and memory usage.
+
 ## 25.4.0
 * ! Minor breaking change ! Removed UIDevice.currentDevice.identifierForVendor usage in device id generation. The SDK now exclusively uses random UUIDs for device id generation.
 * ! Minor breaking change ! Server Configuration is now enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.

Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '25.4.0'
+  s.version = '25.4.1'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly'
-  s.version = '25.4.0'
+  s.version = '25.4.1'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'

Countly.xcodeproj/project.pbxproj

@@ -760,7 +760,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.0;
+				MARKETING_VERSION = 25.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -792,7 +792,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 25.4.0;
+				MARKETING_VERSION = 25.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ly.count.CountlyiOSSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Countly.xcodeproj/xcshareddata/xcschemes/CountlyTests.xcscheme

@@ -8,8 +8,8 @@
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference

CountlyCommon.m

@@ -29,7 +29,7 @@ @interface CountlyCommon ()
 #endif
 @end
 
-NSString* const kCountlySDKVersion = @"25.4.0";
+NSString* const kCountlySDKVersion = @"25.4.1";
 NSString* const kCountlySDKName = @"objc-native-ios";
 
 NSString* const kCountlyErrorDomain = @"ly.count.ErrorDomain";

CountlyEvent.m

@@ -21,6 +21,14 @@ @implementation CountlyEvent
 NSString* const kCountlyEventKeyDayOfWeek     = @"dow";
 NSString* const kCountlyEventKeyDuration      = @"dur";
 
+/** 
+* This function is a critical component used within the `CountlyPersistency.serializeRecordedEvents` method. 
+* 
+* Note: If this function is modified, ensure that corresponding updates are made to 
+* the `CountlyPersistency.serializeRecordedEvents` method to maintain consistency and prevent potential issues. 
+* 
+* @warning Changes to this function may have downstream effects. Proceed with caution. 
+*/
 - (NSDictionary *)dictionaryRepresentation
 {
     NSMutableDictionary* eventData = NSMutableDictionary.dictionary;

CountlyPersistency.m

@@ -282,24 +282,17 @@ - (void)recordEvent:(CountlyEvent *)event
 
 - (NSString *)serializedRecordedEvents
 {
-    NSMutableArray *tempArray = NSMutableArray.new;
-    
     @synchronized (self.recordedEvents)
     {
         if (self.recordedEvents.count == 0)
             return nil;
-        
-        NSArray *eventsCopy = self.recordedEvents.copy;
-        
-        for (CountlyEvent *event in eventsCopy)
-        {
-            [tempArray addObject:[event dictionaryRepresentation]];
-        }
-        
-        [self.recordedEvents removeObjectsInArray:eventsCopy];
+
+        NSArray *eventDictionaries = [self.recordedEvents valueForKey:@"dictionaryRepresentation"];
+
+        [self.recordedEvents removeAllObjects];
+
+        return [eventDictionaries cly_JSONify];
     }
-    
-    return [tempArray cly_JSONify];
 }
 
 

CountlyTests/CountlyDeviceIDTests.swift

@@ -116,13 +116,13 @@ class CountlyDeviceIDTests: CountlyBaseTestCase {
     }
 
     func getIDFV() -> String {
-        var UUID = CountlyPersistency.sharedInstance().retrieveNSUUID()
-        if UUID == nil {
-            UUID = UUID().uuidString
-            CountlyPersistency.sharedInstance().storeNSUUID(UUID)
+        var uuid = CountlyPersistency.sharedInstance().retrieveNSUUID()
+        if uuid == nil {
+            uuid = UUID().uuidString
+            CountlyPersistency.sharedInstance().storeNSUUID(uuid)
         }
 
-        return UUID ?? ""
+        return uuid ?? ""
     }
 
 }