sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4-smb: smbsrv_blob_push_string() can return -1

Browse Source 
need to use ssize_t, not size_t for error handling
This commit is contained in:
Andrew Tridgell 2010-09-10 20:17:39 +10:00
parent a17da70785
commit 2fbf10ea1b
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/smb_server/blob.c
View File

@ -100,14 +100,14 @@ size_t smbsrv_blob_pull_string(struct request_bufinfo *bufinfo,
push a string into the data section of a trans2 request
return the number of bytes consumed in the output
*/
size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
DATA_BLOB *blob,
uint32_t len_offset,
uint32_t offset,
const char *str,
int dest_len,
int default_flags,
int flags)
static ssize_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
DATA_BLOB *blob,
uint32_t len_offset,
uint32_t offset,
const char *str,
int dest_len,
int default_flags,
int flags)
{
int alignment = 0, ret = 0, pkt_len;
@ -142,6 +142,9 @@ size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
} else {
ret = push_string(blob->data + offset, str, dest_len, flags);
}
if (ret == -1) {
return -1;
}
/* sometimes the string needs to be terminated, but the length
on the wire must not include the termination! */