external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtlogin: Resolve some coverity issues, including those thought previously fixed

Browse source
This commit is contained in:
Peter Howkins 2018-04-28 23:47:05 +01:00
parent 399c1e08c3
commit e14e74231c
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtlogin/account.c
View file

@ -215,7 +215,7 @@ Account( struct display *d, char *user, char *line, pid_t pid,
* Currently, an unlimited number of foreign displays can log in. * Currently, an unlimited number of foreign displays can log in.
*/ */
if (user) strncpy(u->ut_user, user, sizeof(u->ut_user)); if (user) snprintf(u->ut_user, sizeof(u->ut_user), "%s", user);
if (line) { if (line) {
#ifdef _AIX #ifdef _AIX
/* /*

10
cde/programs/dtlogin/resource.c
View file

@ -409,6 +409,7 @@ GetResource( char *name, char *class, int valueType, char **valuep,
char *type; char *type;
XrmValue value; XrmValue value;
char *string, *new_string; char *string, *new_string;
char empty[] = "";
char str_buf[50]; char str_buf[50];
int len; int len;
@ -422,8 +423,13 @@ GetResource( char *name, char *class, int valueType, char **valuep,
} }
else else
{ {
string = default_value; if(default_value) {
len = (string == NULL ? 0 : strlen (string)); string = default_value;
len = strlen (string);
} else {
string = empty;
len = 0;
}
} }
Debug ("%s/%s value %*.*s\n", name, class, len, len, string); Debug ("%s/%s value %*.*s\n", name, class, len, len, string);

9
cde/programs/dtlogin/session.c
View file

@ -754,11 +754,8 @@ LoadAltDtsResources(struct display *d)
Debug("LoadAltDtsResources- cant access %s.\n", resources); Debug("LoadAltDtsResources- cant access %s.\n", resources);
Debug("\t %s. Falling back to C.\n", strerror(errno)); Debug("\t %s. Falling back to C.\n", strerror(errno));
if (resources) free (resources);
{ resources = NULL;
free (resources);
resources = NULL;
}
resources = _ExpandLang(dirname[j], "C"); resources = _ExpandLang(dirname[j], "C");
if (access (resources, R_OK) != 0) if (access (resources, R_OK) != 0)
@ -2073,7 +2070,7 @@ RunGreeter( struct display *d, struct greet_info *greet,
language = d->language; language = d->language;
#endif /* ENABLE_DYNAMIC_LANGLIST */ #endif /* ENABLE_DYNAMIC_LANGLIST */
if ( d->language && strlen(d->language) > 0 ) if (env && d->language && strlen(d->language) > 0 )
env = setLang(d, env, language); env = setLang(d, env, language);
} }

2
cde/programs/dtlogin/verify.c
View file

@ -383,7 +383,7 @@ userEnv(
langlist = languageList; langlist = languageList;
#endif /* ENABLE_DYNAMIC_LANGLIST */ #endif /* ENABLE_DYNAMIC_LANGLIST */
if (d->language && strlen(d->language) > 0) if (env && d->language && strlen(d->language) > 0)
env = setLang(d, env, langlist); env = setLang(d, env, langlist);
#if 0 /* setting LC_ALL can cause undesirable side effects -- bf@hp */ #if 0 /* setting LC_ALL can cause undesirable side effects -- bf@hp */

3
cde/programs/dtlogin/vgmain.c
View file

@ -1557,7 +1557,8 @@ MakeGreeting( void )
*/ */
if ( strlen(greetInfo.labelString) == 0 || if ( !greetInfo.labelString ||
strlen(greetInfo.labelString) == 0 ||
strcmp(greetInfo.labelString, "None") == 0 || strcmp(greetInfo.labelString, "None") == 0 ||
strcmp(greetInfo.labelString, "none") == 0 ) strcmp(greetInfo.labelString, "none") == 0 )