[Scummvm-git-logs] scummvm master -> 931e3d82d6ee780065b60bdeb0f2399683db47d0

[djsrv]

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

Summary:
74ef6b8c68 DIRECTOR: LINGO: Fix comparison with empty string
931e3d82d6 DIRECTOR: LINGO: Fix copy/paste error


Commit: 74ef6b8c68167f2dae4668438fba95d54fe8ed05
    https://github.com/scummvm/scummvm/commit/74ef6b8c68167f2dae4668438fba95d54fe8ed05
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-31T23:44:56-04:00

Commit Message:
DIRECTOR: LINGO: Fix comparison with empty string

It was being cast to a float.

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index e9918d5af1..2a47f1f2c5 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -671,18 +671,22 @@ int Lingo::getAlignedType(const Datum &d1, const Datum &d2) {
 
 	if (d1Type == STRING || d1Type == FIELDREF) {
 		Common::String src = d1.asString();
-		char *endPtr = 0;
-		strtod(src.c_str(), &endPtr);
-		if (*endPtr == 0) {
-			d1Type = FLOAT;
+		if (!src.empty()) {
+			char *endPtr = 0;
+			strtod(src.c_str(), &endPtr);
+			if (*endPtr == 0) {
+				d1Type = FLOAT;
+			}
 		}
 	}
 	if (d2Type == STRING || d2Type == FIELDREF) {
 		Common::String src = d1.asString();
-		char *endPtr = 0;
-		strtod(src.c_str(), &endPtr);
-		if (*endPtr == 0) {
-			d2Type = FLOAT;
+		if (!src.empty()) {
+			char *endPtr = 0;
+			strtod(src.c_str(), &endPtr);
+			if (*endPtr == 0) {
+				d2Type = FLOAT;
+			}
 		}
 	}
 


Commit: 931e3d82d6ee780065b60bdeb0f2399683db47d0
    https://github.com/scummvm/scummvm/commit/931e3d82d6ee780065b60bdeb0f2399683db47d0
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-31T23:44:56-04:00

Commit Message:
DIRECTOR: LINGO: Fix copy/paste error

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 2a47f1f2c5..3a218b0f33 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -680,7 +680,7 @@ int Lingo::getAlignedType(const Datum &d1, const Datum &d2) {
 		}
 	}
 	if (d2Type == STRING || d2Type == FIELDREF) {
-		Common::String src = d1.asString();
+		Common::String src = d2.asString();
 		if (!src.empty()) {
 			char *endPtr = 0;
 			strtod(src.c_str(), &endPtr);