fix(crypto): check if NSData is null terminated

Alinto · Feb 12, 2024 · 5197b9b · 5197b9b
1 parent 26f05a6
commit 5197b9b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/SoObjects/SOGo/NSString+Crypto.m b/SoObjects/SOGo/NSString+Crypto.m
@@ -660,7 +660,16 @@ - (NSString *)decryptAES256GCM:(NSString *)passwordScheme iv:(NSString *)ivStrin
 
     if (rv > 0) {
       if (outputData) {
-        value = [NSString stringWithUTF8String: [outputData bytes]];
+        char lastByte;
+        [outputData getBytes:&lastByte range:NSMakeRange([outputData length]-1, 1)];
+        if (lastByte == 0x0) {
+          // string is null terminated
+          value = [NSString stringWithUTF8String: [outputData bytes]];
+        } else {
+          // string is not null terminated
+          value = [[NSString alloc] initWithData:outputData encoding:NSUTF8StringEncoding];
+          [value autorelease];
+        }
       } else {
         *ex = [NSException exceptionWithName: kAES256GCMError reason:@"Decryption ok but output empty" userInfo: nil];
       }