diff options
| author | Tim Potter <tpot@samba.org> | 2002-10-17 06:44:33 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-10-17 06:44:33 +0000 |
| commit | 788ca8b1185e3624ca623baade05e86f9114e69f (patch) | |
| tree | dc9e8cc42b77524c1e50bc3bc8afdcc2d6d79048 | |
| parent | 8f554208dff025d0d2a52ffce3d904046a815892 (diff) | |
| download | samba-788ca8b1185e3624ca623baade05e86f9114e69f.tar.gz samba-788ca8b1185e3624ca623baade05e86f9114e69f.tar.bz2 samba-788ca8b1185e3624ca623baade05e86f9114e69f.zip | |
Merge NULL relstr fix from HEAD.
(This used to be commit 0f2ddfcd95acec964a3a7652968c9469ac486814)
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 783dd97ebf..32f0c3a369 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -2097,6 +2097,9 @@ static BOOL smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR *str if (!prs_uint32("offset", ps, depth, &(buffer->string_at_end))) return False; + if (buffer->string_at_end == 0) + return True; + old_offset = prs_offset(ps); if(!prs_set_offset(ps, buffer->string_at_end+buffer->struct_start)) return False; |