summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-05-10 16:19:53 +0000
committerGerald Carter <jerry@samba.org>2002-05-10 16:19:53 +0000
commitc6cbca79b43280e3b00b44058e54f694bb218d5a (patch)
tree5f4553fceae34966cfb62f5d8804e3e03dfadbfc /source3
parent9992378e5579e8f4c3adfedeb407f3c5aaffbacf (diff)
downloadsamba-c6cbca79b43280e3b00b44058e54f694bb218d5a.tar.gz
samba-c6cbca79b43280e3b00b44058e54f694bb218d5a.tar.bz2
samba-c6cbca79b43280e3b00b44058e54f694bb218d5a.zip
misc merge from SAMBA_2_2
(This used to be commit 0420098c47555224d2425845137e4159698e02c2)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_parse/parse_spoolss.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 825ff23838..91f430125e 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -2117,6 +2117,10 @@ static BOOL smb_io_reldevmode(char *desc, NEW_BUFFER *buffer, int depth, DEVICEM
/* read the offset */
if (!prs_uint32("offset", ps, depth, &buffer->string_at_end))
return False;
+ if (buffer->string_at_end == 0) {
+ *devmode = NULL;
+ return True;
+ }
old_offset = prs_offset(ps);
if(!prs_set_offset(ps, buffer->string_at_end + buffer->struct_start))