[pkg-otr-team] [irssi-plugin-otr] 82/167: * otr-plugin.c: In otrg_plugin_conv_to_selected_instag, ensure conv is not NULL before dereferencing.

[Holger Levsen]

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

holger pushed a commit to tag 4.0.0
in repository irssi-plugin-otr.

commit f32a2fdfcd0ea406e0bfe3cd5adbefa5f8107a9b
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Thu May 3 19:37:16 2012 -0400

    	* otr-plugin.c: In otrg_plugin_conv_to_selected_instag,
    	ensure conv is not NULL before dereferencing.
---
 otr-plugin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/otr-plugin.c b/otr-plugin.c
index 61e4f16..062e4d5 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -898,8 +898,8 @@ otrl_instag_t otrg_plugin_conv_to_selected_instag(PurpleConversation *conv,
 {
     otrl_instag_t selected_instance;
 
-    if (!g_hash_table_lookup_extended(conv->data, "otr-ui_selected_ctx", NULL,
-	    (void**)&selected_instance)) {
+    if (!conv || !g_hash_table_lookup_extended(conv->data,
+	    "otr-ui_selected_ctx", NULL, (void**)&selected_instance)) {
 	selected_instance = default_val;
     }
 

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