[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 01/14] misc: Format string for grub_error should be a literal
From: |
Glenn Washburn |
Subject: |
[PATCH v6 01/14] misc: Format string for grub_error should be a literal |
Date: |
Thu, 4 Mar 2021 18:22:32 -0600 |
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
grub-core/loader/efi/chainloader.c | 2 +-
grub-core/net/tftp.c | 2 +-
grub-core/script/lexer.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c
b/grub-core/loader/efi/chainloader.c
index 7b31c3fb9..2e98947a0 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -90,7 +90,7 @@ grub_chainloader_boot (void)
*grub_utf16_to_utf8 ((grub_uint8_t *) buf,
exit_data, exit_data_size) = 0;
- grub_error (GRUB_ERR_BAD_OS, buf);
+ grub_error (GRUB_ERR_BAD_OS, "%s", buf);
grub_free (buf);
}
}
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
index 1f3793ed8..7f44b30f5 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -252,7 +252,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__
((unused)),
case TFTP_ERROR:
data->have_oack = 1;
grub_netbuff_free (nb);
- grub_error (GRUB_ERR_IO, (char *) tftph->u.err.errmsg);
+ grub_error (GRUB_ERR_IO, "%s", tftph->u.err.errmsg);
grub_error_save (&data->save_err);
return GRUB_ERR_NONE;
default:
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
index 57778f881..52004d059 100644
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -349,7 +349,7 @@ void
grub_script_yyerror (struct grub_parser_param *state, const char *err)
{
if (err)
- grub_error (GRUB_ERR_INVALID_COMMAND, err);
+ grub_error (GRUB_ERR_INVALID_COMMAND, "%s", err);
grub_print_error ();
state->err++;
--
2.27.0
- [PATCH v6 00/14] error: Do compile-time format string checking on grub>, Glenn Washburn, 2021/03/04
- [PATCH v6 07/14] efi: Format string error in grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 02/14] error: grub_error missing format string argument, Glenn Washburn, 2021/03/04
- [PATCH v6 06/14] pgp: Format code for grub_error is incorrect, Glenn Washburn, 2021/03/04
- [PATCH v6 10/14] error: Use format code PRIxGRUB_UINT64_T for 64-bit arg in grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 08/14] error: Use PRI* macros to get correct format string code across architectures, Glenn Washburn, 2021/03/04
- [PATCH v6 01/14] misc: Format string for grub_error should be a literal,
Glenn Washburn <=
- [PATCH v6 03/14] error: grub_error format string add missing format code, Glenn Washburn, 2021/03/04
- [PATCH v6 05/14] grub_error: Use format code PRIuGRUB_SIZE for variables of type grub_size_t, Glenn Washburn, 2021/03/04
- [PATCH v6 09/14] error: Use format code PRIxGRUB_UINT64_T for 64-bit uint argument in grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 04/14] dmraid_nvidia: Format string error in grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 14/14] zfs: Use grub_uint64_t instead of 1ULL in BF64_*CODE macros, Glenn Washburn, 2021/03/04
- [PATCH v6 11/14] error: Use format code PRIuGRUB_UINT64_T for 64-bit typed fileblock in grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 13/14] error: Do compile-time format string checking on grub_error, Glenn Washburn, 2021/03/04
- [PATCH v6 12/14] error: Use format code llu for 64-bit uint bp->blk_prop in grub_error, Glenn Washburn, 2021/03/04
- Re: [PATCH v6 00/14] error: Do compile-time format string checking on grub>, Daniel Kiper, 2021/03/05