From 2546c86244ec2bb458580a90a0a5e0648220ad9a Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sun, 25 Jan 2015 12:27:51 -0800 Subject: 34389: fix parsing of ">!" when read from histfile with HIST_LEX_WORDS --- ChangeLog | 5 +++++ Src/hist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 96268c795..abc381f91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-25 Barton E. Schaefer + + * 34389: Src/hist.c: fix parsing of ">!" when read from histfile + with HIST_LEX_WORDS in effect + 2015-01-25 Peter Stephenson * 34369: Daniel Shahaf: document error / warning codes. diff --git a/Src/hist.c b/Src/hist.c index 303c1dd4a..381c7e2e5 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -3473,7 +3473,8 @@ histsplitwords(char *lineptr, short **wordsp, int *nwordsp, int *nwordposp, if (*lptr == *wptr || (*lptr == '!' && *wptr == '|')) { lptr++; - wptr++; + if (!*++wptr) + break; } else if (lptr[0] == '\\' && lptr[1] == '\n') { /* -- cgit v1.2.3