diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-23 05:29:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-23 05:29:14 +0100 |
commit | 7f740fcb9a0165d81bfecf7fb5da647763d76a1b (patch) | |
tree | 45dab58d8bd40ef97234398e9e1850495ea60273 /app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch | |
parent | 0bf5c5a0b1ff93d1f4aaa8cdea6acda5e42c2068 (diff) |
gentoo auto-resync : 23:09:2022 - 05:29:13
Diffstat (limited to 'app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch')
-rw-r--r-- | app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch deleted file mode 100644 index 4bac4fea0f0e..000000000000 --- a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/855395 -https://marc.info/?l=oss-security&m=165657063921408&w=2 -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=34c649b3601383cd11dbc76221747ec16fd68e1b;hp=4dbef2addca8c76fb4953fd507bd800d2a19d3ec - -From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Tue, 14 Jun 2022 11:33:27 +0200 -Subject: [PATCH 1/1] g10: Fix garbled status messages in NOTATION_DATA - -* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one --- - -Depending on the escaping and line wrapping the computed remaining -buffer length could be wrong. Fixed by always using a break to -terminate the escape detection loop. Might have happened for all -status lines which may wrap. - -GnuPG-bug-id: T6027 ---- a/g10/cpr.c -+++ b/g10/cpr.c -@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string, - } - first = 0; - } -- for (esc=0, s=buffer, n=len; n && !esc; s++, n--) -+ for (esc=0, s=buffer, n=len; n; s++, n--) - { - if (*s == '%' || *(const byte*)s <= lower_limit - || *(const byte*)s == 127 ) - esc = 1; - if (wrap && ++count > wrap) -- { -- dowrap=1; -- break; -- } -- } -- if (esc) -- { -- s--; n++; -+ dowrap=1; -+ if (esc || dowrap) -+ break; - } - if (s != buffer) - es_fwrite (buffer, s-buffer, 1, statusfp); |