diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/mbox/mailboxsp.C | 4 | ||||
| -rw-r--r-- | src/usr/pnor/test/pnorrptest.H | 4 |
2 files changed, 6 insertions, 2 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; diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H index 32f3c1dc2..91aa4f209 100644 --- a/src/usr/pnor/test/pnorrptest.H +++ b/src/usr/pnor/test/pnorrptest.H @@ -297,7 +297,7 @@ class PnorRpTest : public CxxTest::TestSuite * @brief PNOR RP test - Read/Write Page * Use message interface to read and write individual pages */ - void test_messageReadWrite(void) + void _test_messageReadWrite(void) { return; //this fails with the new message ids TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> Start" ); @@ -429,7 +429,7 @@ class PnorRpTest : public CxxTest::TestSuite * @brief PNOR RP test - Read/Write Addresses * do read/modify/write/read to different virtual addresses */ - void test_AddrReadWrite(void) + void _test_AddrReadWrite(void) { // Leaving disabled because a regular boot tests all of this anyway, // but want to leave this here for possible future unit testing. |
