mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/vvfat: Fix compiler warning with gcc 7

Browse Source 
gcc 7 complains that the sprintf() might write a null byte beyond the
end of the tail buffer.  That is wrong, but we can silence it by making
i unsigned (it can never be negative anyway, see the if condition right
before).  For some reason, this allows gcc to suddenly accurately
calculate the range of i so we can give the tail[] array the exact size
it needs to have (which is 8 bytes) without gcc complaining.

In addition, let us convert the sprintf() to snprintf(), because that is
always nicer, and add an assertion about the range of the return value
afterwards so we can see that "8 - len" will never be negative and thus
"entry->name + MIN(j, 8 - len)" will never be out of bounds.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2017-07-17 17:12:07 +02:00 committed by Kevin Wolf
parent f80256b7ee
commit 7c8730d45f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/vvfat.c
View File

@ -549,7 +549,7 @@ static direntry_t *create_short_filename(BDRVVVFATState *s,
const gchar *p, *last_dot = NULL; const gchar *p, *last_dot = NULL;
gunichar c; gunichar c;
bool lossy_conversion = false; bool lossy_conversion = false;
char tail[11]; char tail[8];
if (!entry) { if (!entry) {
return NULL; return NULL;
@ -614,7 +614,8 @@ static direntry_t *create_short_filename(BDRVVVFATState *s,
for (i = lossy_conversion ? 1 : 0; i < 999999; i++) { for (i = lossy_conversion ? 1 : 0; i < 999999; i++) {
direntry_t *entry1; direntry_t *entry1;
if (i > 0) { if (i > 0) {
int len = sprintf(tail, "~%d", i); int len = snprintf(tail, sizeof(tail), "~%u", (unsigned)i);
assert(len <= 7);
memcpy(entry->name + MIN(j, 8 - len), tail, len); memcpy(entry->name + MIN(j, 8 - len), tail, len);
} }
for (entry1 = array_get(&(s->directory), directory_start); for (entry1 = array_get(&(s->directory), directory_start);