rpms/gaim-meanwhile/FC-4 g-mw-empty-message-crash.patch, NONE, 1.1 g-mw-empty-title-crash.patch, NONE, 1.1 gaim-meanwhile.spec, 1.9, 1.10

[Joshua W. Boyer (jwboyer)]

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14938

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Fix two crashes

g-mw-empty-message-crash.patch:

--- NEW FILE g-mw-empty-message-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3013,7 +3013,7 @@ static void mw_place_message(struct mwPl
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }

g-mw-empty-title-crash.patch:

--- NEW FILE g-mw-empty-title-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
 	     NSTR(c_inviter), NSTR(c_name),
 	     NSTR(c_topic), NSTR(c_invitation));
 
+  if(! c_topic) c_topic = "(no title)";
+  if(! c_invitation) c_invitation = "(no message)";
   serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
@@ -1828,6 +1830,7 @@ static void mw_conf_opened(struct mwConf
   GaimConversation *g_conf;
 
   const char *n = mwConference_getName(conf);
+  const char *t = mwConference_getTitle(conf);
 
   DEBUG_INFO("conf %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
@@ -1837,8 +1840,8 @@ static void mw_conf_opened(struct mwConf
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf),
-				mwConference_getTitle(conf));
+  if(! t) t = "(no title)";
+  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf), t);
 
   mwConference_setClientData(conf, GAIM_CONV_CHAT(g_conf), NULL);
 
@@ -2811,6 +2814,8 @@ static void mw_place_invite(struct mwCon
   g_hash_table_insert(ht, CHAT_KEY_INVITE, g_strdup(message));
   g_hash_table_insert(ht, CHAT_KEY_IS_PLACE, g_strdup("")); /* ugh */
 
+  if(! title) title = "(no title)";
+  if(! message) message = "(no message)";
   serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
@@ -2882,6 +2887,7 @@ static void mw_place_opened(struct mwPla
   GList *members, *l;
 
   const char *n = mwPlace_getName(place);
+  const char *t = mwPlace_getTitle(place);
 
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
@@ -2893,8 +2899,8 @@ static void mw_place_opened(struct mwPla
   DEBUG_INFO("place %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
 
-  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place),
-			       mwPlace_getTitle(place));
+  if(! t) t = "(no title)";
+  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place), t);
 
   mwPlace_setClientData(place, gconf, NULL);
 


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gaim-meanwhile.spec	3 Jan 2006 18:07:29 -0000	1.9
+++ gaim-meanwhile.spec	13 Jan 2006 20:46:10 -0000	1.10
@@ -7,18 +7,22 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+Patch0:         g-mw-empty-title-crash.patch
+Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -39,6 +43,10 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix crash with empty chat title
+- Fix crash with empty message in group chat
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
 - Update to latest release