Attachment 310788 Details for Bug 453764 – Proposed upstream patch

[patch] Proposed upstream patch

second_attempt.diff (text/plain), 1.60 KB, created by Josh Bressers on 2008-07-02 13:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-07-02 13:14:49 UTC

Size: 1.60 KB

patch

obsolete

>Index: libpurple/internal.h
>===================================================================
>--- libpurple/internal.h	(revision 13143)
>+++ libpurple/internal.h	(working copy)
>@@ -140,6 +140,14 @@
> #	define G_MAXUINT32 ((guint32) 0xffffffff)
> #endif
> 
>+#ifndef G_MAXSIZE
>+#	if GLIB_SIZEOF_LONG == 8
>+#		define G_MAXSIZE ((gsize) 0xffffffffffffffff)
>+#	else
>+#		define G_MAXSIZE ((gsize) 0xffffffff)
>+#	endif
>+#endif
>+
> #if GLIB_CHECK_VERSION(2,6,0)
> #	include <glib/gstdio.h>
> #endif
>Index: libpurple/protocols/msn/slplink.c
>===================================================================
>--- libpurple/protocols/msn/slplink.c	(revision 13143)
>+++ libpurple/protocols/msn/slplink.c	(working copy)
>@@ -596,9 +596,11 @@
> 	}
> 	else if (slpmsg->size)
> 	{
>-		if ((offset + len) > slpmsg->size)
>+		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
> 		{
>-			purple_debug_error("msn", "Oversized slpmsg - msgsize=%lld offset=%d len=%d\n", slpmsg->size, offset, len);
>+			purple_debug_error("msn", "Oversized slpmsg - msgsize=%lld "
>+					"offset=" G_GSIZE_FORMAT " len=" G_GSIZE_FORMAT "\n",
>+					slpmsg->size, offset, len);
> 			g_return_if_reached();
> 		}
> 		else
>Index: libpurple/protocols/msnp9/slplink.c
>===================================================================
>--- libpurple/protocols/msnp9/slplink.c	(revision 13143)
>+++ libpurple/protocols/msnp9/slplink.c	(working copy)
>@@ -595,7 +595,7 @@
> 	}
> 	else if (slpmsg->size)
> 	{
>-		if ((offset + len) > slpmsg->size)
>+		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
> 		{
> 			purple_debug_error("msn", "Oversized slpmsg\n");
> 			g_return_if_reached();

Actions: View | Diff

Attachments on bug 453764: 310788