debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtinfo: fix coverity issues related to null checks after dereference

Browse Source
This commit is contained in:
Peter Howkins
2018-04-04 22:42:06 +01:00
parent 2b15c4057e
commit bc28c20524
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cde/programs/dtinfo/DtMmdb/api/base.C
View File

@@ -70,29 +70,33 @@ base::base(object_dict* obj_dict,
num_cset_ptrs(0), num_list_ptrs(0),
f_obj_dict(obj_dict)
{
int len = MIN(strlen(base_dir), PATHSIZ - 1);
if ( base_dir )
if ( base_dir ) {
int len = MIN(strlen(base_dir), PATHSIZ - 1);
*((char *) memcpy (base_path, base_dir, len) + len) = '\0';
else
} else {
base_path[0] = 0;
}
len = MIN(strlen(base_nm), PATHSIZ - 1);
if ( base_nm )
if ( base_nm ) {
int len = MIN(strlen(base_nm), PATHSIZ - 1);
*((char *) memcpy (base_name, base_nm, len) + len) = '\0';
else
} else {
base_name[0] = 0;
}
len = MIN(strlen(base_ds), PATHSIZ - 1);
if ( base_ds )
if ( base_ds ) {
int len = MIN(strlen(base_ds), PATHSIZ - 1);
*((char *) memcpy (base_desc, base_ds, len) + len) = '\0';
else
} else {
base_desc[0] = 0;
}
len = MIN(strlen(base_uid_str), UIDSIZ - 1);
if ( base_uid_str )
if ( base_uid_str ) {
int len = MIN(strlen(base_uid_str), UIDSIZ - 1);
*((char *) memcpy (base_uid, base_uid_str, len) + len) = '\0';
else
} else {
base_uid[0] = 0;
}
if ( set_nms )
while ( info_base_set_names[num_cset_ptrs] )