mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent integer overflow in interest calculation (#5724) 

Fixes #5635
This commit is contained in:
Tomas Dittmann 2017-07-06 00:30:10 +02:00 committed by Michał Janiszewski
parent 14d14de911
commit 446796db4b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/management/finance.c
View File

@ -125,17 +125,18 @@ void finance_pay_research()
*/
void finance_pay_interest()
{
money32 current_loan = gBankLoan;
uint8 current_interest = gBankLoanInterestRate;
// This variable uses the 64-bit type as the line below can involve multiplying very large numbers
// that will overflow money32 (e.g. in the Alton Towers RCT1 scenario)
money64 tempcost = (current_loan * 5 * current_interest) >> 14; // (5 * interest) / 2^14 is pretty close to
// This variable uses the 64-bit type as the computation below can involve multiplying very large numbers
// that will overflow money32 if the loan is greater than (1 << 31) / (5 * current_interest_rate)
money64 current_loan = gBankLoan;
uint8 current_interest_rate = gBankLoanInterestRate;
money32 interest_to_pay;
if (gParkFlags & PARK_FLAGS_NO_MONEY)
return;
finance_payment(tempcost, RCT_EXPENDITURE_TYPE_INTEREST);
interest_to_pay = (current_loan * 5 * current_interest_rate) >> 14;
finance_payment(interest_to_pay, RCT_EXPENDITURE_TYPE_INTEREST);
}
/**

2
src/openrct2/network/network.h
View File

@ -55,7 +55,7 @@ extern "C" {
// This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "25"
#define NETWORK_STREAM_VERSION "26"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus