summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-06-19 22:59:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:18:50 -0500
commit5cccafff45bc6cae63212d94b1346c8bdf0ef551 (patch)
treeee26f8d5dbd982f7343347010ffa88ad87cd8cbb
parentcc01fd242be450f4598eec50956403d2298ad5a4 (diff)
downloadsamba-5cccafff45bc6cae63212d94b1346c8bdf0ef551.tar.gz
samba-5cccafff45bc6cae63212d94b1346c8bdf0ef551.tar.bz2
samba-5cccafff45bc6cae63212d94b1346c8bdf0ef551.zip
r16373: Fix Klocwork #1071.
Jeremy (This used to be commit 080464b93d965a583b2b5f248a2bb8a7fb516e6f)
-rw-r--r--source3/rpc_parse/parse_samr.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index d661b225e0..9026d503c3 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -6471,8 +6471,14 @@ static BOOL sam_io_user_info21(const char *desc, SAM_USER_INFO_21 * usr,
void init_sam_user_info20A(SAM_USER_INFO_20 *usr, struct samu *pw)
{
const char *munged_dial = pdb_get_munged_dial(pw);
- DATA_BLOB blob = base64_decode_data_blob(munged_dial);
-
+ DATA_BLOB blob;
+
+ if (munged_dial) {
+ blob = base64_decode_data_blob(munged_dial);
+ } else {
+ blob = data_blob(NULL, 0);
+ }
+
init_unistr2_from_datablob(&usr->uni_munged_dial, &blob);
init_uni_hdr(&usr->hdr_munged_dial, &usr->uni_munged_dial);
data_blob_free(&blob);