From: Volker Lendecke Date: Sun, 2 Jan 2011 01:48:03 +0000 (+0100) Subject: Fix a valgrind error X-Git-Tag: samba-3.5.8~41 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=e1bf4fda6afd6d002c4741252e90ffed4b0faf66 Fix a valgrind error Thanks to Tridge for the hint. Autobuild-User: Volker Lendecke Autobuild-Date: Sun Jan 2 10:58:51 CET 2011 on sn-devel-104 (cherry picked from commit 23693fe3c51ac89db64fefed292f7e4ff38e00e8) --- diff --git a/libcli/nbt/nbtname.c b/libcli/nbt/nbtname.c index 338cb210897..5346ee3e8e1 100644 --- a/libcli/nbt/nbtname.c +++ b/libcli/nbt/nbtname.c @@ -82,7 +82,9 @@ static enum ndr_err_code ndr_pull_component(struct ndr_pull *ndr, return ndr_pull_error(ndr, NDR_ERR_STRING, "BAD NBT NAME component"); } - *component = (uint8_t*)talloc_strndup(ndr, (const char *)&ndr->data[1 + *offset], len); + *component = (uint8_t*)talloc_strndup( + ndr->current_mem_ctx, + (const char *)&ndr->data[1 + *offset], len); NDR_ERR_HAVE_NO_MEMORY(*component); *offset += len + 1; *max_offset = MAX(*max_offset, *offset); @@ -126,7 +128,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_fla "BAD NBT NAME too many components"); } if (num_components == 0) { - name = talloc_strdup(ndr, ""); + name = talloc_strdup(ndr->current_mem_ctx, ""); NDR_ERR_HAVE_NO_MEMORY(name); }