From Tyson Key:

[obnox/wireshark/wip.git] / tap-megaco-common.c

diff --git a/tap-megaco-common.c b/tap-megaco-common.c
index 55bc5338ab83e1a4fa8225c08a987b0bb73aa9ae..03ffeb7660895eb6fabac2759d711129b4ca88fe 100644 (file)
--- a/tap-megaco-common.c
+++ b/tap-megaco-common.c
@@ -42,7 +42,6 @@
 #include "epan/gcp.h"
 
 #include "../timestats.h"
-#include "../simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
@@ -58,8 +57,9 @@ megacostat_is_duplicate_reply(const gcp_cmd_t* cmd)
                {
                        gcp_cmd_msg_t *cmd_msg;
                        /* cycle through commands to find same command in the transaction */
-                       for (cmd_msg = cmd->trx->cmds; cmd_msg->cmd->msg->framenum != cmd->msg->framenum &&
-                                       cmd_msg != NULL; cmd_msg = cmd_msg->next) {
+                       for (cmd_msg = cmd->trx->cmds;
+                            (cmd_msg != NULL) && (cmd_msg->cmd->msg->framenum != cmd->msg->framenum);
+                            cmd_msg = cmd_msg->next) {
                                if (cmd_msg->cmd->type == cmd->type)
                                        return TRUE;
                        }
@@ -84,8 +84,9 @@ megacostat_had_request(const gcp_cmd_t* cmd)
                {
                        gcp_cmd_msg_t *cmd_msg;
                        /* cycle through commands to find a request in the transaction */
-                       for (cmd_msg = cmd->trx->cmds; cmd_msg->cmd->msg->framenum != cmd->msg->framenum &&
-                                       cmd_msg != NULL; cmd_msg = cmd_msg->next) {
+                       for (cmd_msg = cmd->trx->cmds;
+                            (cmd_msg != NULL) && (cmd_msg->cmd->msg->framenum != cmd->msg->framenum);
+                            cmd_msg = cmd_msg->next) {
 
                                switch (cmd_msg->cmd->type) {