emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix some issues found in Coverity scan.

Browse Source
This commit is contained in:
Tomas Mraz 2018-10-10 12:22:04 +02:00
parent 6bf2d74dfc
commit fb97da1ce1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commonio.c
View File

@ -379,7 +379,7 @@ int commonio_lock_nowait (struct commonio_db *db, bool log)
char* lock = NULL; char* lock = NULL;
size_t lock_file_len; size_t lock_file_len;
size_t file_len; size_t file_len;
int err; int err = 0;
if (db->locked) { if (db->locked) {
return 1; return 1;
@ -388,12 +388,10 @@ int commonio_lock_nowait (struct commonio_db *db, bool log)
lock_file_len = strlen(db->filename) + 6; /* sizeof ".lock" */ lock_file_len = strlen(db->filename) + 6; /* sizeof ".lock" */
file = (char*)malloc(file_len); file = (char*)malloc(file_len);
if(file == NULL) { if(file == NULL) {
err = ENOMEM;
goto cleanup_ENOMEM; goto cleanup_ENOMEM;
} }
lock = (char*)malloc(lock_file_len); lock = (char*)malloc(lock_file_len);
if(lock == NULL) { if(lock == NULL) {
err = ENOMEM;
goto cleanup_ENOMEM; goto cleanup_ENOMEM;
} }
snprintf (file, file_len, "%s.%lu", snprintf (file, file_len, "%s.%lu",

2
lib/spawn.c
View File

@ -69,7 +69,7 @@ int run_command (const char *cmd, const char *argv[],
do { do {
wpid = waitpid (pid, status, 0); wpid = waitpid (pid, status, 0);
} while ( ((pid_t)-1 == wpid && errno == EINTR) } while ( ((pid_t)-1 == wpid && errno == EINTR)
|| (wpid != pid)); || ((pid_t)-1 != wpid && wpid != pid));
if ((pid_t)-1 == wpid) { if ((pid_t)-1 == wpid) {
fprintf (stderr, "%s: waitpid (status: %d): %s\n", fprintf (stderr, "%s: waitpid (status: %d): %s\n",

5
libmisc/console.c
View File

@ -50,7 +50,7 @@ static bool is_listed (const char *cfgin, const char *tty, bool def);
static bool is_listed (const char *cfgin, const char *tty, bool def) static bool is_listed (const char *cfgin, const char *tty, bool def)
{ {
FILE *fp; FILE *fp;
char buf[200], *s; char buf[1024], *s;
const char *cons; const char *cons;
/* /*
@ -70,7 +70,8 @@ static bool is_listed (const char *cfgin, const char *tty, bool def)
if (*cons != '/') { if (*cons != '/') {
char *pbuf; char *pbuf;
strcpy (buf, cons); strncpy (buf, cons, sizeof (buf));
buf[sizeof (buf) - 1] = '\0';
pbuf = &buf[0]; pbuf = &buf[0];
while ((s = strtok (pbuf, ":")) != NULL) { while ((s = strtok (pbuf, ":")) != NULL) {
if (strcmp (s, tty) == 0) { if (strcmp (s, tty) == 0) {