Changeset 3c7d086a

Timestamp:

Sep 26, 2005, 3:48:37 PM (19 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0154e2d

Parents:

e74e573

Message:

Fix for BZ 90:
   crash when sending/logging outgoing AIM message and not logged in

Also made the message log deal with getting passed a NULL message.

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (3 diffs)
• logging.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.1.12pre
+        Don't crash when sending/logging outgoing 
+           AIM message and not logged in [BZ 90]
+        
 2.1.11
         Don't crash doing zlocate with bad tickets. [BZ 12]

functions.c

@@ -399 +399 @@
     m=owl_function_make_outgoing_zephyr(mymsg, line, owl_zwrite_get_zsig(&z));
 
-    /* log it */
-    owl_log_message(m);
-
-    /* add it or nuke it */
-    if (owl_global_is_displayoutgoing(&g)) {
-      owl_function_add_message(m);
+    if (m) {
+      /* log it */
+      owl_log_message(m);
+      
+      /* add it or nuke it */
+      if (owl_global_is_displayoutgoing(&g)) {
+        owl_function_add_message(m);
+      } else {
+        owl_message_free(m);
+      }
     } else {
-      owl_message_free(m);
+      owl_function_error("Could not create outgoing zephyr message");
     }
   }
@@ -459 +463 @@
     mymsg=owl_zwrite_get_message(&z);
     m=owl_function_make_outgoing_zephyr(mymsg, line, owl_zwrite_get_zsig(&z));
-    
-    /* log it */
-    owl_log_message(m);
-    
-    /* add it or nuke it */
-    if (owl_global_is_displayoutgoing(&g)) {
-      owl_function_add_message(m);
+    if (m) {
+      /* log it */
+      owl_log_message(m);
+      
+      /* add it or nuke it */
+      if (owl_global_is_displayoutgoing(&g)) {
+        owl_function_add_message(m);
+      } else {
+        owl_message_free(m);
+      }
     } else {
-      owl_message_free(m);
+      owl_function_error("Could not create outgoing zephyr message");
     }
   }
@@ -498 +505 @@
   m=owl_function_make_outgoing_aim(msg, to);
 
-  /* log it */
-  owl_log_message(m);
-
-  /* display it or nuke it */
-  if (owl_global_is_displayoutgoing(&g)) {
-    owl_function_add_message(m);
-  } else {
-    owl_message_free(m);
+  if (m) {
+    /* log it */
+    owl_log_message(m);
+    
+    /* display it or nuke it */
+    if (owl_global_is_displayoutgoing(&g)) {
+      owl_function_add_message(m);
+    } else {
+      owl_message_free(m);
+    }
+  } else {
+    owl_function_error("Could not create outgoing AIM message");
   }
 

logging.c

@@ -13 +13 @@
 void owl_log_message(owl_message *m) {
   owl_function_debugmsg("owl_log_message: entering");
+
+  if (m == NULL) {
+    owl_function_debugmsg("owl_log_message: passed null message");
+    return;
+  }
 
   /* should we be logging this message? */