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/iconv: use read_hex_bytes rather than sscanf

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2018-03-22 17:54:55 +13:00 committed by Andrew Bartlett
parent c2cac449c8
commit 2157e8d83e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/util/charset/iconv.c
View File

@ -25,6 +25,8 @@
#include "lib/util/dlinklist.h"
#include "lib/util/charset/charset.h"
#include "lib/util/charset/charset_proto.h"
#include "libcli/util/ntstatus.h"
#include "lib/util/util_str_hex.h"
#ifdef strcasecmp
#undef strcasecmp
@ -454,8 +456,8 @@ static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
while (*inbytesleft >= 1 && *outbytesleft >= 2) {
unsigned int v;
uint64_t v;
NTSTATUS status;
if ((*inbuf)[0] != '@') {
/* seven bit ascii case */
(*outbuf)[0] = (*inbuf)[0];
@ -471,8 +473,9 @@ static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft,
errno = EINVAL;
return -1;
}
status = read_hex_bytes(&(*inbuf)[1], 4, &v);
if (sscanf(&(*inbuf)[1], "%04x", &v) != 1) {
if (!NT_STATUS_IS_OK(status)) {
errno = EILSEQ;
return -1;
}