From 8256ad5ed0c545dfbfd0035d0bac8296ac224467 Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 27 Oct 2014 03:36:05 -0300 Subject: Some more g_source_remove warning fixes - http_incoming_data calling itself - jabber_bs_free_transfer calling jabber_si_free_transfer --- lib/http_client.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/http_client.c b/lib/http_client.c index 18c393f8..590b8143 100644 --- a/lib/http_client.c +++ b/lib/http_client.c @@ -210,7 +210,10 @@ static gboolean http_incoming_data( gpointer data, int source, b_input_condition int st; if( req->inpa > 0 ) + { b_event_remove( req->inpa ); + req->inpa = 0; + } if( req->ssl ) { -- cgit v1.2.3 From b6bd99c766d88ef37c735f5bbd08e621288d955d Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 27 Oct 2014 03:36:09 -0300 Subject: dcc: Fix some invalid memory accesses reported by ASAN ASAN <3 --- lib/ftutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ftutil.c b/lib/ftutil.c index 71c09b50..3b29d2f4 100644 --- a/lib/ftutil.c +++ b/lib/ftutil.c @@ -137,7 +137,7 @@ int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int c memcpy( saddr_ptr, saddr, saddrlen ); /* I hate static-length strings.. */ - host[HOST_NAME_MAX] = '\0'; + host[HOST_NAME_MAX-1] = '\0'; port[5] = '\0'; return fd; -- cgit v1.2.3