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

Merge pull request #133 from t8m/trivial

Browse Source 
Fix some issues found in Coverity scan.
This commit is contained in:
Serge Hallyn
2018-10-23 22:21:12 -05:00
committed by GitHub
parent 58ee899dce 10e388efc2
commit 83f1380600
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commonio.c
View File

@@ -380,7 +380,7 @@ int commonio_lock_nowait (struct commonio_db *db, bool log)
char* lock = NULL;
size_t lock_file_len;
size_t file_len;
int err;
int err = 0;
if (db->locked) {
return 1;
@@ -389,12 +389,10 @@ int commonio_lock_nowait (struct commonio_db *db, bool log)
lock_file_len = strlen(db->filename) + 6; /* sizeof ".lock" */
file = (char*)malloc(file_len);
if(file == NULL) {
err = ENOMEM;
goto cleanup_ENOMEM;
}
lock = (char*)malloc(lock_file_len);
if(lock == NULL) {
err = ENOMEM;
goto cleanup_ENOMEM;
}
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 {
wpid = waitpid (pid, status, 0);
} while ( ((pid_t)-1 == wpid && errno == EINTR)
|| (wpid != pid));
|| ((pid_t)-1 != wpid && wpid != pid));
if ((pid_t)-1 == wpid) {
fprintf (stderr, "%s: waitpid (status: %d): %s\n",