gnome-mud r730 - in trunk: . src

[lharris svn gnome org]

Author: lharris
Date: Tue Feb 17 01:27:19 2009
New Revision: 730
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=730&view=rev

Log:
Double free fix.


Modified:
   trunk/ChangeLog
   trunk/src/mud-connection-view.c
   trunk/src/mud-telnet-handlers.c
   trunk/src/mud-telnet-msp.c
   trunk/src/mud-telnet.c

Modified: trunk/src/mud-connection-view.c
==============================================================================
--- trunk/src/mud-connection-view.c	(original)
+++ trunk/src/mud-connection-view.c	Tue Feb 17 01:27:19 2009
@@ -540,13 +540,8 @@
         view->priv->download_queue = NULL;
 #endif
 
-        if(view->priv->processed)
-            g_string_free(view->priv->processed, TRUE);
-
         view->priv->processed = NULL;
 
-        mud_zmp_finalize(view->priv->telnet);
-
         gnet_conn_disconnect(view->connection);
 
         g_object_unref(view->priv->telnet);
@@ -1065,8 +1060,8 @@
 
                 if(view->priv->processed != NULL)
                 {
-                    g_message("freeing processed in m-c-v");
                     g_string_free(view->priv->processed, TRUE);
+                    view->priv->processed = NULL;
                 }
 
                 buf = NULL;

Modified: trunk/src/mud-telnet-handlers.c
==============================================================================
--- trunk/src/mud-telnet-handlers.c	(original)
+++ trunk/src/mud-telnet-handlers.c	Tue Feb 17 01:27:19 2009
@@ -49,7 +49,6 @@
 void
 MudHandler_TType_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("TTYPE enabled.");
     handler->enabled = TRUE;
     telnet->ttype_iteration = 0;
 }
@@ -116,7 +115,6 @@
 {
     gint w, h;
 
-    g_message("NAWS enabled.");
     mud_telnet_get_parent_size(telnet, &w, &h);
     mud_telnet_set_parent_naws(telnet, TRUE);
 
@@ -143,7 +141,6 @@
 void
 MudHandler_ECHO_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("ECHO enabled.");
     mud_telnet_set_local_echo(telnet, FALSE);
 }
 
@@ -164,7 +161,6 @@
 void
 MudHandler_EOR_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("EOR enabled.");
     telnet->eor_enabled = TRUE;
 }
 
@@ -185,7 +181,6 @@
 void
 MudHandler_CHARSET_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("CHARSET enabled.");
     handler->enabled = TRUE;
 }
 
@@ -255,7 +250,6 @@
 void
 MudHandler_ZMP_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("ZMP enabled.");
     handler->enabled = TRUE;
     mud_zmp_init(telnet);
 }
@@ -320,7 +314,6 @@
 void
 MudHandler_MSP_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("MSP enabled.");
     handler->enabled = TRUE;
     mud_telnet_msp_init(telnet);
     telnet->msp_parser.enabled = TRUE;
@@ -344,7 +337,6 @@
 void
 MudHandler_MCCP_Enable(MudTelnet *telnet, MudTelnetHandler *handler)
 {
-    g_message("MCCP enabled.");
     handler->enabled = TRUE;
     telnet->mccp = FALSE;
 }
@@ -370,7 +362,6 @@
 MudHandler_MCCP_HandleSubNeg(MudTelnet *telnet, guchar *buf, 
         guint len, MudTelnetHandler *handler)
 {
-    g_message("MCCP Subneq.");
     telnet->mccp = TRUE;
     telnet->mccp_new = TRUE;
 

Modified: trunk/src/mud-telnet-msp.c
==============================================================================
--- trunk/src/mud-telnet-msp.c	(original)
+++ trunk/src/mud-telnet-msp.c	Tue Feb 17 01:27:19 2009
@@ -188,7 +188,6 @@
 	*len = telnet->msp_parser.output->len;
     }
 
-    g_message("Free'ing view->priv->processed.");
     g_string_free(buf, TRUE);
     *(&buf) = NULL;
 

Modified: trunk/src/mud-telnet.c
==============================================================================
--- trunk/src/mud-telnet.c	(original)
+++ trunk/src/mud-telnet.c	Tue Feb 17 01:27:19 2009
@@ -485,10 +485,12 @@
 		break;
 
 	    case (guchar)TEL_GA:
+                // TODO: Hook up to triggers.
 		telnet->tel_state = TEL_STATE_TEXT;
 		break;
 
 	    case (guchar)TEL_EOR_BYTE:
+                // TODO: Hook up to triggers.
 		telnet->tel_state = TEL_STATE_TEXT;
 		break;