# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1139211995 0
# Node ID 541486fde12b927f05b4c07329bf37fecf78b206
# Parent  ba82cc4d1abd684343d872a57ce59d2c1dfb2c4b
[gaim-migrate @ 15495]
SF Patch #1419139 from Christophe Chapuis (tofe2tofe)

"Tests have been added to check if the '\' character can
 be skipped in the theme.
 Another test has been added to check there is no buffer
 overrun while reading the smiley definition."

committer: Tailor Script <tailor@pidgin.im>

diff -r ba82cc4d1abd -r 541486fde12b COPYRIGHT
--- a/COPYRIGHT	Mon Feb 06 07:34:55 2006 +0000
+++ b/COPYRIGHT	Mon Feb 06 07:46:35 2006 +0000
@@ -45,6 +45,7 @@
 Julien Cegarra
 Cerulean Studios, LLC
 Jonathan Champ
+Christophe Chapuis
 Ka-Hing Cheung
 Sadrul Habib Chowdhury
 Arturo Cisneros, Jr.
diff -r ba82cc4d1abd -r 541486fde12b src/gtkthemes.c
--- a/src/gtkthemes.c	Mon Feb 06 07:34:55 2006 +0000
+++ b/src/gtkthemes.c	Mon Feb 06 07:46:35 2006 +0000
@@ -172,8 +172,8 @@
 			while  (*i) {
 				char l[64];
 				int li = 0;
-				while (!isspace(*i)) {
-					if (*i == '\\' && *(i+1) != '\0' )
+				while (!isspace(*i) && li < sizeof(l) - 1) {
+					if (*i == '\\' && *(i+1) != '\0' && *(i+1) != '\n' && *(i+1) != '\r')
 						i++;
 					l[li++] = *(i++);
 				}