1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00

s4:registry - "util.c" - "reg_string_to_val" - consider always the return values

In some cases we didn't consider them.
This commit is contained in:
Matthias Dieter Wallnöfer 2010-03-22 12:22:13 +01:00
parent 6f7f16dc80
commit 885a167929

View File

@ -146,24 +146,26 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx,
break;
case REG_SZ:
case REG_EXPAND_SZ:
convert_string_talloc_convenience(mem_ctx,
iconv_convenience,
CH_UNIX, CH_UTF16,
data_str,
strlen(data_str)+1,
(void **)&data->data,
&data->length, false);
return convert_string_talloc_convenience(mem_ctx,
iconv_convenience,
CH_UNIX, CH_UTF16,
data_str,
strlen(data_str)+1,
(void **)&data->data,
&data->length, false);
break;
case REG_DWORD:
case REG_DWORD_BIG_ENDIAN: {
uint32_t tmp = strtol(data_str, NULL, 0);
*data = data_blob_talloc(mem_ctx, NULL, sizeof(uint32_t));
if (data->data == NULL) return false;
SIVAL(data->data, 0, tmp);
}
break;
case REG_QWORD: {
uint64_t tmp = strtoll(data_str, NULL, 0);
*data = data_blob_talloc(mem_ctx, NULL, sizeof(uint64_t));
if (data->data == NULL) return false;
SBVAL(data->data, 0, tmp);
}
break;