• the in r1313 introduced method [NSString stringWithCString:encoding:] must be a \0 terminated cString

- fixed that and replaced the deprecated method [NSString stringWithCString:length] again

1 files changed, 8 insertions, 3 deletions

diff --git a/Source/SPKeychain.m b/Source/SPKeychain.m
index 4a62c310..e808d3ea 100644
--- a/Source/SPKeychain.m
+++ b/Source/SPKeychain.m
@@ -129,6 +129,7 @@
 											NULL,						// default keychain
 											strlen([name UTF8String]),		// length of service name (bytes)
 											[name UTF8String],				// service name
+						
 											strlen([account UTF8String]),	// length of account name (bytes)
 											[account UTF8String],			// account name
 											&passwordLength,			// length of password
@@ -137,9 +138,13 @@
 											);
 	
 	if (status == noErr) {
-		password = [NSString stringWithCString:passwordData length:passwordLength];
-		// password = [NSString stringWithCString:passwordData encoding:NSUTF8StringEncoding];
-		
+		// Create a \0 terminated cString out of passwordData
+		char passwordBuf[passwordLength + 1];
+		strncpy(passwordBuf, passwordData, (size_t)passwordLength);
+		passwordBuf[passwordLength] = '\0';
+
+		password = [NSString stringWithCString:passwordBuf encoding:NSUTF8StringEncoding];
+
 		// Free the data allocated by SecKeychainFindGenericPassword:
 		SecKeychainItemFreeContent(
 									NULL,           // No attribute data to release