Merge pull request #14 from kivikakk/latest-upstream

Latest upstream

CMarkGFM.hsc

@@ -43,7 +43,7 @@ import Data.Maybe (fromMaybe)
 import GHC.Generics (Generic)
 import Data.Data (Data)
 import Data.Typeable (Typeable)
-import Data.Text (Text, empty)
+import Data.Text (Text, empty, snoc)
 import qualified Data.Text.Foreign as TF
 import Data.ByteString.Unsafe (unsafePackMallocCString)
 import Data.Text.Encoding (decodeUtf8)
@@ -492,7 +492,7 @@ totext str
   | otherwise      = TF.peekCStringLen (str, c_strlen str)
 
 withtext :: Text -> (CString -> IO a) -> IO a
-withtext t f = TF.withCStringLen t (f . fst)
+withtext t f = TF.withCStringLen (snoc t '\0') (f . fst)
 
 foreign import ccall "string.h strlen"
     c_strlen :: CString -> Int

changelog

@@ -1,18 +1,28 @@
+cmark 0.5.6.3 (13 Mar 2019)
+
+  * Use snoc instead of <> to add the null terminator.
+
+cmark 0.5.6.2 (13 Mar 2019)
+
+  * Ensure that withtext adds a null terminator (#14).
+    This fixes a regression due to PR #13, which caused
+    random content to appear in rendered TEXT nodes.
+
 cmark-gfm 0.1.7 (13 Mar 2019)
 
   * Update to cmark-gfm 0.28.3.gfm.20.
 
 cmark 0.5.6.1 (11 Mar 2019)
 
   * Fix CString memory leaks (Anders Kaseorg).  The renderer functions return
-    a malloc’d string which the caller is expected to free.
+  a malloc’d string which the caller is expected to free.
 
   * Fix use-after-free bugs (Anders Kaseorg).  `useAsCString` frees the
-    CString after the IO action finishes executing, so passing `return` as that
-    action can never be correct.  To make sure the CString gets freed at the
-    right time, we need a “with”-style abstraction, not just a conversion
-    function.  While we’re here replace this with `withCStringLen`, which also
-    makes fewer copies.
+    CString after the IO action finishes executing, so passing `return` as
+    that action can never be correct.  To make sure the CString gets freed
+    at the right time, we need a “with”-style abstraction, not just a
+    conversion function.  While we’re here replace this with
+    `withCStringLen`, which also makes fewer copies.
 
   * Show node type on error for unknown node type.
 

cmark-gfm.cabal

@@ -57,7 +57,7 @@ extra-source-files:  README.md
                      cbits/footnotes.h
                      bench/sample.md
                      bench/full-sample.md
-cabal-version:       >=1.14
+cabal-version:       1.14
 
 Source-repository head
   type:              git