Changeset 91634ec

Timestamp:

Mar 1, 2010, 8:15:48 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

516c27e

Parents:

b0da027

git-author:

Anders Kaseorg <andersk@mit.edu> (02/27/10 22:41:26)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/01/10 20:15:48)

Message:

Add owl_message_delete to fix leaks.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Alejandro R. Sedeño <asedeno@mit.edu>

Files:

• functions.c (modified) (1 diff)
• logging.c (modified) (1 diff)
• message.c (modified) (1 diff)
• messagelist.c (modified) (1 diff)
• owl.c (modified) (3 diffs)

functions.c

@@ -532 +532 @@
     owl_global_messagequeue_addmsg(&g, mout);
   } else {
-    owl_message_free(mout);
+    owl_message_delete(mout);
   }
 

logging.c

@@ -184 +184 @@
   owl_message_create_from_zwrite(m, zw, text);
   if (!owl_log_shouldlog_message(m)) {
-    owl_message_free(m);
-    return;
-  }
-  owl_message_free(m);
+    owl_message_delete(m);
+    return;
+  }
+  owl_message_delete(m);
 
   /* chop off a local realm */

message.c

@@ -967 +967 @@
   owl_message_invalidate_format(m);
 }
+
+void owl_message_delete(owl_message *m)
+{
+  owl_message_free(m);
+  owl_free(m);
+}

messagelist.c

@@ -75 +75 @@
     m=owl_list_get_element(&(ml->list), i);
     if (owl_message_is_delete(m)) {
-      owl_message_free(m);
+      owl_message_delete(m);
     } else {
       owl_list_append_element(&newlist, m);

owl.c

@@ -195 +195 @@
   /* if this message it on the puntlist, nuke it and continue */
   if (owl_global_message_is_puntable(&g, m)) {
-    owl_message_free(m);
+    owl_message_delete(m);
     return 0;
   }
@@ -202 +202 @@
   if (owl_global_is_ignorelogins(&g)
       && owl_message_is_loginout(m)) {
-    owl_message_free(m);
+    owl_message_delete(m);
     return 0;
   }
@@ -208 +208 @@
   if (!owl_global_is_displayoutgoing(&g)
       && owl_message_is_direction_out(m)) {
-    owl_message_free(m);
+    owl_message_delete(m);
     return 0;
   }