summaryrefslogtreecommitdiff
path: root/src/mem/simple_dram.cc
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2012-11-02 11:50:16 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2012-11-02 11:50:16 -0500
commitce5766c409ca3e27e62a300b89511b9d0fcd6c18 (patch)
tree32ef02e398c9edec9ee0acb926d6fd925b3d069f /src/mem/simple_dram.cc
parent1dbf9bb4ca6cc3bee68713a28778c1bdfe222f75 (diff)
downloadgem5-ce5766c409ca3e27e62a300b89511b9d0fcd6c18.tar.xz
mem: fix use after free issue in memories until 4-phase work complete.
Diffstat (limited to 'src/mem/simple_dram.cc')
-rw-r--r--src/mem/simple_dram.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mem/simple_dram.cc b/src/mem/simple_dram.cc
index 42c97977a..3dc59e8e0 100644
--- a/src/mem/simple_dram.cc
+++ b/src/mem/simple_dram.cc
@@ -474,6 +474,13 @@ SimpleDRAM::printQs() const {
bool
SimpleDRAM::recvTimingReq(PacketPtr pkt)
{
+ /// @todo temporary hack to deal with memory corruption issues until
+ /// 4-phase transactions are complete
+ for (int x = 0; x < pendingDelete.size(); x++)
+ delete pendingDelete[x];
+ pendingDelete.clear();
+
+
// This is where we enter from the outside world
DPRINTF(DRAM, "Inside recvTimingReq: request %s addr %lld size %d\n",
pkt->cmdString(),pkt->getAddr(), pkt->getSize());
@@ -495,7 +502,7 @@ SimpleDRAM::recvTimingReq(PacketPtr pkt)
// simply drop inhibited packets for now
if (pkt->memInhibitAsserted()) {
DPRINTF(DRAM,"Inhibited packet -- Dropping it now\n");
- delete pkt;
+ pendingDelete.push_back(pkt);
return true;
}