mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
tools/xenpmd: Fix gcc10 snprintf warning
Add a check for snprintf return code and ignore the entry if we get an
error. This should in fact never happen and is more a trick to make gcc
happy and prevent compilation errors.
This is solving the following gcc warning when compiling for arm32 host
platforms with optimization activated:
xenpmd.c:92:37: error: '%s' directive output may be truncated writing
between 4 and 2147483645 bytes into a region of size 271
[-Werror=format-truncation=]
This is also solving the following Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970802
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Wei Liu <wl@xen.org>
(cherry picked from commit 0dfddb2116)
This commit is contained in:
1 parent
f728b2d69f
commit
1f9f1cb3a0
1 file changed
+7
-2
@@ -102,6 +102,7 @@ FILE *get_next_battery_file(DIR *battery_dir,
|
||||
FILE *file = 0;
|
||||
struct dirent *dir_entries;
|
||||
char file_name[284];
|
||||
int ret;
|
||||
|
||||
do
|
||||
{
|
||||
@@ -111,11 +112,15 @@ FILE *get_next_battery_file(DIR *battery_dir,
|
||||
if ( strlen(dir_entries->d_name) < 4 )
|
||||
continue;
|
||||
if ( battery_info_type == BIF )
|
||||
snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
|
||||
ret = snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
|
||||
dir_entries->d_name);
|
||||
else
|
||||
snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
|
||||
ret = snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
|
||||
dir_entries->d_name);
|
||||
/* This should not happen but is needed to pass gcc checks */
|
||||
if (ret < 0)
|
||||
continue;
|
||||
file_name[sizeof(file_name) - 1] = '\0';
|
||||
file = fopen(file_name, "r");
|
||||
} while ( !file );
|
||||
|
||||
|
||||