Attachment 696218 Details for Bug 910042 – Local copy of (by Pidgin upstream) proposed patch to fix the CVE-2013-0274 issue

[patch] Local copy of (by Pidgin upstream) proposed patch to fix the CVE-2013-0274 issue

CVE-2013-0274.diff (text/plain), 2.41 KB, created by Jan Lieskovsky on 2013-02-11 17:08:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Lieskovsky

Created: 2013-02-11 17:08:21 UTC

Size: 2.41 KB

patch

obsolete

># HG changeset patch
># User Daniel Atallah <datallah@pidgin.im>
># Date 1360101672 18000
># Branch release-2.x.y
># Node ID 19dfa10d803bd91e6d3b1ee47c98589a72a5c8ac
># Parent  472aff41c6d7afe3ea719e60a16948bd571dcb44
>CID 731954, 731953, 731952, 731951, 731950 UPnP buffer overflows
>
>diff --git a/libpurple/upnp.c b/libpurple/upnp.c
>--- a/libpurple/upnp.c
>+++ b/libpurple/upnp.c
>@@ -409,7 +409,7 @@
> 		: PURPLE_UPNP_STATUS_UNABLE_TO_DISCOVER;
> 	control_info.lookup_time = time(NULL);
> 	control_info.control_url = control_url;
>-	strncpy(control_info.service_type, dd->service_type,
>+	g_strlcpy(control_info.service_type, dd->service_type,
> 		sizeof(control_info.service_type));
> 
> 	fire_discovery_callbacks(control_url != NULL);
>@@ -601,9 +601,9 @@
> 		sentSuccess = FALSE;
> 
> 		if((dd->retry_count % 2) == 0) {
>-			strncpy(dd->service_type, WAN_IP_CONN_SERVICE, sizeof(dd->service_type));
>+			g_strlcpy(dd->service_type, WAN_IP_CONN_SERVICE, sizeof(dd->service_type));
> 		} else {
>-			strncpy(dd->service_type, WAN_PPP_CONN_SERVICE, sizeof(dd->service_type));
>+			g_strlcpy(dd->service_type, WAN_PPP_CONN_SERVICE, sizeof(dd->service_type));
> 		}
> 
> 		sendMessage = g_strdup_printf(SEARCH_REQUEST_STRING, dd->service_type);
>@@ -787,7 +787,7 @@
> 	}
> 	*temp2 = '\0';
> 
>-	strncpy(control_info.publicip, temp + 1,
>+	g_strlcpy(control_info.publicip, temp + 1,
> 			sizeof(control_info.publicip));
> 
> 	purple_debug_info("upnp", "NAT Returned IP: %s\n", control_info.publicip);
>@@ -822,7 +822,7 @@
> looked_up_internal_ip_cb(gpointer data, gint source, const gchar *error_message)
> {
> 	if (source != -1) {
>-		strncpy(control_info.internalip,
>+		g_strlcpy(control_info.internalip,
> 			purple_network_get_local_system_ip(source),
> 			sizeof(control_info.internalip));
> 		purple_debug_info("upnp", "Local IP: %s\n",
>@@ -975,7 +975,7 @@
> 	ar->cb_data = cb_data;
> 	ar->add = TRUE;
> 	ar->portmap = portmap;
>-	strncpy(ar->protocol, protocol, sizeof(ar->protocol));
>+	g_strlcpy(ar->protocol, protocol, sizeof(ar->protocol));
> 
> 	/* If we're waiting for a discovery, add to the callbacks list */
> 	if(control_info.status == PURPLE_UPNP_STATUS_DISCOVERING) {
>@@ -1022,7 +1022,7 @@
> 	ar->cb_data = cb_data;
> 	ar->add = FALSE;
> 	ar->portmap = portmap;
>-	strncpy(ar->protocol, protocol, sizeof(ar->protocol));
>+	g_strlcpy(ar->protocol, protocol, sizeof(ar->protocol));
> 
> 	/* If we're waiting for a discovery, add to the callbacks list */
> 	if(control_info.status == PURPLE_UPNP_STATUS_DISCOVERING) {

Actions: View | Diff

Attachments on bug 910042: 696218