From b2f9b5614a47b89801b57a0b6e1a5344c166fbda Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Fri, 13 Apr 2012 12:53:47 +0000
Subject: [PATCH] From Cristian Constantin: There was something really wrong in
 conversation_lookup_hashtable().

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7066

svn path=/trunk/; revision=42044
---
 epan/conversation.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epan/conversation.c b/epan/conversation.c
index 125ed1f724..07e5be38d8 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -697,8 +697,8 @@ conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, co
 		match = NULL;
 
 	if (match) {
-		if(match->last->setup_frame<=frame_num)
-			return match;
+		if((match->last)&&(match->last->setup_frame<=frame_num))
+			return match->last;
 		for (conversation = match->next; conversation; conversation = conversation->next) {
 			if ((conversation->setup_frame <= frame_num)
 				&& (conversation->setup_frame > match->setup_frame)) {