aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/SPMySQLFramework/Source
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2013-05-08 08:28:02 +0000
committerrowanbeentje <rowan@beent.je>2013-05-08 08:28:02 +0000
commit0075a9074cc88a724da80b9bc2621674ac79b006 (patch)
tree11cbdfd9cc050fe4cc9961324e5fced611ba9344 /Frameworks/SPMySQLFramework/Source
parentd59d73db24aa8c2c5d8138a20e8668e3d534e7d4 (diff)
downloadsequelpro-0075a9074cc88a724da80b9bc2621674ac79b006.tar.gz
sequelpro-0075a9074cc88a724da80b9bc2621674ac79b006.tar.bz2
sequelpro-0075a9074cc88a724da80b9bc2621674ac79b006.zip
- Fix bit data conversion to strings to avoid memory trampling, addressing Issue #1708
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source')
-rw-r--r--Frameworks/SPMySQLFramework/Source/SPMySQLResult.m28
1 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];