diff options
author | Andrew Tridgell <tridge@samba.org> | 2003-12-05 11:30:47 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2003-12-05 11:30:47 +0000 |
commit | 1d4978d7225c3bab6374bb3f6aa5d563e69f52cf (patch) | |
tree | f6eea7b4f9097226a892d6e06873fe569cd8b3bc | |
parent | f6c798f4cc923f3f2d8d61f8a94ee1facc57aa58 (diff) | |
download | samba-1d4978d7225c3bab6374bb3f6aa5d563e69f52cf.tar.gz samba-1d4978d7225c3bab6374bb3f6aa5d563e69f52cf.tar.bz2 samba-1d4978d7225c3bab6374bb3f6aa5d563e69f52cf.zip |
fixed a problem with "net rpc vampire" mis-parsing the alias member
info reply
Thanks to a bug report by 'musb'
(This used to be commit 310f90f3689d4acd16368a833f23ea5f9aaa0133)
-rw-r--r-- | source3/rpc_parse/parse_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index ad0a91e7ea..5df75fc5f6 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -2283,12 +2283,12 @@ static BOOL net_io_sam_alias_mem_info(const char *desc, SAM_ALIAS_MEM_INFO * inf if (!prs_uint32("ptr_members", ps, depth, &info->ptr_members)) return False; + if (ps->data_offset + 16 > ps->buffer_size) + return False; + ps->data_offset += 16; + if (info->ptr_members != 0) { - if (ps->data_offset + 16 > ps->buffer_size) - return False; - ps->data_offset += 16; - if (!prs_uint32("num_sids", ps, depth, &info->num_sids)) return False; if (info->num_sids != info->num_members) |