Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fixed memory leak (missing deletes before return)

Browse source 
Signed-off-by: Pascal Bauer <pascal.bauer@rwth-aachen.de>
This commit is contained in:
Pascal Bauer 2022-12-09 12:43:49 +01:00 • committed by Niklas Eiling
parent 6a8acc467b
commit a2b8b2942e
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fpga/lib/ips/emc.cpp
View file

@ -118,8 +118,10 @@ EMC::flash(uint32_t offset, uint32_t length, uint8_t *data)
/* Reset the Flash Device. This clears the ret registers and puts
* the device in Read mode. */
ret = XFlash_Reset(&xflash);
if (ret != XST_SUCCESS)
if (ret != XST_SUCCESS){
delete[] verify_data;
return false;
}
/* Perform an unlock operation before the erase operation for the Intel
* Flash. The erase operation will result in an error if the block is
@ -128,30 +130,39 @@ EMC::flash(uint32_t offset, uint32_t length, uint8_t *data)
(xflash.CommandSet == XFL_CMDSET_INTEL_EXTENDED) ||
(xflash.CommandSet == XFL_CMDSET_INTEL_G18)) {
ret = XFlash_Unlock(&xflash, offset, 0);
if(ret != XST_SUCCESS)
if(ret != XST_SUCCESS){
delete[] verify_data;
return false;
}
}
// Perform the Erase operation.
ret = XFlash_Erase(&xflash, start, length);
if (ret != XST_SUCCESS)
if (ret != XST_SUCCESS){
delete[] verify_data;
return false;
}
// Perform the Write operation.
ret = XFlash_Write(&xflash, start, length, data);
if (ret != XST_SUCCESS)
if (ret != XST_SUCCESS){
delete[] verify_data;
return false;
}
// Perform the read operation.
ret = XFlash_Read(&xflash, start, length, verify_data);
if(ret != XST_SUCCESS) {
delete[] verify_data;
return false;
}
// Compare the data read against the data Written.
for (unsigned i = 0; i < length; i++) {
if (verify_data[i] != data[i])
if (verify_data[i] != data[i]){
delete[] verify_data;
return false;
}
}
delete[] verify_data;