Changeset 9c590d4 for message.c

Timestamp:

Jun 6, 2007, 11:31:49 PM (18 years ago)

Author:

Alex Vandiver <alexmv@mit.edu>

Branches:

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

Children:

d0961fe

Parents:

48609ce

git-author:

Alex Vandiver <alexmv@mit.edu> (06/06/07 23:31:44)

git-committer:

Alex Vandiver <alexmv@mit.edu> (06/06/07 23:31:49)

Message:

Outgoing CC'd messages get logged to all recipients

File:

• message.c (modified) (3 diffs)

message.c

@@ -663 +663 @@
 char *owl_message_get_cc_without_recipient(owl_message *m)
 {
-  char *cc, *out, *end, *user;
+  char *cc, *out, *end, *user, *recip;
 
   cc = owl_message_get_cc(m);
+  if (cc == NULL)
+    return NULL;
+
+  recip = short_zuser(owl_message_get_recipient(m));
   out = owl_malloc(strlen(cc));
   end = out;
@@ -671 +675 @@
   user = strtok(cc, " ");
   while (user != NULL) {
-    if (strcasecmp(user, short_zuser(owl_message_get_recipient(m))) != 0) {
+    if (strcasecmp(user, recip) != 0) {
       strcpy(end, user);
       end[strlen(user)] = ' ';
@@ -680 +684 @@
   end[0] = '\0';
 
+  owl_free(recip);
   owl_free(cc);
+
+  if (strlen(out) == 0) {
+    owl_free(out);
+    out = NULL;
+  }
+
   return(out);
 }