Fix BEAM IPA analysis and errors.

Change-Id: I5b70acbb67581728e077816b822ecbbf6cbe07f6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9781
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C
index 28b6f4346..f36d167b3 100644
--- a/src/usr/mbox/mailboxsp.C
+++ b/src/usr/mbox/mailboxsp.C
@@ -904,12 +904,14 @@ void MailboxSp::recv_msg(mbox_msg_t & i_mbox_msg)
                 invalidMsgResponder(i_mbox_msg);
                 free(msg->extra_data); // toss this if it exists
                 msg->extra_data = NULL;
+                i_mbox_msg.msg_payload.extra_data = NULL;
             }
             msg_free(msg);
         }
         else // This is a bounce-back msg from the echo server - Ignore
         {
             free(msg->extra_data);
+            msg->extra_data = NULL;
             msg_free(msg);
         }
     }
@@ -1155,6 +1157,8 @@ errlHndl_t MailboxSp::send(queue_id_t i_q_id,
              0,                                      //
              true //Add HB Software Callout
             );
+
+        msg_free(msg);
     }
 
     return err;