summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2013-12-09 07:10:12 +0100
committerKarolin Seeger <kseeger@samba.org>2013-12-09 07:10:12 +0100
commitff99526b5cd8b85de7d8e20fbe35c17935e2b0e7 (patch)
treea1f92bcef8ac64dd7f559fa633012cd4613e239e /lib
parentbfdf0984af539d40bcbfec75b1ee65a2808857a4 (diff)
parent6898c4dbf993889a804e77dd6cb32e0be50f653f (diff)
downloadsamba-ff99526b5cd8b85de7d8e20fbe35c17935e2b0e7.tar.gz
Merge tag 'samba-4.1.3' into v4-1-test
samba: tag release samba-4.1.3
Diffstat (limited to 'lib')
-rw-r--r--lib/async_req/async_sock.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 59dde885921..74b2cb7baa8 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -667,6 +667,11 @@ static void read_packet_handler(struct tevent_context *ev,
return;
}
+ if (total + more < total) {
+ tevent_req_error(req, EMSGSIZE);
+ return;
+ }
+
tmp = talloc_realloc(state, state->buf, uint8_t, total+more);
if (tevent_req_nomem(tmp, req)) {
return;