Merge pull request #133 from t8m/trivial

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
4 changed files with 42 additions and 27 deletions

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",