Fix linux flash-emulator

christoph2 · May 14, 2021 · 2a55942 · 2a55942
1 parent 88708e4
commit 2a55942
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/flsemu/posix/flsemu.c b/flsemu/posix/flsemu.c
@@ -66,7 +66,9 @@ void FlsEmu_Close(uint8_t segmentIdx)
     segment = FlsEmu_GetConfig()->segments[segmentIdx];
     FlsEmu_Flush(segmentIdx);
     FlsEmu_ClosePersitentArray(segment->persistentArray, segment->memSize);
-    free(segment->persistentArray);
+    if (segment->persistentArray) {
+        free(segment->persistentArray);
+    }
 }
 
 static bool FlsEmu_Flush(uint8_t segmentIdx)
@@ -106,9 +108,12 @@ static void FlsEmu_MapAddress(void * mappingAddress, int offset, uint32_t size,
 
 static void FlsEmu_UnmapAddress(void * addr, uint32_t size)
 {
+    // FIXME: munmap segfaults -- why?
+#if 0
     if (munmap(addr, size) == -1) {
         handle_error("munmap");
     }
+#endif
 }
 
 FlsEmu_OpenCreateResultType FlsEmu_OpenCreatePersitentArray(char const * fileName, uint32_t size, FlsEmu_PersistentArrayType * persistentArray)