Sanitize null bytes in eval'ed text (#1538)

pythonx/UltiSnips/vim_helper.py

@@ -120,6 +120,9 @@ def command(cmd):
 
 def eval(text):
     """Wraps vim.eval."""
+    # Replace null bytes with newlines, as vim raises a ValueError and neovim
+    # treats it as a terminator for the entire command.
+    text = text.replace("\x00", "\n")
     return vim.eval(text)
 
 

test/constant.py

@@ -18,3 +18,5 @@
 
 COMPL_KW = chr(24) + chr(14)
 COMPL_ACCEPT = chr(25)
+
+CTRL_V = chr(22)

test/test_Fixes.py

@@ -1,3 +1,5 @@
+import unittest
+
 from test.vim_test_case import VimTestCase as _VimTest
 from test.constant import *
 
@@ -125,3 +127,24 @@ class PassThroughNonexecutedTrigger(_VimTest):
 
 
 # End: #1184
+
+
+# Tests for https://github.com/SirVer/ultisnips/issues/1386 (embedded null byte)
+
+
+NULL_BYTE = CTRL_V + "000"
+
+
+class NullByte_ListSnippets(_VimTest):
+    snippets = ("word", "never expanded", "", "w")
+    keys = "foobar" + NULL_BYTE + LS + "\n"
+    wanted = "foobar\x00\n"
+
+
+class NullByte_ExpandAfter(_VimTest):
+    snippets = ("test", "Expand me!", "", "w")
+    keys = "foobar " + NULL_BYTE + "test" + EX
+    wanted = "foobar \x00Expand me!"
+
+
+# End: #1386