Make sure we initialize our iap_conv struct _before_ we go digging

into a tvbuff.  This keeps us from leaving junk data behind if we
throw an exception.

svn path=/trunk/; revision=15267

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index bf30492fbb..e58d818498 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -592,15 +592,15 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r
                 char    attr_name[256];
 
 
+                iap_conv->pnext           = NULL;
+                iap_conv->iap_query_frame = pinfo->fd->num;
+                iap_conv->pattr_dissector = NULL;
+
                 tvb_memcpy(tvb, class_name, offset + 1 + 1, clen);
                 class_name[clen] = 0;
                 tvb_memcpy(tvb, attr_name, offset + 1 + 1 + clen + 1, alen);
                 attr_name[alen] = 0;
 
-                iap_conv->pnext           = NULL;
-                iap_conv->iap_query_frame = pinfo->fd->num;
-                iap_conv->pattr_dissector = NULL;
-
                 /* Find the attribute dissector */
                 for (i = 0; class_dissector[i].class_name != NULL; i++)
                     if (strcmp(class_name, class_dissector[i].class_name) == 0)