aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2008-05-02 19:03:00 +0000
committerBill Meier <wmeier@newsguy.com>2008-05-02 19:03:00 +0000
commita8cb768921f3fc71afe8634427ad7a6ee8fdc533 (patch)
treeb5f42709e995353db67db70765b01abe8b7445d5
parentc7640c39a584d73aa009741f7a045ba7a533a5b9 (diff)
Fix crash in Bug #2410: restore saved 'packet_info.private_data' for two fail returns
svn path=/trunk/; revision=25218
-rw-r--r--epan/dissectors/packet-kerberos.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index f20898c4cf..3b7b2da063 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -4503,6 +4503,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag);
if(tmp_class!=BER_CLASS_APP){
+ pinfo->private_data=saved_private_data;
return 0;
}
switch(tmp_tag){
@@ -4525,6 +4526,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case KRB5_MSG_ERROR:
break;
default:
+ pinfo->private_data=saved_private_data;
return 0;
}
if (do_col_protocol) {