Fix for crash involving not checking for a null return

fredcooke · Feb 13, 2014 · 14dbb3d · 14dbb3d
1 parent 3fb7c24
commit 14dbb3d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/plugins/freeems/freeemscomms.cpp b/plugins/freeems/freeemscomms.cpp
@@ -603,16 +603,19 @@ int FreeEmsComms::retrieveBlockFromFlash(unsigned short location, unsigned short
 	//emsData.getLocalRamBlockInfo(location)->size;
 	//emsData.getLocalRamBlockInfo(location)->ramAddress;
 
-	for (int i=emsData.getLocalRamBlockInfo(location)->ramAddress + offset;i<emsData.getLocalRamBlockInfo(location)->ramAddress+offset+size;i++)
+	if (emsData.getLocalRamBlockInfo(location))
 	{
-		if (m_dirtyRamAddresses.contains(i))
+		for (int i=emsData.getLocalRamBlockInfo(location)->ramAddress + offset;i<emsData.getLocalRamBlockInfo(location)->ramAddress+offset+size;i++)
 		{
-			m_dirtyRamAddresses.removeOne(i);
+			if (m_dirtyRamAddresses.contains(i))
+			{
+				m_dirtyRamAddresses.removeOne(i);
+			}
+		}
+		if (m_dirtyRamAddresses.size() == 0)
+		{
+			emit memoryClean();
 		}
-	}
-	if (m_dirtyRamAddresses.size() == 0)
-	{
-		emit memoryClean();
 	}
 	return m_sequenceNumber-1;
 }