The branch, master has been updated
via 936828d... Fix commit d07cd37b993d3c9beded20323174633b806196b5
from 968bd16... s4/rodc: change the libnet_become_dc code to do RODC join
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 936828de71023d90aaec6c1dba84052246bbad11
Author: Jeremy Allison <[email protected]>
Date: Wed Feb 17 09:24:34 2010 -0800
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.
-----------------------------------------------------------------------
Summary of changes:
lib/tsocket/tsocket_bsd.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 9027bc9..9d5a329 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);
}
--
Samba Shared Repository
