fix memory leak in cache manager (#677)

SynthstromAudible · Nov 3, 2023 · f668c34 · f668c34
1 parent 710cb29
commit f668c34
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/deluge/memory/cache_manager.cpp b/src/deluge/memory/cache_manager.cpp
@@ -48,6 +48,7 @@ uint32_t CacheManager::ReclaimMemory(MemoryRegion& region, int32_t totalSizeNeed
 		stealable = static_cast<Stealable*>(reclamation_queue_[q].getFirst());
 		while (stealable != nullptr) {
 			// If we've already looked at this one as part of a bigger run, move on
+			//this works because the uint cast makes negatives high numbers instead
 			uint32_t lastTraversalQueue = stealable->lastTraversalNo - traversalNumberBeforeQueues;
 			if (lastTraversalQueue <= q) {
 
@@ -61,6 +62,7 @@ uint32_t CacheManager::ReclaimMemory(MemoryRegion& region, int32_t totalSizeNeed
 			}
 
 			// If we're forbidden from stealing from a particular thing (usually SampleCache), then make sure we don't
+			// TODO: this should never happen
 			if (!stealable->mayBeStolen(thingNotToStealFrom)) {
 				numRefusedTheft++;
 
@@ -113,6 +115,8 @@ uint32_t CacheManager::ReclaimMemory(MemoryRegion& region, int32_t totalSizeNeed
 
 			// If that one Stealable alone was big enough, that's great
 			if (amountToExtend <= 0) {
+				//need to reset this since it's getting stolen
+				longestRunSeenInThisQueue = 0xFFFFFFFF;
 				found = true;
 				break;
 			}
@@ -136,6 +140,10 @@ uint32_t CacheManager::ReclaimMemory(MemoryRegion& region, int32_t totalSizeNeed
 				stealable = static_cast<Stealable*>(reclamation_queue_[q].getNext(stealable));
 				continue;
 			}
+			else {
+				//reset this since it's getting stolen
+				longestRunSeenInThisQueue = 0xFFFFFFFF;
+			}
 
 			newSpaceAddress = result.address;
 
@@ -146,8 +154,10 @@ uint32_t CacheManager::ReclaimMemory(MemoryRegion& region, int32_t totalSizeNeed
 			break;
 		}
 
-		// End of that particular queue - so go to the next one
 		longest_runs_[q] = longestRunSeenInThisQueue;
+
+		// End of that particular queue - so go to the next one
+
 		currentTraversalNo++;
 	}
 

diff --git a/src/deluge/model/mod_controllable/mod_controllable_audio.h b/src/deluge/model/mod_controllable/mod_controllable_audio.h
@@ -80,7 +80,7 @@ class ModControllableAudio : public ModControllable {
 	static bool readParamTagFromFile(char const* tagName, ParamManagerForTimeline* paramManager,
 	                                 int32_t readAutomationUpToPos);
 	static void initParams(ParamManager* paramManager);
-	void wontBeRenderedForAWhile();
+	virtual void wontBeRenderedForAWhile();
 	void endStutter(ParamManagerForTimeline* paramManager);
 	virtual bool setModFXType(ModFXType newType);
 	bool offerReceivedCCToLearnedParams(MIDIDevice* fromDevice, uint8_t channel, uint8_t ccNumber, uint8_t value,

diff --git a/src/deluge/model/song/song.cpp b/src/deluge/model/song/song.cpp
@@ -4006,7 +4006,7 @@ void Song::setHibernatingMIDIInstrument(MIDIInstrument* newInstrument) {
 void Song::deleteHibernatingMIDIInstrument() {
 	if (hibernatingMIDIInstrument) {
 		void* toDealloc = dynamic_cast<void*>(hibernatingMIDIInstrument);
-		hibernatingMIDIInstrument->~Instrument();
+		hibernatingMIDIInstrument->~MIDIInstrument();
 		delugeDealloc(toDealloc);
 		hibernatingMIDIInstrument = NULL;
 	}