forked from pool/weechat
Ondřej Súkup
ab5f9d8595
- fix boo#1163889 - CVE-2020-8955 , add patch CVE-2020-8955.patch OBS-URL: https://build.opensuse.org/request/show/774859 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=94
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 6f4f147d8e86adf9ad34a8ffd7e7f1f23a7e74da Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
|
|
Date: Sat, 8 Feb 2020 20:24:50 +0100
|
|
Subject: [PATCH] irc: fix crash when receiving a malformed message 324
|
|
(channel mode)
|
|
|
|
Thanks to Stuart Nevans Locke for reporting the issue.
|
|
---
|
|
ChangeLog.adoc | 1 +
|
|
src/plugins/irc/irc-mode.c | 21 ++++++++++++---------
|
|
2 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/plugins/irc/irc-mode.c b/src/plugins/irc/irc-mode.c
|
|
index 2237a344b..e79f0deb7 100644
|
|
--- a/src/plugins/irc/irc-mode.c
|
|
+++ b/src/plugins/irc/irc-mode.c
|
|
@@ -224,17 +224,20 @@ irc_mode_channel_update (struct t_irc_server *server,
|
|
current_arg++;
|
|
if (pos[0] == chanmode)
|
|
{
|
|
- chanmode_found = 1;
|
|
- if (set_flag == '+')
|
|
+ if (!chanmode_found)
|
|
{
|
|
- str_mode[0] = pos[0];
|
|
- str_mode[1] = '\0';
|
|
- strcat (new_modes, str_mode);
|
|
- if (argument)
|
|
+ chanmode_found = 1;
|
|
+ if (set_flag == '+')
|
|
{
|
|
- if (new_args[0])
|
|
- strcat (new_args, " ");
|
|
- strcat (new_args, argument);
|
|
+ str_mode[0] = pos[0];
|
|
+ str_mode[1] = '\0';
|
|
+ strcat (new_modes, str_mode);
|
|
+ if (argument)
|
|
+ {
|
|
+ if (new_args[0])
|
|
+ strcat (new_args, " ");
|
|
+ strcat (new_args, argument);
|
|
+ }
|
|
}
|
|
}
|
|
}
|