Skip to content

Mitigate nil values and change strjoin library #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanjo9800 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mitigate nil values and change strjoin library #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562f695
Mitigate nil values and change strjoin library
Aug 30, 2019
0f495ab
Merge branch 'master' into msrpc_nil_and_strjoin
vanjo9800 Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nselib/msrpctypes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,6 @@ end
--@return (pos, int32) The new position, and the value.
function unmarshall_int32(data, pos)
local value

pos = pos or 1
if #data - pos + 1 < 4 then
stdnse.debug1("MSRPC: ERROR: Ran off the end of a packet in unmarshall_int32(). Please report!")
Expand Down Expand Up @@ -1652,6 +1651,8 @@ function marshall_dom_sid2(sid)
until pos_next == nil
sid_array['num_auths'] = i - 1

-- Make sure sid_array.authority is defined before passing it to string.pack
if (sid_array.authority == nil) then sid_array.authority = 1 end
result = {
-- TODO: Is the first 32-bit integer here supposed to be num_auths, or some
-- other count value?
Expand Down