From 936828de71023d90aaec6c1dba84052246bbad11 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 17 Feb 2010 09:24:34 -0800 Subject: [PATCH] Fix commit d07cd37b993d3c9beded20323174633b806196b5 Which was: tsocket/bsd: fix bug #7115 FreeBSD includes the UDP header in FIONREAD Metze, this has to have been wrong - you are throwing away the talloc_realloc pointer returned. Also no error checking. Please review. Thank goodness for gcc warnings :-). Jeremy. --- lib/tsocket/tsocket_bsd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 9027bc97114..9d5a3290d97 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -887,8 +887,11 @@ static void tdgram_bsd_recvfrom_handler(void *private_data) * some systems too much bytes in tsocket_bsd_pending() * the return value includes some IP/UDP header bytes */ + state->buf = talloc_realloc(state, state->buf, uint8_t, ret); + if (tevent_req_nomem(state->buf, req)) { + return; + } state->len = ret; - talloc_realloc(state, state->buf, uint8_t, ret); tevent_req_done(req); } -- 2.34.1