From Graeme Lunt

[obnox/wireshark/wip.git] / epan / dissectors / packet-smb-pipe.c

diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 4032785262cc4c60c209c676e8272f38ecab916f..e1276d648204c6e360e00fee7d0df5cc89912c70 100644 (file)
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -42,7 +42,8 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include "smb.h"
+#include <epan/emem.h>
+#include <epan/dissectors/packet-smb.h>
 #include "packet-smb-pipe.h"
 #include "packet-smb-browse.h"
 #include "packet-smb-common.h"
@@ -2693,7 +2694,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
                        /*
                         * Save the parameter descriptor for future use.
                         */
-                       g_assert(trp->param_descrip == NULL);
+                       DISSECTOR_ASSERT(trp->param_descrip == NULL);
                        trp->param_descrip = g_strdup(param_descrip);
                }
                offset += descriptor_len;
@@ -2707,7 +2708,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
                        /*
                         * Save the return descriptor for future use.
                         */
-                       g_assert(trp->data_descrip == NULL);
+                       DISSECTOR_ASSERT(trp->data_descrip == NULL);
                        trp->data_descrip = g_strdup(data_descrip);
                }
                offset += descriptor_len;
@@ -2734,7 +2735,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
                                 * Save the auxiliary data descriptor for
                                 * future use.
                                 */
-                               g_assert(trp->aux_data_descrip == NULL);
+                               DISSECTOR_ASSERT(trp->aux_data_descrip == NULL);
                                trp->aux_data_descrip =
                                    g_strdup(aux_data_descrip);
                        }
@@ -3263,6 +3264,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
        guint32 hash_key;
        fragment_data *fd_head;
        tvbuff_t *new_tvb;
+    proto_item *frag_tree_item;
 
        pinfo->dcetransportsalt = fid;
 
@@ -3398,7 +3400,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
 
                        /* list what segments we have */
                        show_fragment_tree(fd_head, &smb_pipe_frag_items,
-                           tree, pinfo, d_tvb);
+                           tree, pinfo, d_tvb, &frag_tree_item);
 
                        /* dissect the full PDU */
                        result = dissector_try_heuristic(smb_transact_heur_subdissector_list, d_tvb, pinfo, parent_tree);
@@ -3449,7 +3451,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree
 
        /* list what segments we have */
        show_fragment_tree(fd_head, &smb_pipe_frag_items,
-                   tree, pinfo, d_tvb);
+                   tree, pinfo, d_tvb, &frag_tree_item);
 
        /* dissect the full PDU */
        result = dissector_try_heuristic(smb_transact_heur_subdissector_list, d_tvb, pinfo, parent_tree);