File 0006-misc-Format-string-for-grub_error-should-b... of Package grub2.24426

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-misc-Format-string-for-grub_error-should-be-a-litera.patch of Package grub2.24426

From cdf906d9f88b3ed6ecd5ff04168d0e2a6bbaebf2 Mon Sep 17 00:00:00 2001
From: Glenn Washburn <development@efficientek.com>
Date: Thu, 4 Mar 2021 18:22:32 -0600
Subject: [PATCH 06/37] misc: Format string for grub_error() should be a
 literal

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.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 7a910db44e..c8efab2299 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -108,7 +108,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 a0817a075d..e8100c7e5c 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -278,7 +278,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 5fb0cbd0bc..27daad791c 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, char const *err)
 {
   if (err)
-    grub_error (GRUB_ERR_INVALID_COMMAND, err);
+    grub_error (GRUB_ERR_INVALID_COMMAND, "%s", err);
 
   grub_print_error ();
   state->err++;
-- 
2.34.1

Places

File 0006-misc-Format-string-for-grub_error-should-be-a-litera.patch of Package grub2.24426

Places