Fix memory leak and possible buffer overflow. CFStringGetMaximumSizeForEncoding() doesn't mention anything about NULL terminators so add one to protect against that.

2006-09-17 05:14:20 +00:00
parent a5ecf51f8a
commit 941dac27b3
1 changed files with 5 additions and 7 deletions
@@ -106,15 +106,13 @@ static bool ConvertFromCP( RString &sText, int iCodePage )
 		return false;
 	const size_t size = CFStringGetMaximumSizeForEncoding( CFStringGetLength(old), kCFStringEncodingUTF8 );
 	
-	char *buf = new char[size];
-	if( !CFStringGetCString(old, buf, size, kCFStringEncodingUTF8) )
-	{
-		delete[] buf;
-		return false;
-	}
+	char *buf = new char[size+1];
+	buf[0] = '\0';
+	bool result = CFStringGetCString( old, buf, size, kCFStringEncodingUTF8 );
 	sText = buf;
 	delete[] buf;
-	return true;
+	CFRelease( old );
+	return result;
 }

 static bool AttemptEnglishConversion( RString &sText ) { return ConvertFromCP( sText, 1252 ); }