From 1c5f52052c2452c159498fb1beb941d3b40d4661 Mon Sep 17 00:00:00 2001 From: Liu Aleaxander Date: Tue, 15 Mar 2011 20:55:09 +0000 Subject: [PATCH] elflink: handle the NULL return of edit_cmdline When use ctrl-c to cancle the current input, the edit_cmdline function will return a NULL string. While, the called didn't handle that case, and an error would be happened. Signed-off-by: Liu Aleaxander Signed-off-by: Matt Fleming --- com32/elflink/ldlinux/ldlinux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index 9c5e248..5ebbd7f 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -18,6 +18,8 @@ static void enter_cmdline(void) /* Enter endless command line prompt, should support "exit" */ while (1) { cmdline = edit_cmdline("syslinux$", 1, NULL, NULL); + if (!cmdline) + continue; /* feng: give up the aux check here */ //aux = list_entry(cli_history_head.next, typeof(*aux), list); //if (strcmp(aux->command, cmdline)) { -- 2.7.4