summaryrefslogtreecommitdiff
path: root/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch')
-rw-r--r--net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
new file mode 100644
index 000000000000..63d26958b7bf
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
@@ -0,0 +1,38 @@
+From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
+From: ailin-nemui <ailin-nemui@users.noreply.github.com>
+Date: Thu, 23 Apr 2020 21:45:15 +0200
+Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
+
+A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
+NUL / U+0000 is a valid Unicode character. This would occur when the
+user types Ctrl+Space. As a result, the input loop never manages to
+process the NUL-byte (and any other user input that follows, ever).
+
+This patch adds a manual check that properly advances the input loop if
+GLib returns -2 (incomplete character) despite the length being positive
+and a NUL is in first position.
+
+Fixes #1180
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
+https://gitlab.gnome.org/GNOME/glib/-/issues/2093
+---
+ src/fe-text/term-terminfo.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index 5235f72d2..78496a64f 100644
+--- a/src/fe-text/term-terminfo.c
++++ b/src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+- unichar c = g_utf8_get_char_validated((char *)buffer, size);
++ unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++ /* GLib >= 2.63 do not accept Unicode NUL anymore */
++ if (c == (unichar) -2 && *buffer == 0 && size > 0)
++ c = 0;
+
+ switch (c) {
+ case (unichar)-1: