From b8c29ae957688ad8b0aadbb8f0ce2ea8a8ec18b1 Mon Sep 17 00:00:00 2001
From: Robbie <pirhomanic@gmail.com>
Date: Mon, 30 Oct 2017 14:13:06 -0500
Subject: [PATCH] Make it so that TROPUSR doesn't crash on "bad" imput.

---
 rpcs3/Loader/TROPUSR.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp
index 0b2d87bc43..f4022b3aab 100644
--- a/rpcs3/Loader/TROPUSR.cpp
+++ b/rpcs3/Loader/TROPUSR.cpp
@@ -207,6 +207,7 @@ u32 TROPUSRLoader::GetTrophyUnlockState(u32 id)
 	if (id >= m_table6.size())
 	{
 		LOG_WARNING(LOADER, "TROPUSRLoader::GetUnlockState: Invalid id=%d", id);
+		return 0;
 	}
 
 	return m_table6[id].trophy_state; // Let's assume the trophies are stored ordered
@@ -217,6 +218,7 @@ u64 TROPUSRLoader::GetTrophyTimestamp(u32 id)
 	if (id >= m_table6.size())
 	{
 		LOG_WARNING(LOADER, "TROPUSRLoader::GetTrophyTimestamp: Invalid id=%d", id);
+		return 0;
 	}
 
 	// TODO: What timestamp does sceNpTrophyGetTrophyInfo want, timestamp1 or timestamp2?