summaryrefslogtreecommitdiff
path: root/source3/rpc_parse
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-18 16:19:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-18 16:19:39 +0100
commitbfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b (patch)
tree068b3849e31c7b90a465be8172aac7c2b472d205 /source3/rpc_parse
parent5cf9989a70a23e5b955b7229fa95d3e604b1883d (diff)
parentc45b6ec29a5b3a39b83209e970b645e5ed0a411c (diff)
downloadsamba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.gz
samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.bz2
samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/rpc_parse')
-rw-r--r--source3/rpc_parse/parse_prs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index d549265fa1..1332a8311a 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -361,13 +361,10 @@ uint32 prs_offset(prs_struct *ps)
bool prs_set_offset(prs_struct *ps, uint32 offset)
{
- if(offset <= ps->data_offset) {
- ps->data_offset = offset;
- return True;
- }
-
- if(!prs_grow(ps, offset - ps->data_offset))
+ if ((offset > ps->data_offset)
+ && !prs_grow(ps, offset - ps->data_offset)) {
return False;
+ }
ps->data_offset = offset;
return True;