File 0001-Fix-null-pointer-dereference-on-ft-attempt... of Package bitlbee.6444

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-null-pointer-dereference-on-ft-attempts-3.4.x.patch of Package bitlbee.6444 (Revision 96902eed9bb176fe9cf9758190f25261)

Currently displaying revision 96902eed9bb176fe9cf9758190f25261 , Show latest

From 8fcf15ab04fd9b4786b1d01c148ab8b83400f84d Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Sun, 13 Nov 2016 16:52:43 -0300
Subject: [PATCH] Fix null pointer dereference on ft attempts from non-existing
 users

This is a backported combination of 701ab81 (included in 3.5) and XXXXXX
(included in 3.5.1)
---
 protocols/bee_ft.c    | 2 +-
 protocols/purple/ft.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/protocols/bee_ft.c b/protocols/bee_ft.c
index 27fd4eac..916b2e88 100644
--- a/protocols/bee_ft.c
+++ b/protocols/bee_ft.c
@@ -30,7 +30,7 @@ file_transfer_t *imcb_file_send_start(struct im_connection *ic, char *handle, ch
 	bee_t *bee = ic->bee;
 	bee_user_t *bu = bee_user_by_handle(bee, ic, handle);
 
-	if (bee->ui->ft_in_start) {
+	if (bee->ui->ft_in_start && bu) {
 		return bee->ui->ft_in_start(bee, bu, file_name, file_size);
 	} else {
 		return NULL;
diff --git a/protocols/purple/ft.c b/protocols/purple/ft.c
index 320fc887..4d785291 100644
--- a/protocols/purple/ft.c
+++ b/protocols/purple/ft.c
@@ -107,6 +107,10 @@ static gboolean prplcb_xfer_new_send_cb(gpointer data, gint fd, b_input_conditio
 	/* TODO(wilmer): After spreading some more const goodness in BitlBee,
 	   remove the evil cast below. */
 	px->ft = imcb_file_send_start(ic, (char *) who, xfer->filename, xfer->size);
+
+	if (!px->ft) {
+		return FALSE;
+	}
 	px->ft->data = px;
 
 	px->ft->accept = prpl_xfer_accept;
-- 
2.11.0

Places

File 0001-Fix-null-pointer-dereference-on-ft-attempts-3.4.x.patch of Package bitlbee.6444 (Revision 96902eed9bb176fe9cf9758190f25261)

Places