1 # date:2014-02-28 owner:abhijit type:bug bugdb:18157348

     2 # Bug 18157348 18 pidgin security advisories on 2014-01-28

     3 #

     4 # These changes should be submitted upstream.

     5 

     6 --- pidgin-2.10.9/libpurple/protocols/msn/slplink.c.orig	2014-02-24 15:29:54.414804070 +0530

     7 +++ pidgin-2.10.9/libpurple/protocols/msn/slplink.c	2014-02-24 15:31:15.715299921 +0530

     8 @@ -317,7 +317,10 @@ msn_slplink_send_msgpart(MsnSlpLink *slp

     9  			if (len > MSN_SBCONN_MAX_SIZE)

    10  				len = MSN_SBCONN_MAX_SIZE;

    11  

    12 -			msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + offset, len);

    13 + 			if ((slpmsg->buffer != NULL) && (slpmsg->buffer + offset != NULL) ) 

    14 +			{ 

    15 +				msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + offset, len);

    16 +			} 

    17  		}

    18  

    19  		msn_p2p_info_set_length(slpmsg->p2p_info, len);

    20 --- pidgin-2.10.9/libpurple/ft.c.orig	2014-02-26 11:13:12.556709745 +0530

    21 +++ pidgin-2.10.9/libpurple/ft.c	2014-02-26 11:14:00.241111366 +0530

    22 @@ -1659,6 +1659,8 @@ purple_xfer_get_thumbnail(const PurpleXf

    23  {

    24  	PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);

    25  

    26 +	if (priv == NULL)

    27 +		return NULL;

    28  	if (len)

    29  		*len = priv->thumbnail_size;

    30  

    31 --- pidgin-2.10.9/libpurple/protocols/msn/xfer.c.orig	2014-02-28 11:53:14.973470848 +0530

    32 +++ pidgin-2.10.9/libpurple/protocols/msn/xfer.c	2014-02-28 11:55:54.460787530 +0530

    33 @@ -147,7 +147,7 @@ msn_xfer_end_cb(MsnSlpCall *slpcall, Msn

    34  		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&

    35  		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))

    36  	{

    37 -		purple_xfer_cancel_remote(slpcall->xfer);

    38 +		return;

    39  	}

    40  }

    41