Merge branch 'master' of https://github.com/tarantool/tarantool

src/lua/bsdsocket.lua

@@ -560,29 +560,27 @@ end
 
 local function readline_check(self, eols, limit)
     local rbuf = self.rbuf
-    if rbuf == nil then
-        return nil
-    end
     if string.len(rbuf) == 0 then
         return nil
     end
 
     local shortest
-    for i, eol in pairs(eols) do
-        if string.len(rbuf) >= string.len(eol) then
-            local data = string.match(rbuf, "^(.-" .. eol .. ")")
-            if data ~= nil then
-                if string.len(data) > limit then
-                    data = string.sub(data, 1, limit)
-                end
-                if shortest == nil then
-                    shortest = data
-                elseif #shortest > #data then
-                    shortest = data
-                end
+    for i, eol in ipairs(eols) do
+        local data = string.match(rbuf, "^(.-" .. eol .. ")")
+        if data ~= nil then
+            if string.len(data) > limit then
+                data = string.sub(data, 1, limit)
+            end
+            if shortest == nil then
+                shortest = data
+            elseif #shortest > #data then
+                shortest = data
             end
         end
     end
+    if shortest == nil and #rbuf >= limit then
+        return string.sub(rbuf, 1, limit)
+    end
     return shortest
 end
 
@@ -592,6 +590,9 @@ local function readline(self, limit, eol, timeout)
     end
 
     self._errno = nil
+    if limit == 0 then
+        return ''
+    end
     local data = readline_check(self, eol, limit)
     if data ~= nil then
         self.rbuf = string.sub(self.rbuf, string.len(data) + 1)

test/box/bsdsocket.result

@@ -1377,6 +1377,80 @@ server:close()
 ---
 - true
 ...
+-- gh-658: socket:read() incorrectly handles size and delimiter together
+body = "a 10\nb 15\nabc"
+---
+...
+remaining = #body
+---
+...
+--# setopt delimiter ';'
+server = socket.tcp_server('unix/', path, function(s)
+    s:write(body)
+    s:read(100500)
+end);
+---
+...
+--# setopt delimiter ''
+client = socket.tcp_connect('unix/', path)
+---
+...
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+---
+...
+buf == "a 10\n"
+---
+- true
+...
+remaining = remaining - #buf
+---
+...
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+---
+...
+buf == "b 15\n"
+---
+- true
+...
+remaining = remaining - #buf
+---
+...
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+---
+...
+buf == "abc"
+---
+- true
+...
+remaining = remaining - #buf
+---
+...
+remaining == 0
+---
+- true
+...
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+---
+...
+buf == ""
+---
+- true
+...
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+---
+...
+buf == ""
+---
+- true
+...
+client:close()
+---
+- true
+...
+server:close()
+---
+- true
+...
 -- Test that socket is closed on GC
 s = socket('AF_UNIX', 'SOCK_STREAM', 'ip')
 ---

test/box/bsdsocket.test.lua

@@ -462,6 +462,32 @@ client = socket.tcp_connect('unix/', path)
 client:read{ line = { "\n\n", "\r\n\r\n" } }
 server:close()
 
+-- gh-658: socket:read() incorrectly handles size and delimiter together
+body = "a 10\nb 15\nabc"
+remaining = #body
+--# setopt delimiter ';'
+server = socket.tcp_server('unix/', path, function(s)
+    s:write(body)
+    s:read(100500)
+end);
+--# setopt delimiter ''
+client = socket.tcp_connect('unix/', path)
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+buf == "a 10\n"
+remaining = remaining - #buf
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+buf == "b 15\n"
+remaining = remaining - #buf
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+buf == "abc"
+remaining = remaining - #buf
+remaining == 0
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+buf == ""
+buf = client:read({ size = remaining, delimiter = "[\r\n]+"})
+buf == ""
+client:close()
+server:close()
 
 -- Test that socket is closed on GC
 s = socket('AF_UNIX', 'SOCK_STREAM', 'ip')