mirror of
https://github.com/samba-team/samba.git
synced 2025-07-28 11:42:03 +03:00
r4591: - converted the other _p talloc functions to not need _p
- added #if TALLOC_DEPRECATED around the _p functions
- fixes the code that broke from the above
while doing this I fixed quite a number of places that were
incorrectly using the non type-safe talloc functions to use the type
safe ones. Some were even doing multiplies for array allocation, which
is potentially unsafe.
(This used to be commit 6e7754abd0
)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
066134f241
commit
11ce2cfd70
@ -203,7 +203,7 @@ static void smbcli_req_grow_allocation(struct smbcli_request *req, uint_t new_si
|
||||
|
||||
/* we need to realloc */
|
||||
req->out.allocated = req->out.size + delta + REQ_OVER_ALLOCATION;
|
||||
buf2 = talloc_realloc(req, req->out.buffer, req->out.allocated);
|
||||
buf2 = talloc_realloc(req, req->out.buffer, uint8_t, req->out.allocated);
|
||||
if (buf2 == NULL) {
|
||||
smb_panic("out of memory in req_grow_allocation");
|
||||
}
|
||||
@ -950,7 +950,7 @@ size_t smbcli_blob_append_string(struct smbcli_session *session,
|
||||
|
||||
max_len = (strlen(str)+2) * MAX_BYTES_PER_CHAR;
|
||||
|
||||
blob->data = talloc_realloc(mem_ctx, blob->data, blob->length + max_len);
|
||||
blob->data = talloc_realloc(mem_ctx, blob->data, uint8_t, blob->length + max_len);
|
||||
if (!blob->data) {
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user