Add check for unfinished format specifier.

cleolibrary · Nov 25, 2024 · 661361e · 661361e
1 parent 9f46ec7
commit 661361e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/source/CCustomOpcodeSystem.cpp b/source/CCustomOpcodeSystem.cpp
@@ -498,10 +498,19 @@ namespace CLEO
 
 				if (*iter == '%')
 				{
+					// end of format string
+					if (iter[1] == '\0')
+					{
+						LOG_WARNING(thread, "ReadFormattedString encountered incomplete format specifier in script %s", ((CCustomScript*)thread)->GetInfoStr().c_str());
+						SkipUnusedVarArgs(thread);
+						return -1; // error
+					}
+
+					// escaped % character
 					if (iter[1] == '%')
 					{
 						if (written++ >= len) goto _ReadFormattedString_OutOfMemory;
-						*outIter++ = '%'; /* "%%"->'%' */
+						*outIter++ = '%';
 						iter += 2;
 						continue;
 					}