Avoid buffer overflow in fillBufBuilderOne (bump version)

ChangeLog.md

@@ -1,3 +1,8 @@
+## 0.1.2
+
+* Avoid buffer overflow in fillBufBuilderOne
+  [#3](https://github.com/kazu-yamamoto/http-semantics/pull/3)
+
 ## 0.1.1
 
 * Avoid buffer overflow in runStreamingBuilder

Network/HTTP/Semantics/FillBuf.hs

@@ -84,10 +84,14 @@ fillStreamBodyGetNext takeQ = loop 0
 
 ----------------------------------------------------------------
 
-fillBufBuilderOne :: B.BufferWriter -> DynaNext
-fillBufBuilderOne writer buf0 room = do
-    (len, signal) <- writer buf0 room
-    return $ nextForBuilder len signal
+fillBufBuilderOne :: Int -> B.BufferWriter -> DynaNext
+fillBufBuilderOne minReq writer buf0 room = do
+    if room >= minReq
+        then do
+          (len, signal) <- writer buf0 room
+          return $ nextForBuilder len signal
+        else do
+          return $ Next 0 True (Just $ fillBufBuilderOne minReq writer)
 
 fillBufBuilderTwo :: ByteString -> B.BufferWriter -> DynaNext
 fillBufBuilderTwo bs writer buf0 room
@@ -104,8 +108,8 @@ fillBufBuilderTwo bs writer buf0 room
 nextForBuilder :: BytesFilled -> B.Next -> Next
 nextForBuilder len B.Done =
     Next len True Nothing -- let's flush
-nextForBuilder len (B.More _ writer) =
-    Next len False $ Just (fillBufBuilderOne writer)
+nextForBuilder len (B.More minReq writer) =
+    Next len False $ Just (fillBufBuilderOne minReq writer)
 nextForBuilder len (B.Chunk bs writer) =
     Next len False $ Just (fillBufBuilderTwo bs writer)
 

http-semantics.cabal

@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               http-semantics
-version:            0.1.1
+version:            0.1.2
 license:            BSD3
 license-file:       LICENSE
 maintainer:         Kazu Yamamoto <kazu@iij.ad.jp>