Skip to content

dbfile: zero-initialise the uuid buffer in __dbfile_get_config #414

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

Open
martinus wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

dbfile: zero-initialise the uuid buffer in __dbfile_get_config #414

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
8 changes: 7 additions & 1 deletion dbfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,13 @@ static int get_config_text(sqlite3_stmt *stmt, const char *name, char *val, int
static int __dbfile_get_config(sqlite3 *db, struct dbfile_config *cfg)
{
int ret;
char uuid[37]; /* 36-bytes uuid + \0 */
/*
* Zero-initialised so the buffer is always NUL-terminated: get_config_text
* memcpy()s exactly `len` (36) bytes without terminating, and if the
* config row is absent it writes nothing at all - either way uuid_parse()
* below would otherwise strlen() past uninitialised bytes.
*/
char uuid[37] = ""; /* 36-byte uuid + NUL */
_cleanup_(sqlite3_stmt_cleanup) sqlite3_stmt *stmt = NULL;

#define SELECT_CONFIG "select keyval from config where keyname=?1;"
Expand Down