zsh-workers
 help / color / mirror / code / Atom feed
From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: ensure that %H is followed by {
Date: Sun,  4 Feb 2024 16:46:17 +0100	[thread overview]
Message-ID: <20240204154617.6812-1-mikachu@gmail.com> (raw)

The previous code would accept any character after %H assuming it
was a {, which was probably also a buffer overrun sometimes.
---
 Src/prompt.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Src/prompt.c b/Src/prompt.c
index b1e5041bd2..0d674ceab5 100644
--- a/Src/prompt.c
+++ b/Src/prompt.c
@@ -605,10 +605,12 @@ putpromptchar(int doprint, int endchar)
 	        applytextattributes(TSC_PROMPT);
 		break;
 	    case 'H':
-		bv->fm = parsehighlight(bv->fm + 2, '}', &atr);
-		if (atr != TXT_ERROR) {
-		    treplaceattrs(atr);
-		    applytextattributes(TSC_PROMPT);
+		if (bv->fm[1] == '{') {
+		    bv->fm = parsehighlight(bv->fm + 2, '}', &atr);
+		    if (atr != TXT_ERROR) {
+			treplaceattrs(atr);
+			applytextattributes(TSC_PROMPT);
+		    }
 		}
 		break;
 	    case '[':
-- 
2.38.1



                 reply	other threads:[~2024-02-04 15:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240204154617.6812-1-mikachu@gmail.com \
    --to=mikachu@gmail.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).