summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-01-06 13:11:00 -0800
committerJeremy Allison <jra@samba.org>2010-01-06 13:11:00 -0800
commitd5995eec7e5fd487b57b8805095ffbc74796411a (patch)
tree14213fb4e0e8ca2bc84a6fa9ddc12c5898a10659
parent3dbe8603d967d9d1b13290ec0f0556c7323a7692 (diff)
downloadsamba-d5995eec7e5fd487b57b8805095ffbc74796411a.tar.gz
samba-d5995eec7e5fd487b57b8805095ffbc74796411a.tar.bz2
samba-d5995eec7e5fd487b57b8805095ffbc74796411a.zip
Second part of the fix for bug #7020 - smbd using 2G memory.
There was a second leak in the processing of the out_data.frag prs_struct. It needs freeing once the current pdu has been returned asynchronously. Jeremy.
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 5d5eb0eeb1..83f27fee8e 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -903,6 +903,13 @@ static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_
out:
(*is_data_outstanding) = prs_offset(&p->out_data.frag) > n;
+ if (p->out_data.current_pdu_sent == prs_offset(&p->out_data.frag)) {
+ /* We've returned everything in the out_data.frag
+ * so we're done with this pdu. Free it and reset
+ * current_pdu_sent. */
+ p->out_data.current_pdu_sent = 0;
+ prs_mem_free(&p->out_data.frag);
+ }
return data_returned;
}