Changeset 1522faf for irc_im.c

Timestamp:

2015-04-06T02:26:44Z (6 years ago)

Author:

dequis <dx@…>

Children:

d16e951

Parents:

71f87ba (diff), 69982f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

dequis <dx@…> (06-04-15 02:24:35)

git-committer:

dequis <dx@…> (06-04-15 02:26:44)

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -235 +235 @@
                         } else {
                                 /* Modules can swallow messages. */
-                                return TRUE;
+                                goto cleanup;
                         }
                 }
@@ -250 +250 @@
         wrapped = word_wrap(msg, 425);
         irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
-
         g_free(wrapped);
+
+cleanup:
         g_free(prefix);
         g_free(msg);
@@ -291 +292 @@
 
         irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+
+        g_string_free(msg, TRUE);
 
         return TRUE;