bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🐛 Use delete [] for new []

Browse Source
This commit is contained in:
Scott Lahteine 2021-08-10 02:39:50 -05:00
parent 0c0f84b659
commit eafd0ed765
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/sd/cardreader.cpp
View File

@ -1219,7 +1219,7 @@ void CardReader::cdroot() {
#if ENABLED(SDSORT_USES_RAM) && DISABLED(SDSORT_CACHE_NAMES) #if ENABLED(SDSORT_USES_RAM) && DISABLED(SDSORT_CACHE_NAMES)
#if ENABLED(SDSORT_DYNAMIC_RAM) #if ENABLED(SDSORT_DYNAMIC_RAM)
for (uint16_t i = 0; i < fileCnt; ++i) free(sortnames[i]); for (uint16_t i = 0; i < fileCnt; ++i) free(sortnames[i]);
TERN_(HAS_FOLDER_SORTING, free(isDir)); TERN_(HAS_FOLDER_SORTING, delete [] isDir);
#endif #endif
#endif #endif
} }
@ -1245,14 +1245,14 @@ void CardReader::cdroot() {
void CardReader::flush_presort() { void CardReader::flush_presort() {
if (sort_count > 0) { if (sort_count > 0) {
#if ENABLED(SDSORT_DYNAMIC_RAM) #if ENABLED(SDSORT_DYNAMIC_RAM)
delete sort_order; delete [] sort_order;
#if ENABLED(SDSORT_CACHE_NAMES) #if ENABLED(SDSORT_CACHE_NAMES)
LOOP_L_N(i, sort_count) { LOOP_L_N(i, sort_count) {
free(sortshort[i]); // strdup free(sortshort[i]); // strdup
free(sortnames[i]); // strdup free(sortnames[i]); // strdup
} }
delete sortshort; delete [] sortshort;
delete sortnames; delete [] sortnames;
#endif #endif
#endif #endif
sort_count = 0; sort_count = 0;