Fixed crash when stub with very long data and no delay for response (f…

…ixes #57 #59)
AliSoftware · May 3, 2014 · a30890c · a30890c
2 parents 7d3a630 + cfb9216
commit a30890c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/OHHTTPStubs/Sources/OHHTTPStubs.m b/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -469,7 +469,7 @@ - (void) streamDataForClient:(id<NSURLProtocolClient>)client
                                timingInfo:timingInfo completion:completion];
             });
         } else {
-            uint8_t buffer[chunkSizeToRead];
+            uint8_t* buffer = (uint8_t*)malloc(sizeof(uint8_t*)*chunkSizeToRead);
             NSInteger bytesRead = [inputStream read:buffer maxLength:chunkSizeToRead];
             if (bytesRead > 0)
             {
@@ -492,6 +492,7 @@ - (void) streamDataForClient:(id<NSURLProtocolClient>)client
                     completion(inputStream.streamError);
                 }
             }
+            free(buffer);
         }
     }
     else

diff --git a/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m b/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
@@ -126,4 +126,16 @@ -(void)test_LongData_RequestTime1_ResponseTime5
     [self _testWithData:testData requestTime:1 responseTime:5];
 }
 
+-(void)test_VeryLongData_RequestTime1_ResponseTime0
+{
+    static NSUInteger const kDataLength = 609792;
+    NSMutableData* testData = [NSMutableData dataWithCapacity:kDataLength];
+    NSData* chunk = [[NSProcessInfo.processInfo globallyUniqueString] dataUsingEncoding:NSUTF8StringEncoding];
+    while(testData.length<kDataLength)
+    {
+        [testData appendData:chunk];
+    }
+    [self _testWithData:testData requestTime:1 responseTime:0];
+}
+
 @end