Fix async in sync error when a VM calls Com_Error

Author: Kangz

src/common/IPC.h

@@ -547,10 +547,11 @@ class Channel {
 	Channel(Socket socket)
 		: socket(std::move(socket)), counter(0) {}
 	Channel(Channel&& other)
-		: socket(std::move(other.socket)) {}
+		: socket(std::move(other.socket)), handlingAsyncMsg(other.handlingAsyncMsg) {}
 	Channel& operator=(Channel&& other)
 	{
 		std::swap(socket, other.socket);
+		handlingAsyncMsg = other.handlingAsyncMsg;
 		return *this;
 	}
 	explicit operator bool() const

src/engine/client/cl_cgame.cpp

@@ -1564,7 +1564,10 @@ void CGameVM::CGameInit(int serverMessageNum, int serverCommandSequence, int cli
 
 void CGameVM::CGameShutdown()
 {
-	this->SendMsg<CGameShutdownMsg>();
+	if (!services->HasVMErrored()) {
+		this->SendMsg<CGameShutdownMsg>();
+	}
+	this->Free();
 	services = nullptr;
 }
 

src/engine/framework/CommonVMServices.cpp

@@ -222,6 +222,7 @@ namespace VM {
 
             case QVM_COMMON_ERROR:
                 IPC::HandleMsg<ErrorMsg>(channel, std::move(reader), [this](std::string text) {
+                    vmErrored = true;
                     Com_Error(ERR_DROP, "%s", text.c_str());
                 });
                 break;
@@ -353,7 +354,7 @@ namespace VM {
     // Misc, Dispatch
 
     CommonVMServices::CommonVMServices(VMBase& vm, Str::StringRef vmName, int commandFlag)
-    :vmName(vmName), vm(vm), commandFlag(commandFlag), commandProxy(new ProxyCmd(*this, commandFlag)) {
+    :vmName(vmName), vm(vm), vmErrored(false), commandProxy(new ProxyCmd(*this, commandFlag)) {
     }
 
     CommonVMServices::~CommonVMServices() {
@@ -389,6 +390,10 @@ namespace VM {
         }
     }
 
+    bool CommonVMServices::HasVMErrored() const {
+        return vmErrored;
+    }
+
     VMBase& CommonVMServices::GetVM() {
         return vm;
     }

src/engine/framework/CommonVMServices.h

@@ -44,9 +44,12 @@ namespace VM {
 
             void Syscall(int major, int minor, IPC::Reader reader, IPC::Channel& channel);
 
+            bool HasVMErrored() const;
+
         private:
             std::string vmName;
             VMBase& vm;
+            bool vmErrored;
 
             VMBase& GetVM();
 

src/engine/server/server.h

@@ -334,7 +334,7 @@ class GameVM: public VM::VMBase {
 
 	IPC::SharedMemory shmRegion;
 
-    VM::CommonVMServices services;
+	std::unique_ptr<VM::CommonVMServices> services;
 };
 
 //=============================================================================

src/engine/server/sv_game.cpp

@@ -437,16 +437,18 @@ qboolean SV_GetTag( int clientNum, int tagFileNumber, const char *tagname, orien
 #endif
 }
 
-GameVM::GameVM(): VM::VMBase("game"), services(*this, "Game", Cmd::GAME_VM)
-{
+GameVM::GameVM(): VM::VMBase("game"), services(nullptr){
 }
 
 void GameVM::Start()
 {
+	services = std::unique_ptr<VM::CommonVMServices>(new VM::CommonVMServices(*this, "Game", Cmd::GAME_VM));
+
 	uint32_t version = this->Create();
 	if ( version != GAME_API_VERSION ) {
 		Com_Error( ERR_DROP, "Game ABI mismatch, expected %d, got %d", GAME_API_VERSION, version );
 	}
+
 	this->GameStaticInit();
 }
 
@@ -462,8 +464,12 @@ void GameVM::GameInit(int levelTime, int randomSeed, qboolean restart)
 
 void GameVM::GameShutdown(qboolean restart)
 {
-	//TODO ignore errors
-	this->SendMsg<GameShutdownMsg>(restart);
+	if (!services->HasVMErrored()) {
+		this->SendMsg<GameShutdownMsg>(restart);
+	} else {
+		this->Free();
+		services = nullptr;
+	}
 
 	// Release the shared memory region
 	this->shmRegion.Close();
@@ -534,7 +540,7 @@ void GameVM::Syscall(uint32_t id, IPC::Reader reader, IPC::Channel& channel)
 		this->QVMSyscall(minor, reader, channel);
 
     } else if (major < VM::LAST_COMMON_SYSCALL) {
-        services.Syscall(major, minor, std::move(reader), channel);
+        services->Syscall(major, minor, std::move(reader), channel);
 
     } else {
 		Com_Error(ERR_DROP, "Bad major game syscall number: %d", major);