changeset 23391:0a7fe6eaa5ab

propagate from branch 'im.pidgin.pidgin.2.4.3' (head c3831c9181f4f61b747321240086ee79e4a08fd8) to branch 'im.pidgin.pidgin' (head 56142fc8ab251185fb90236062737b3768d52710)
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 26 Jun 2008 19:05:27 +0000
parents f0a88845f517 (current diff) 79b4a8e0da77 (diff)
children eac0561dfd55
files libpurple/protocols/msn/slplink.c libpurple/protocols/zephyr/zephyr.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/slplink.c	Thu Jun 26 09:14:42 2008 +0000
+++ b/libpurple/protocols/msn/slplink.c	Thu Jun 26 19:05:27 2008 +0000
@@ -593,7 +593,7 @@
 	}
 	else if (slpmsg->size)
 	{
-		if (offset < 0 || (offset + len) > slpmsg->size)
+		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
 			purple_debug_error("msn",
 				"Oversized slpmsg - msgsize=%lld offset=%" G_GSIZE_FORMAT " len=%" G_GSIZE_FORMAT "\n",
--- a/libpurple/protocols/msnp9/slplink.c	Thu Jun 26 09:14:42 2008 +0000
+++ b/libpurple/protocols/msnp9/slplink.c	Thu Jun 26 19:05:27 2008 +0000
@@ -597,7 +597,7 @@
 	}
 	else if (slpmsg->size)
 	{
-		if (offset < 0 || (offset + len) > slpmsg->size)
+		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
 			purple_debug_error("msn", "Oversized slpmsg\n");
 			g_return_if_reached();