[Scummvm-git-logs] scummvm master -> 25934139336657317d5d9867887a11fe57f12c1e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2593413933 DIRECTOR: LINGO: Improve `chars` implementation


Commit: 25934139336657317d5d9867887a11fe57f12c1e
    https://github.com/scummvm/scummvm/commit/25934139336657317d5d9867887a11fe57f12c1e
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-04-19T17:47:32+02:00

Commit Message:
DIRECTOR: LINGO: Improve `chars` implementation

Improvements to chars implementation:
- handle pass by reference next to pass in of string
    Makes the D4 dictionary movie `chars` not exit with a segfault.
- handle when from_id is larger than to_id and return an empty string.

The lingo function chars(string, from_id, to_id) returns the
from_id'th char till and including the to_id'th char of the string, 1 indexed.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index ac7407735d..55a7b934fc 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -455,6 +455,9 @@ void LB::b_chars(int nargs) {
 	Datum from = g_lingo->pop();
 	Datum s = g_lingo->pop();
 
+	if (s.type == REFERENCE)
+		s.makeString();
+
 	TYPECHECK(s, STRING);
 
 	to.makeInt();
@@ -464,13 +467,17 @@ void LB::b_chars(int nargs) {
 	int f = MAX(0, MIN(len, from.u.i - 1));
 	int t = MAX(0, MIN(len, to.u.i));
 
-	Common::String *res = new Common::String(&(s.u.s->c_str()[f]), &(s.u.s->c_str()[t]));
-
-	delete s.u.s;
+	Common::String *res;
+	if (f > t) {
+		res = new Common::String("");
+	} else {
+		res = new Common::String(&(s.u.s->c_str()[f]), &(s.u.s->c_str()[t]));
+	}
 
-	s.u.s = res;
-	s.type = STRING;
-	g_lingo->push(s);
+	Datum ret;
+	ret.type = STRING;
+	ret.u.s = res;
+	g_lingo->push(ret);
 }
 
 void LB::b_charToNum(int nargs) {