sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

r22676: Fix zero alloc with create_rpc_blob().

Browse Source 
Jeremy.
(This used to be commit c73963a60ad2d35d69d1ac4c02e24f3272efdd87)
This commit is contained in:
Jeremy Allison 2007-05-04 22:15:33 +00:00 committed by Gerald (Jerry) Carter
parent f1d8c4da23
commit 92999cee8d
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/rpc_parse/parse_misc.c
View File

@ -483,12 +483,17 @@ BOOL smb_io_unistr(const char *desc, UNISTR *uni, prs_struct *ps, int depth)
Allocate the RPC_DATA_BLOB memory.
********************************************************************/
size_t create_rpc_blob(RPC_DATA_BLOB *str, size_t len)
static void create_rpc_blob(RPC_DATA_BLOB *str, size_t len)
{
str->buffer = (uint8 *)TALLOC_ZERO(get_talloc_ctx(), len);
if (str->buffer == NULL)
smb_panic("create_rpc_blob: talloc fail\n");
return len;
if (len) {
str->buffer = (uint8 *)TALLOC_ZERO(get_talloc_ctx(), len);
if (str->buffer == NULL)
smb_panic("create_rpc_blob: talloc fail\n");
str->buf_len = len;
} else {
str->buffer = NULL;
str->buf_len = 0;
}
}
/*******************************************************************
@ -500,7 +505,7 @@ void init_rpc_blob_uint32(RPC_DATA_BLOB *str, uint32 val)
ZERO_STRUCTP(str);
/* set up string lengths. */
str->buf_len = create_rpc_blob(str, sizeof(uint32));
create_rpc_blob(str, sizeof(uint32));
SIVAL(str->buffer, 0, val);
}
@ -513,9 +518,10 @@ void init_rpc_blob_str(RPC_DATA_BLOB *str, const char *buf, int len)
ZERO_STRUCTP(str);
/* set up string lengths. */
str->buf_len = create_rpc_blob(str, len*2);
rpcstr_push(str->buffer, buf, (size_t)str->buf_len, STR_TERMINATE);
if (len) {
create_rpc_blob(str, len*2);
rpcstr_push(str->buffer, buf, (size_t)str->buf_len, STR_TERMINATE);
}
}
/*******************************************************************
@ -525,8 +531,10 @@ void init_rpc_blob_str(RPC_DATA_BLOB *str, const char *buf, int len)
void init_rpc_blob_hex(RPC_DATA_BLOB *str, const char *buf)
{
ZERO_STRUCTP(str);
str->buf_len = create_rpc_blob(str, strlen(buf));
str->buf_len = strhex_to_str((char *)str->buffer, str->buf_len, buf);
if (buf && *buf) {
create_rpc_blob(str, strlen(buf));
str->buf_len = strhex_to_str((char *)str->buffer, str->buf_len, buf);
}
}
/*******************************************************************
@ -538,8 +546,8 @@ void init_rpc_blob_bytes(RPC_DATA_BLOB *str, uint8 *buf, size_t len)
ZERO_STRUCTP(str);
/* max buffer size (allocated size) */
if (buf != NULL) {
len = create_rpc_blob(str, len);
if (buf != NULL && len) {
create_rpc_blob(str, len);
memcpy(str->buffer, buf, len);
}
str->buf_len = len;