[Pkg-privacy-commits] [irssi-plugin-otr] 160/267: Fix: check encrypted state of fingerprint

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit b25e22d978e4eec9ce5d7020983e190793dda745
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Thu Nov 29 13:25:42 2012 -0500

    Fix: check encrypted state of fingerprint
    
    Thanks to Ian Goldberg for helping on this issue. Here is part of the
    thread solving this issue.
    
    http://lists.cypherpunks.ca/pipermail/otr-dev/2012-November/001506.html
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/otr.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/otr.c b/src/otr.c
index b47c9ae..3d04e0a 100644
--- a/src/otr.c
+++ b/src/otr.c
@@ -188,8 +188,11 @@ static int check_fp_encrypted_msgstate(Fingerprint *fp)
 	assert(fp);
 
 	/* Loop on all fingerprint's context(es). */
-	for (context = fp->context; context != NULL; context = context->next) {
-		if (context->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
+	for (context = fp->context;
+			context != NULL && context->m_context == fp->context;
+			context = context->next) {
+		if (context->msgstate == OTRL_MSGSTATE_ENCRYPTED &&
+				context->active_fingerprint == fp) {
 			ret = 1;
 			goto end;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git