openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Fix more sign-compare issues

Browse Source 
The one in the `dummyflasher` is a little peculiar. We actually never
knew the type of the `st_size` field in `struct stat`. It happens to
be `signed` in some systems (e.g. DJGPP).

Change-Id: If36ba22606021400b385ea6083eacc7b360c20c5
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/35800
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Nico Huber 2019-10-04 17:34:22 +02:00
parent b417c0c2d2
commit 961f4a1f29
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dediprog.c
View File

@ -1038,7 +1038,7 @@ int dediprog_init(void)
free(device); free(device);
return 1; return 1;
} }
if (usedevice < 0 || usedevice > UINT_MAX) { if (usedevice < 0 || usedevice > INT_MAX) {
msg_perr("Error: Value for 'device' is out of range.\n"); msg_perr("Error: Value for 'device' is out of range.\n");
free(device); free(device);
return 1; return 1;

2
dummyflasher.c
View File

@ -387,7 +387,7 @@ int dummy_init(void)
if (!stat(emu_persistent_image, &image_stat)) { if (!stat(emu_persistent_image, &image_stat)) {
msg_pdbg("Found persistent image %s, %jd B ", msg_pdbg("Found persistent image %s, %jd B ",
emu_persistent_image, (intmax_t)image_stat.st_size); emu_persistent_image, (intmax_t)image_stat.st_size);
if (image_stat.st_size == emu_chip_size) { if ((uintmax_t)image_stat.st_size == emu_chip_size) {
msg_pdbg("matches.\n"); msg_pdbg("matches.\n");
msg_pdbg("Reading %s\n", emu_persistent_image); msg_pdbg("Reading %s\n", emu_persistent_image);
if (read_buf_from_file(flashchip_contents, emu_chip_size, if (read_buf_from_file(flashchip_contents, emu_chip_size,

2
ich_descriptors.c
View File

@ -421,7 +421,7 @@ void prettyprint_ich_descriptor_master(const enum ich_chipset cs, const struct i
for (i = 0; i < nm; i++) { for (i = 0; i < nm; i++) {
size_t j; size_t j;
msg_pdbg2("%-4s", master_names[i]); msg_pdbg2("%-4s", master_names[i]);
for (j = 0; j < min(num_regions, 12); j++) for (j = 0; j < (size_t)min(num_regions, 12); j++)
msg_pdbg2(" %c%c ", msg_pdbg2(" %c%c ",
desc->master.mstr[i].read & (1 << j) ? 'r' : ' ', desc->master.mstr[i].read & (1 << j) ? 'r' : ' ',
desc->master.mstr[i].write & (1 << j) ? 'w' : ' '); desc->master.mstr[i].write & (1 << j) ? 'w' : ' ');

2
libflashrom.c
View File

@ -139,7 +139,7 @@ const char **flashrom_supported_programmers(void)
*/ */
struct flashrom_flashchip_info *flashrom_supported_flash_chips(void) struct flashrom_flashchip_info *flashrom_supported_flash_chips(void)
{ {
int i = 0; unsigned int i = 0;
struct flashrom_flashchip_info *supported_flashchips = struct flashrom_flashchip_info *supported_flashchips =
malloc(flashchips_size * sizeof(*supported_flashchips)); malloc(flashchips_size * sizeof(*supported_flashchips));