Changeset 71004a3

Timestamp:

2014-02-06T22:51:19Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c239fff

Parents:

cc17b76 (diff), 329f9fe (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.

Message:

Merging OTR fixes from pesco.

File:

• otr.c (modified) (3 diffs)

otr.c

@@ -441 +441 @@
         int st;
         char *otrmsg = NULL;
-        char *emsg = msg;           /* the message as we hand it to libotr */
         ConnContext *ctx = NULL;
         irc_t *irc = iu->irc;
         struct im_connection *ic = iu->bu->ic;
-        otrl_instag_t instag = OTRL_INSTAG_RECENT; // XXX?
+        otrl_instag_t instag = OTRL_INSTAG_BEST; // XXX?
+        /* NB: in libotr 4.0.0 OTRL_INSTAG_RECENT will cause a null-pointer deref
+         * in otrl_message_sending with newly-added OTR contexts.
+         */
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
@@ -454 +456 @@
         st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
                 ic->acc->user, ic->acc->prpl->name, iu->bu->handle, instag,
-                emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_SKIP, &ctx, NULL, NULL);
-        /* in libotr 4.0.0 with OTRL_FRAGMENT_SEND_ALL, otrmsg must be passed
-         * but the value it gets carries no meaning. it can be set even though
-         * the message has been injected.
-         * With OTRL_FRAGMENT_SEND_SKIP, libotr doesn't handle the sending, it's
-         * up to us.
-         */
-
-        if(emsg != msg) {
-                g_free(emsg);   /* we're done with this one */
-                emsg = NULL;
-        }
+                msg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_ALL_BUT_LAST, &ctx, NULL, NULL);
+
+        if(otrmsg && otrmsg != msg) {
+                /* libotr wants us to replace our message */
+                /* NB: caller will free old msg */
+                msg = g_strdup(otrmsg);
+                otrl_message_free(otrmsg);
+        }
+        
         if(st) {
-                irc_rootmsg(irc, "Error encrypting text for OTR: %d", st);
-        }
-        
-        if (otrmsg != NULL) {
-                return otrmsg;
-        }
-        return emsg;
+                irc_usernotice(iu, "otr: error handling outgoing message: %d", st);
+                msg = NULL;     /* do not send plaintext! */
+        }
+
+        return msg;
 }
 
@@ -1351 +1348 @@
         irc_user_t *u;
         ConnContext *ctx;
-        otrl_instag_t instag = OTRL_INSTAG_RECENT;  // XXX
+        otrl_instag_t instag = OTRL_INSTAG_BEST;  // XXX
 
         u = irc_user_by_name(irc, nick);