Attachment #228585 for bug #259072

View | Details | Raw Unified | Return to bug 259072
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/irc/bitlbee-discord/Makefile (+3 lines)
1	PORTNAME= bitlbee-discord	1	PORTNAME= bitlbee-discord
2	DISTVERSION= 0.4.3	2	DISTVERSION= 0.4.3
		3	PORTREVISION= 1
3	CATEGORIES= irc	4	CATEGORIES= irc
4		5
5	MAINTAINER= arfy32@gmail.com	6	MAINTAINER= arfy32@gmail.com
Lines 16-21 USE_GNOME= glib20 Link Here
16	USE_GITHUB= yes	17	USE_GITHUB= yes
17	GH_ACCOUNT= sm00th	18	GH_ACCOUNT= sm00th
18		19
		20	PATCH_STRIP= -p1
		21
19	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --with-plugindir=${PREFIX}/lib/bitlbee --with-bdatadir=${LOCALBASE}/share/bitlbee	23	CONFIGURE_ARGS= --with-plugindir=${PREFIX}/lib/bitlbee --with-bdatadir=${LOCALBASE}/share/bitlbee
21	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip




From 607f9887ca85f246e970778e3d40aa5c346365a7 Mon Sep 17 00:00:00 2001
From: Artem Savkov <asavkov@redhat.com>
Date: Tue, 28 Sep 2021 18:38:48 +0200
Subject: [PATCH] Fix empty gateway->path with glib > 2.68

Starting with glib 2.69 g_match_info_fetch() returns an empty string
instead of NULL in case when no match was found. Properly handle this
case.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
---
 src/discord-http.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/discord-http.c b/src/discord-http.c
index 83b92ce..80b3946 100644
--- a/src/discord-http.c
+++ b/src/discord-http.c
@@ -175,6 +175,9 @@ static void discord_http_gateway_cb(struct http_request *req)
 
     if (dd->gateway->path == NULL) {
       dd->gateway->path = g_strdup("/?encoding=json&v=6");
+    } else if (g_strcmp0(dd->gateway->path, "") == 0) {
+      g_free(dd->gateway->path);
+      dd->gateway->path = g_strdup("/?encoding=json&v=6");
     }
 
     g_match_info_free(match);

Return to bug 259072

Added Link Here

(-)b/irc/bitlbee-discord/files/patch-607f9887.patch (+28 lines)
1	From 607f9887ca85f246e970778e3d40aa5c346365a7 Mon Sep 17 00:00:00 2001
2	From: Artem Savkov <asavkov@redhat.com>
3	Date: Tue, 28 Sep 2021 18:38:48 +0200
4	Subject: [PATCH] Fix empty gateway->path with glib > 2.68
5
6	Starting with glib 2.69 g_match_info_fetch() returns an empty string
7	instead of NULL in case when no match was found. Properly handle this
8	case.
9
10	Signed-off-by: Artem Savkov <asavkov@redhat.com>
11	---
12	src/discord-http.c \| 3 +++
13	1 file changed, 3 insertions(+)
14
15	diff --git a/src/discord-http.c b/src/discord-http.c
16	index 83b92ce..80b3946 100644
17	--- a/src/discord-http.c
18	+++ b/src/discord-http.c
19	@@ -175,6 +175,9 @@ static void discord_http_gateway_cb(struct http_request *req)
20
21	if (dd->gateway->path == NULL) {
22	dd->gateway->path = g_strdup("/?encoding=json&v=6");
23	+ } else if (g_strcmp0(dd->gateway->path, "") == 0) {
24	+ g_free(dd->gateway->path);
25	+ dd->gateway->path = g_strdup("/?encoding=json&v=6");
26	}
27
28	g_match_info_free(match);