Changeset b9517cf for message.c

Timestamp:

Jul 25, 2011, 1:35:30 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

a74a044

Parents:

f271129

git-author:

David Benjamin <davidben@mit.edu> (07/25/11 01:24:06)

git-committer:

David Benjamin <davidben@mit.edu> (07/25/11 01:35:30)

Message:

Explicitly store whether an owl_message has a ZNotice_t

We should remove it altogether in perlmessages, but in the meantime, we
shouldn't be crashing on faked incoming zephyr messages. Also drop the
attempted fake ZNotice_t in owl_perlconfig_hashref2message. No one could
have relied on it safely today because any such message would crash on
delete.

File:

• message.c (modified) (4 diffs)

message.c

@@ -33 +33 @@
   owl_message_set_direction_none(m);
   m->delete=0;
+
+#ifdef HAVE_LIBZEPHYR
+  m->has_notice = false;
+#endif
 
   owl_message_set_hostname(m, "");
@@ -490 +494 @@
 const ZNotice_t *owl_message_get_notice(const owl_message *m)
 {
-  return(&(m->notice));
+  return m->has_notice ? &m->notice : NULL;
 }
 #else
@@ -781 +785 @@
   /* first save the full notice */
   m->notice = *n;
+  m->has_notice = true;
 
   /* a little gross, we'll replace \r's with ' ' for now */
@@ -996 +1001 @@
   owl_pair *p;
 #ifdef HAVE_LIBZEPHYR    
-  if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
+  if (m->has_notice) {
     ZFreeNotice(&(m->notice));
   }