- Merge r4095 from trunk to the 1.0.x release branch: Fix bit data conversion to strings to avoid memory trampling, addressing Issue #1708release-1.0.2

 - Update localizable strings

2 files changed, 19 insertions, 9 deletions

diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLResult.m b/Frameworks/SPMySQLFramework/Source/SPMySQLResult.m
index ee758bad..fdc83332 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQLResult.m
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQLResult.m
@@ -346,21 +346,31 @@ static id NSNullPointer;
  * Provides a binary representation of the supplied bytes as a returned NSString.
  * The resulting binary representation will be zero-padded according to the supplied
  * field length.
+ * MySQL stores bit data as string data stored in an 8-bit wide character set.
  */
 + (NSString *)bitStringWithBytes:(const char *)bytes length:(NSUInteger)length padToLength:(NSUInteger)padLength
 {
-	if (bytes == NULL) return nil;
-
 	NSUInteger i = 0;
-	length--;
-	padLength--;
+	NSUInteger bitLength = length << 3;
+
+	if (bytes == NULL) {
+		return nil;
+	}
 
-	// Generate a C string representation of the binary data
-	char *cStringBuffer = malloc(length + 1);
-	while (i <= padLength) {
-		cStringBuffer[padLength - i++] = ( (bytes[length - (i >> 3)] >> (i & 0x7)) & 1 ) ? '1' : '0';
+	// Ensure padLength is never lower than the length
+	if (padLength < bitLength) {
+		padLength = bitLength;
+	}
+
+	// Generate a nul-terminated C string representation of the binary data
+	char *cStringBuffer = malloc(padLength + 1);
+	cStringBuffer[padLength] = '\0';
+	while (i < bitLength) {
+		cStringBuffer[padLength - ++i] = ( (bytes[length - 1 - (i >> 3)] >> (i & 0x7)) & 1 ) ? '1' : '0';
+	}
+	while (i++ < padLength) {
+		cStringBuffer[padLength - i] = '0';
 	}
-	cStringBuffer[padLength+1] = '\0';
 
 	// Convert to a string
 	NSString *returnString = [NSString stringWithUTF8String:cStringBuffer];
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 1b886910..caccee50 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings