[Gaim-commits] CVS: web/htdocs gaim-0.81.diff,NONE,1.1

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18927

Added Files:
	gaim-0.81.diff 
Log Message:
Forgot the patch.


--- NEW FILE: gaim-0.81.diff ---
? gaim-0.80.tar.gz
? gaim-0.80.tar.gz.asc
? gaim-0.80.tar.gz.gpg
? gaim-0.81.diff
? mario.dvi
? mario.midi
? mario.pdf
? mario.ps
? msn2.diff
? tmpcvs25202
? tmpwrk25202
? xine-out.wav
? yahooworks.diff
? plugins/ssl/ssl-nss.loT
Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.195
diff -r1.195 gtkprefs.c
526c526
< 	gchar *command;
---
> 	gchar *command, *escaped;
547c547,549
< 		command = g_strdup_printf("tar > /dev/null xzf \"%s\" -C %s", path, destdir);
---
> 		escaped = g_shell_quote(path);
> 		command = g_strdup_printf("tar > /dev/null xzf %s -C %s", escaped, destdir);
> 		g_free(escaped);
Index: src/protocols/msn/object.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/object.c,v
retrieving revision 1.2
diff -r1.2 object.c
37a38
> 		size_t offset; \
40,42c41,49
< 		strncpy(buf, tag, c - tag); \
< 		buf[c - tag] = '\0'; \
< 		obj->field = atoi(buf); \
---
> 		if (c != NULL) \
> 		{ \
> 			memset(buf, 0, sizeof(buf)); \
> 			offset = c - tag; \
> 			if (offset >= sizeof(buf)) \
> 				offset = sizeof(buf) - 1; \
> 			strncpy(buf, tag, offset); \
> 			obj->field = atoi(buf); \
> 		} \
Index: src/protocols/msn/slp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slp.c,v
retrieving revision 1.7
diff -r1.7 slp.c
648,649c648,652
< 				strncpy(temp, status, c - status);
< 				temp[c - status] = '\0';
---
> 				size_t offset = c - status;
> 				if (offset >= sizeof(temp))
> 					offset = sizeof(temp) - 1;
> 				strncpy(temp, status, offset);
> 				temp[offset] = '\0';