[SAVEVERSION+] HostFS: Always write savestate tag

pcsx2/IopBios.cpp

@@ -1423,19 +1423,19 @@ namespace R3000A
 
 bool SaveStateBase::handleFreeze()
 {
-	if (!EmuConfig.HostFs) //if hostfs isn't enabled, skip loading/saving file handles
-		return IsOkay();
-
-	if (IsLoading())
-		R3000A::ioman::reset();
-
 	if (!FreezeTag("hostHandles"))
 		return false;
 
+	if (EmuConfig.HostFs && IsLoading())
+		R3000A::ioman::reset();
+
 	const int firstfd = R3000A::ioman::firstfd;
-	size_t handleCount = R3000A::handles.size();
+	size_t handleCount = EmuConfig.HostFs ? R3000A::handles.size() : 0;
 	Freeze(handleCount);
 
+	if (!EmuConfig.HostFs) //if hostfs isn't enabled, skip loading/saving file handles
+		return IsOkay();
+
 	for (size_t i = 0; i < handleCount; i++)
 	{
 		if (IsLoading())

pcsx2/SaveState.cpp

@@ -315,6 +315,9 @@ memLoadingState::memLoadingState(const VmStateBuffer& load_from)
 // Loading of state data from a memory buffer...
 void memLoadingState::FreezeMem( void* data, int size )
 {
+	if (m_idx + size > m_memory.size())
+		m_error = true;
+
 	if (m_error)
 	{
 		std::memset(data, 0, size);

pcsx2/SaveState.h

@@ -25,7 +25,7 @@ enum class FreezeAction
 // [SAVEVERSION+]
 // This informs the auto updater that the users savestates will be invalidated.
 
-static const u32 g_SaveVersion = (0x9A50 << 16) | 0x0000;
+static const u32 g_SaveVersion = (0x9A51 << 16) | 0x0000;
 
 
 // the freezing data between submodules and core