Merge pull request #3205 from SillyTavern/forbid-empty-varnames Do not allow empty or undefined variable names.

f3c12fb926207116465095b1610f828a0ff548e8

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/macros.js+4 -0 Viewed

@@ -516,7 +516,11 @@ export function evaluateMacros(content, env, postProcessFn) {
516	516	break;
517	517	}
518	518
	519	+ try {
519	520	content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));
	521	+ } catch (e) {
	522	+ console.warn(`Macro content can't be replaced: ${macro.regex} in ${content}`, e);
	523	+ }
520	524	}
521	525
522	526	return content;

public/scripts/variables.js+8 -0 Viewed

@@ -46,6 +46,10 @@ function getLocalVariable(name, args = {}) {
46	46	}
47	47
48	48	function setLocalVariable(name, value, args = {}) {
	49	+ if (!name) {
	50	+ throw new Error('Variable name cannot be empty or undefined.');
	51	+ }
	52	+
49	53	if (!chat_metadata.variables) {
50	54	chat_metadata.variables = {};
51	55	}

+}
 function setGlobalVariable(name, value, args = {}) {
 +    if (!name) {
 +        throw new Error('Variable name cannot be empty or undefined.');
 +    }
++
     if (args.index !== undefined) {
         try {
             let globalVariable = JSON.parse(extension_settings.variables.global[name] ?? 'null');