Sanitize null bytes in eval'ed text

SirVer · Sep 25, 2023 · b3084a3 · b3084a3
1 parent c46341e
commit b3084a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pythonx/UltiSnips/vim_helper.py b/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)
 
 

diff --git a/test/test_Fixes.py b/test/test_Fixes.py
@@ -135,14 +135,12 @@ class PassThroughNonexecutedTrigger(_VimTest):
 NULL_BYTE = CTRL_V + "000"
 
 
-@unittest.expectedFailure
 class NullByte_ListSnippets(_VimTest):
     snippets = ("word", "never expanded", "", "w")
     keys = "foobar" + NULL_BYTE + LS + "\n"
     wanted = "foobar\x00\n"
 
 
-@unittest.expectedFailure
 class NullByte_ExpandAfter(_VimTest):
     snippets = ("test", "Expand me!", "", "w")
     keys = "foobar " + NULL_BYTE + "test" + EX