diff --git a/CHANGELOG b/CHANGELOG index ae32fbd14..37c5fd836 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,5 @@ # Nmap Changelog ($Id$); -*-text-*- -o [NSE] Fixed bug in match.numbytes that would return one byte less than what - was requested. Updated redis library to take the fix into account. [Patrik] - o Added probe and matchline for Couchbase Membase NoSQL database [Patrik] o Added the new --script-args-file option which allows you to specify diff --git a/nselib/match.lua b/nselib/match.lua index 55d207c6b..0224724cd 100644 --- a/nselib/match.lua +++ b/nselib/match.lua @@ -45,7 +45,7 @@ end -- @usage sock:receive_buf(match.numbytes(80)) -- @see nmap.receive_buf numbytes = function(num) - local n = num + 1 + local n = num return function(buf) if(#buf >=n) then return n, n diff --git a/nselib/redis.lua b/nselib/redis.lua index 8f08100f7..233ec80be 100644 --- a/nselib/redis.lua +++ b/nselib/redis.lua @@ -76,7 +76,7 @@ Response = { local len = tonumber(data:match("^%$(%d*)")) -- we should only have a single line, so we can just peel of the length - status, data = self.socket:receive_buf(match.numbytes(len-1)) + status, data = self.socket:receive_buf(match.numbytes(len)) if( not(status) ) then return false, "Failed to receive data from server" end