Log #836 and crash on it explicitly

beyond-all-reason · Jun 4, 2023 · fb68676 · fb68676
1 parent 85a97dd
commit fb68676
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/rts/System/LoadSave/DemoRecorder.cpp b/rts/System/LoadSave/DemoRecorder.cpp
@@ -106,10 +106,15 @@ void CDemoRecorder::WriteDemoFile()
 void CDemoRecorder::WriteSetupText(const std::string& text)
 {
 	int length = text.length();
-	while (text[length - 1] == '\0') {
+	while (length > 0 && text[length - 1] == '\0') {
 		--length;
 	}
 
+	if (length <= 0) {
+		LOG_L(L_ERROR, "[CDemoRecorder::%s] Invalid game setup text (len %d):\n%s", __func__, static_cast<int32_t>(text.length()), text.c_str());
+		throw std::runtime_error("Invalid game setup text");
+	}
+
 	fileHeader.scriptSize = length;
 	demoStreams[isServerDemo].append(text.c_str(), length);
 }