sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

simple fix for creating blank data blobs

Browse Source 
(This used to be commit 08bb2dfec2)
This commit is contained in:
Andrew Tridgell 2002-01-05 23:30:59 +00:00
parent ca0ccee23f
commit b0e4827b97
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/lib/util.c
View File

@ -2098,17 +2098,22 @@ static void free_data_blob(DATA_BLOB *d)
/*******************************************************************
construct a data blob, must be freed with data_blob_free()
you can pass NULL for p and get a blank data blob
*******************************************************************/
DATA_BLOB data_blob(const void *p, size_t length)
{
DATA_BLOB ret;
if (!p || !length) {
if (!length) {
ZERO_STRUCT(ret);
return ret;
}
ret.data = smb_xmemdup(p, length);
if (p) {
ret.data = smb_xmemdup(p, length);
} else {
ret.data = smb_xmalloc(length);
}
ret.length = length;
ret.free = free_data_blob;
return ret;

4
source3/libsmb/clispnego.c
View File

@ -486,9 +486,7 @@ BOOL msrpc_gen(DATA_BLOB *blob,
va_end(ap);
/* allocate the space, then scan the format again to fill in the values */
blob->data = malloc(head_size + data_size);
blob->length = head_size + data_size;
if (!blob->data) return False;
*blob = data_blob(NULL, head_size + data_size);
head_ofs = 0;
data_ofs = head_size;