unittests: Fix bug somewhere that makes file_read tests SEGV

2 files changed, 10 insertions, 3 deletions

diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index 22b61786c0..3f0bd16e6c 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -67,7 +67,10 @@ local function file_read(fp, size)
   if size == nil then
     size = 0
   else
-    buf = ffi.new('char[?]', size, ('\0'):rep(size))
+    -- For some reason if length of NUL-bytes-string is the same as `char[?]`
+    -- size luajit garbage collector crashes. But it does not do so in
+    -- os_read[v] tests in os/fs_spec.lua.
+    buf = ffi.new('char[?]', size + 1, ('\0'):rep(size))
   end
   local ret1 = m.file_read(fp, buf, size)
   local ret2 = ''
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 1f7f6fb791..cc10b0cfa4 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -378,12 +378,16 @@ describe('fs function', function()
     local function os_close(fd)
       return fs.os_close(fd)
     end
+    -- For some reason if length of NUL-bytes-string is the same as `char[?]`
+    -- size luajit crashes. Though it does not do so in this test suite, better
+    -- be cautios and allocate more elements then needed. I only did this to
+    -- strings.
     local function os_read(fd, size)
       local buf = nil
       if size == nil then
         size = 0
       else
-        buf = ffi.new('char[?]', size, ('\0'):rep(size))
+        buf = ffi.new('char[?]', size + 1, ('\0'):rep(size))
       end
       local eof = ffi.new('bool[?]', 1, {true})
       local ret2 = fs.os_read(fd, eof, buf, size)
@@ -398,7 +402,7 @@ describe('fs function', function()
       local bufs = {}
       for i, size in ipairs(sizes) do
         bufs[i] = {
-          iov_base=ffi.new('char[?]', size, ('\0'):rep(size)),
+          iov_base=ffi.new('char[?]', size + 1, ('\0'):rep(size)),
           iov_len=size,
         }
       end