[Scummvm-git-logs] scummvm master -> 121cb51ab713a6b46630adf7ec54f403d1892734

rvanlaar noreply at scummvm.org
Fri Oct 7 15:44:39 UTC 2022


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:
121cb51ab7 DIRECTOR: LINGO: fix divide by zero


Commit: 121cb51ab713a6b46630adf7ec54f403d1892734
    https://github.com/scummvm/scummvm/commit/121cb51ab713a6b46630adf7ec54f403d1892734
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-07T17:44:17+02:00

Commit Message:
DIRECTOR: LINGO: fix divide by zero

Set `fps` in `b_framesToHMS` to be at least one.
Tested in D3 and D4 on mac.

Fixes COVERITY: 1461266

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 a72cfb618c6..0d3c2a27b62 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1445,8 +1445,7 @@ void LB::b_framesToHMS(int nargs) {
 	int fps = g_lingo->pop().asInt();
 	int frames = g_lingo->pop().asInt();
 
-	if (fps <= 0)
-		fps = -fps;
+	fps = MAX(1, fps);
 
 	bool negative = frames < 0;
 	if (negative)




More information about the Scummvm-git-logs mailing list