Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

db: avoid -Werror=format-truncation with GCC >= 7 #415

Merged
merged 1 commit into from
Feb 24, 2020
Merged

db: avoid -Werror=format-truncation with GCC >= 7 #415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/lib/db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,11 @@ static CK_RV db_backup(sqlite3 *db, const char *dbpath, sqlite3 **updb, char **c

sqlite3_backup *backup_conn = NULL;

snprintf(temp, sizeof(temp), "%s%s", dbpath, suffix);
unsigned l = snprintf(temp, sizeof(temp), "%s%s", dbpath, suffix);
if (l >= sizeof(temp)) {
LOGE("Backup DB path is longer than PATH_MAX");
goto out;
}

LOGV("Performing DB backup at: \"%s\"", temp);

Expand Down Expand Up @@ -1450,7 +1454,12 @@ static CK_RV db_update(sqlite3 **xdb, const char *dbpath, unsigned old_version,
dbbak = NULL;

char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s.old", dbpath);
unsigned l = snprintf(buf, sizeof(buf), "%s.old", dbpath);
if (l >= sizeof(buf)) {
LOGE("Old database path is longer than PATH_MAX");
rv = CKR_GENERAL_ERROR;
goto out;
}

int rc = rename(dbpath, buf);
if (rc != 0) {
Expand Down Expand Up @@ -1501,7 +1510,11 @@ static CK_RV db_create(char *path, size_t len) {

static FILE *take_lock(const char *path, char *lockpath) {

snprintf(lockpath, PATH_MAX, "%s%s", path, ".lock");
unsigned l = snprintf(lockpath, PATH_MAX, "%s%s", path, ".lock");
if (l >= PATH_MAX) {
LOGE("Lock file path is longer than PATH_MAX");
return NULL;
}

FILE *f = fopen(lockpath, "w+");
if (!f) {
Expand Down Expand Up @@ -1588,7 +1601,11 @@ static CK_RV db_init_new(sqlite3 *db) {
static CK_RV db_verify_update_ok(const char *dbpath) {

char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s.old", dbpath);
unsigned l = snprintf(buf, sizeof(buf), "%s.old", dbpath);
if (l >= sizeof(buf)) {
LOGE("Backup DB path is longer than PATH_MAX");
return CKR_GENERAL_ERROR;
}

struct stat sb;
int rc = stat(buf, &sb);
Expand Down