1From 3d157bbd06506b170fde5ec23980c4bf9f7660e2 Mon Sep 17 00:00:00 2001 2From: Chris Coulson <chris.coulson@canonical.com> 3Date: Thu, 7 Jan 2021 19:53:55 +0000 4Subject: [PATCH] kern/parser: Introduce terminate_arg() helper 5 6process_char() and grub_parser_split_cmdline() use similar code for 7terminating the most recent argument. Add a helper function for this. 8 9Signed-off-by: Chris Coulson <chris.coulson@canonical.com> 10Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 11Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 12--- 13 grub-core/kern/parser.c | 23 +++++++++++++---------- 14 1 file changed, 13 insertions(+), 10 deletions(-) 15 16diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c 17index 0d3582b..572c670 100644 18--- a/grub-core/kern/parser.c 19+++ b/grub-core/kern/parser.c 20@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp, 21 *((*bp)++) = *val; 22 } 23 24+static void 25+terminate_arg (char *buffer, char **bp, int *argc) 26+{ 27+ if (*bp != buffer && *((*bp) - 1) != '\0') 28+ { 29+ *((*bp)++) = '\0'; 30+ (*argc)++; 31+ } 32+} 33+ 34 static grub_err_t 35 process_char (char c, char *buffer, char **bp, char *varname, char **vp, 36 grub_parser_state_t state, int *argc, 37@@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, 38 * Don't add more than one argument if multiple 39 * spaces are used. 40 */ 41- if (*bp != buffer && *((*bp) - 1) != '\0') 42- { 43- *((*bp)++) = '\0'; 44- (*argc)++; 45- } 46+ terminate_arg (buffer, bp, argc); 47 } 48 else if (use) 49 *((*bp)++) = use; 50@@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline, 51 variable. */ 52 add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); 53 54- if (bp != buffer && *(bp - 1)) 55- { 56- *(bp++) = '\0'; 57- (*argc)++; 58- } 59+ /* Ensure that the last argument is terminated. */ 60+ terminate_arg (buffer, &bp, argc); 61 62 /* If there are no args, then we're done. */ 63 if (!*argc) 64-- 652.14.2 66 67