summaryrefslogtreecommitdiffstats
path: root/source3/rpc_parse/parse_prs.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-01-19 13:39:54 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-01-19 13:39:54 +1100
commitd6e801b7d9a666d40f109df20dff0faaa2b46e70 (patch)
tree77d5e6ac67825eca5b8c970f6bfba95d8002f024 /source3/rpc_parse/parse_prs.c
parent9fa6fb3d9fb2e4cee81ad34d6fd0cbe6f5265171 (diff)
parentfe9dd8710d577478b324d1d507de0ecd77df2ea5 (diff)
downloadsamba-d6e801b7d9a666d40f109df20dff0faaa2b46e70.tar.gz
samba-d6e801b7d9a666d40f109df20dff0faaa2b46e70.tar.xz
samba-d6e801b7d9a666d40f109df20dff0faaa2b46e70.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/rpc_parse/parse_prs.c')
-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;