Commit 3af116f1 authored by unknown's avatar unknown

BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList


ndb/src/kernel/SimBlockList.cpp:
  NEW_BLOCK allocates the elements with new, we should free them with delete
  but only if we're not building with VM_TRACE
parent 00cfd1a7
...@@ -111,8 +111,12 @@ SimBlockList::unload(){ ...@@ -111,8 +111,12 @@ SimBlockList::unload(){
if(theList != 0){ if(theList != 0){
for(int i = 0; i<noOfBlocks; i++){ for(int i = 0; i<noOfBlocks; i++){
if(theList[i] != 0){ if(theList[i] != 0){
#ifdef VM_TRACE
theList[i]->~SimulatedBlock(); theList[i]->~SimulatedBlock();
free(theList[i]); free(theList[i]);
#else
delete(theList[i]);
#endif
theList[i] = 0; theList[i] = 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment