sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

util/charset/convert_string: always set length

Browse Source 
In failure cases the destination string pointer is set to NULL, but
the size is not changed. Some callers have not been checking the
return value and passing the destination pointer and uninitialised
length onto other functions. We can curse and blame those callers, but
let's also keep them safe.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2019-05-10 15:35:32 +12:00 committed by Andrew Bartlett
parent d1447aa8b5
commit 09355b7855
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/util/charset/convert_string.c
View File

@ -357,6 +357,9 @@ bool convert_string_talloc_handle(TALLOC_CTX *ctx, struct smb_iconv_handle *ic,
void **dest = (void **)dst;
*dest = NULL;
if (converted_size != NULL) {
*converted_size = 0;
}
if (src == NULL || srclen == (size_t)-1) {
errno = EINVAL;