Merge pull request #6386 from MjnMixael/fix_skip_to_string

TRBlount · web-flow · commit 91a2291c03eb · 2024-10-20T10:36:57.000-07:00
Return false if skip to string can't find the string
diff --git a/code/scripting/api/libs/parse.cpp b/code/scripting/api/libs/parse.cpp
@@ -95,13 +95,17 @@ ADE_FUNC(skipToString, l_Parsing, "string token", "Search for specified string,
 	}
 
 	try {
-		skip_to_string(str);
+		int found = skip_to_string(str);
+
+		if (found == 1) {
+			return ADE_RETURN_TRUE;
+		} else {
+			return ADE_RETURN_FALSE;
+		}
 	} catch (const parse::ParseException& e) {
 		mprintf(("PARSE: Error while parsing: %s\n", e.what()));
 		return ADE_RETURN_FALSE;
 	}
-
-	return ADE_RETURN_TRUE;
 }
 
 ADE_FUNC(requiredString, l_Parsing, "string token", "Require that a string appears at the current position.", "boolean",

Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,17 @@ ADE_FUNC(skipToString, l_Parsing, "string token", "Search for specified string,`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`try {`
`98`		`- skip_to_string(str);`
	`98`	`+ int found = skip_to_string(str);`
	`99`	`+`
	`100`	`+ if (found == 1) {`
	`101`	`+ return ADE_RETURN_TRUE;`
	`102`	`+ } else {`
	`103`	`+ return ADE_RETURN_FALSE;`
	`104`	`+ }`
`99`	`105`	`} catch (const parse::ParseException& e) {`
`100`	`106`	`mprintf(("PARSE: Error while parsing: %s\n", e.what()));`
`101`	`107`	`return ADE_RETURN_FALSE;`
`102`	`108`	`}`
`103`		`-`
`104`		`- return ADE_RETURN_TRUE;`
`105`	`109`	`}`
`106`	`110`
`107`	`111`	`ADE_FUNC(requiredString, l_Parsing, "string token", "Require that a string appears at the current position.", "boolean",`