Changeset a0c6fc5

Timestamp:

2011-06-25T22:28:26Z (13 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

1dc00fe

Parents:

9e7a566

Message:

fix possible segfault(s) when changing otr status

Files:

• Makefile (modified) (1 diff)
• otr.c (modified) (6 diffs)

Makefile

@@ -164 +164 @@
 
 -include .depend/*.d
+# DO NOT DELETE

otr.c

@@ -162 +162 @@
 void otr_smp_or_smpq(irc_t *irc, const char *nick, const char *question,
                 const char *secret);
+
+/* update flags within the irc_user structure to reflect OTR status of context */
+void otr_update_uflags(ConnContext *context, irc_user_t *u);
 
 /* update op/voice flag of given user according to encryption state and settings
@@ -608 +611 @@
         irc_user_t *u;
         irc_t *irc = ic->bee->ui_data;
-        const char *trust;
 
         u = peeruser(irc, context->username, context->protocol);
@@ -618 +620 @@
         }
         
-        trust = context->active_fingerprint->trust;
-        if(trust && trust[0])
-                u->flags |= IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED;
-        else
-                u->flags = ( u->flags & ~IRC_USER_OTR_TRUSTED ) | IRC_USER_OTR_ENCRYPTED;
+        otr_update_uflags(context, u);
         if(!otr_update_modeflags(irc, u))
                 irc_usermsg(irc, "conversation with %s is now off the record", u->nick);
@@ -641 +639 @@
                 return;
         }
-        u->flags &= ~( IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED );
+        otr_update_uflags(context, u);
         if(!otr_update_modeflags(irc, u))
                 irc_usermsg(irc, "conversation with %s is now in the clear", u->nick);
@@ -660 +658 @@
                 return;
         }
-        if(context->active_fingerprint->trust[0])
-                u->flags |= IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED;
-        else
-                u->flags = ( u->flags & ~IRC_USER_OTR_TRUSTED ) | IRC_USER_OTR_ENCRYPTED;
+
+        otr_update_uflags(context, u);
         if(!otr_update_modeflags(irc, u))
                 irc_usermsg(irc, "otr connection with %s has been refreshed", u->nick);
@@ -1312 +1308 @@
 }
 
+void otr_update_uflags(ConnContext *context, irc_user_t *u)
+{
+        const char *trust;
+
+        if(context->active_fingerprint) {
+                u->flags |= IRC_USER_OTR_ENCRYPTED;
+
+                trust = context->active_fingerprint->trust;
+                if(trust && trust[0])
+                        u->flags |= IRC_USER_OTR_TRUSTED;
+                else
+                        u->flags &= ~IRC_USER_OTR_TRUSTED;
+        } else {
+                u->flags &= ~IRC_USER_OTR_ENCRYPTED;
+        }
+}
+
 int otr_update_modeflags(irc_t *irc, irc_user_t *u)
 {