Merge pull request #18797 from hrydgard/more-fixes

Fix some really obscure crashes
hrydgard · Jan 30, 2024 · d7a250d · d7a250d
2 parents cfadc39 + fae1f4a
commit d7a250d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/Core/ELF/ElfReader.cpp b/Core/ELF/ElfReader.cpp
@@ -533,17 +533,19 @@ int ElfReader::LoadInto(u32 loadAddress, bool fromTop)
 			u32 srcSize = p->p_filesz;
 			u32 dstSize = p->p_memsz;
 			u8 *dst = Memory::GetPointerWriteRange(writeAddr, dstSize);
+			if (dst) {
+				if (srcSize < dstSize) {
+					memset(dst + srcSize, 0, dstSize - srcSize); //zero out bss
+					NotifyMemInfo(MemBlockFlags::WRITE, writeAddr + srcSize, dstSize - srcSize, "ELFZero");
+				}
 
-			if (srcSize < dstSize)
-			{
-				memset(dst + srcSize, 0, dstSize - srcSize); //zero out bss
-				NotifyMemInfo(MemBlockFlags::WRITE, writeAddr + srcSize, dstSize - srcSize, "ELFZero");
+				memcpy(dst, src, srcSize);
+				std::string tag = StringFromFormat("ELFLoad/%08x", writeAddr);
+				NotifyMemInfo(MemBlockFlags::WRITE, writeAddr, srcSize, tag.c_str(), tag.size());
+				DEBUG_LOG(LOADER, "Loadable Segment Copied to %08x, size %08x", writeAddr, (u32)p->p_memsz);
+			} else {
+				ERROR_LOG(LOADER, "Bad ELF segment. Trying to write %d bytes to %08x", dstSize, writeAddr);
 			}
-
-			memcpy(dst, src, srcSize);
-			std::string tag = StringFromFormat("ELFLoad/%08x", writeAddr);
-			NotifyMemInfo(MemBlockFlags::WRITE, writeAddr, srcSize, tag.c_str(), tag.size());
-			DEBUG_LOG(LOADER,"Loadable Segment Copied to %08x, size %08x", writeAddr, (u32)p->p_memsz);
 		}
 	}
 	memblock.ListBlocks();

diff --git a/Core/HW/Display.cpp b/Core/HW/Display.cpp
@@ -243,12 +243,12 @@ void DisplayFireVblankStart() {
 }
 
 void DisplayFireVblankEnd() {
-	std::vector<VblankCallback> toCall = [] {
-		std::lock_guard<std::mutex> guard(listenersLock);
-		return vblankListeners;
-	}();
-
 	isVblank = 0;
+	std::vector<VblankCallback> toCall;
+	{
+		std::lock_guard<std::mutex> guard(listenersLock);
+		toCall = vblankListeners;
+	}
 
 	for (VblankCallback cb : toCall) {
 		cb();

diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
@@ -80,7 +80,9 @@ void GameScreen::update() {
 			CRC32string = int2hexstr(crcvalue);
 			tvCRC_->SetVisibility(UI::V_VISIBLE);
 			tvCRC_->SetText(CRC32string);
-			btnCalcCRC_->SetVisibility(UI::V_GONE);
+			if (btnCalcCRC_) {
+				btnCalcCRC_->SetVisibility(UI::V_GONE);
+			}
 		}
 	}
 }
@@ -433,7 +435,9 @@ UI::EventReturn GameScreen::OnCwCheat(UI::EventParams &e) {
 UI::EventReturn GameScreen::OnDoCRC32(UI::EventParams& e) {
 	CRC32string = "...";
 	Reporting::QueueCRC(gamePath_);
-	btnCalcCRC_->SetEnabled(false);
+	if (btnCalcCRC_) {
+		btnCalcCRC_->SetEnabled(false);
+	}
 	return UI::EVENT_DONE;
 }
 

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -1217,11 +1217,11 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 	systemSettings->Add(new PopupTextInputChoice(GetRequesterToken(), &g_Config.sNickName, sy->T("Change Nickname"), "", 32, screenManager()));
 	systemSettings->Add(new CheckBox(&g_Config.bDayLightSavings, sy->T("Day Light Saving")));
 	static const char *dateFormat[] = { "YYYYMMDD", "MMDDYYYY", "DDMMYYYY" };
-	systemSettings->Add(new PopupMultiChoice(&g_Config.iDateFormat, sy->T("Date Format"), dateFormat, 0, 3, I18NCat::SYSTEM, screenManager()));
+	systemSettings->Add(new PopupMultiChoice(&g_Config.iDateFormat, sy->T("Date Format"), dateFormat, 0, ARRAY_SIZE(dateFormat), I18NCat::SYSTEM, screenManager()));
 	static const char *timeFormat[] = { "24HR", "12HR" };
-	systemSettings->Add(new PopupMultiChoice(&g_Config.iTimeFormat, sy->T("Time Format"), timeFormat, 0, 2, I18NCat::SYSTEM, screenManager()));
+	systemSettings->Add(new PopupMultiChoice(&g_Config.iTimeFormat, sy->T("Time Format"), timeFormat, 0, ARRAY_SIZE(timeFormat), I18NCat::SYSTEM, screenManager()));
 	static const char *buttonPref[] = { "Use O to confirm", "Use X to confirm" };
-	systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, sy->T("Confirmation Button"), buttonPref, 0, 2, I18NCat::SYSTEM, screenManager()));
+	systemSettings->Add(new PopupMultiChoice(&g_Config.iButtonPreference, sy->T("Confirmation Button"), buttonPref, 0, ARRAY_SIZE(buttonPref), I18NCat::SYSTEM, screenManager()));
 
 	systemSettings->Add(new ItemHeader(sy->T("Recording")));
 #if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE))