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 ad59b54d9918172bbda975aeda461489c998c98f..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);
                        }