PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-27 08:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Fixed a bug where int8 arrays wouldn't align properly (I hadn't noticed it before because the only place it's used is in registry functions, and all following variables were either ignored or set to the proper value by luck

Browse Source
This commit is contained in:
ron
2008-12-07 19:10:17 +00:00
parent ea42f39faa
commit da4a8ef302
2 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nselib/msrpctypes.lua
View File

@@ -908,8 +908,10 @@ end
--
--@param data The data packet.
--@param pos The position within the data.
--@param pad [optional] If set to true, will align data on 4-byte boundaries. Default:
-- true.
--@return (pos, str) The position, and the resulting string, which cannot be nil.
function unmarshall_int8_array(data, pos)
function unmarshall_int8_array(data, pos, pad)
local max, offset, actual
local str
@@ -918,6 +920,13 @@ function unmarshall_int8_array(data, pos)
pos, max, offset, actual = bin.unpack("<III", data, pos)
pos, str = bin.unpack("<A"..actual, data, pos)
-- Do the alignment (note the "- 1", it's there because of 1-based arrays)
if(pad == nil or pad == true) then
while(((pos - 1) % 4) ~= 0) do
pos = pos + 1
end
end
stdnse.print_debug(4, string.format("MSRPC: Leaving unmarshall_int8_array()"))
return pos, str
@@ -939,16 +948,19 @@ function marshall_int8_array_ptr(data, max_length)
return result
end
--- Unmarshall a pointer to an array of int8s.
--- Unmarshall a pointer to an array of int8s. By default, aligns the result to 4-byte
-- boundaries.
--
--@param data The data packet.
--@param pos The position within the data.
--@param pad [optional] If set to true, will align data on 4-byte boundaries. Default:
-- true.
--@return (pos, str) The position, and the resulting string, which cannot be nil.
function unmarshall_int8_array_ptr(data, pos)
function unmarshall_int8_array_ptr(data, pos, pad)
local str
stdnse.print_debug(4, string.format("MSRPC: Entering unmarshall_int8_array_ptr()"))
pos, str = unmarshall_ptr(ALL, data, pos, unmarshall_int8_array, {})
pos, str = unmarshall_ptr(ALL, data, pos, unmarshall_int8_array, {pad})
stdnse.print_debug(4, string.format("MSRPC: Leaving unmarshall_int8_array_ptr()"))
return pos, str