From ad54a9b83f416d6bbd84eaaec55bf1e6f56308b1 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 18 Feb 2014 17:12:48 +0100 Subject: [PATCH] Change new constants in txdb.h to int64_t A shift overflow was happening when using these to check against in init.cpp. Fixes #3702. --- src/qt/optionsmodel.cpp | 2 +- src/txdb.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 1a460b927..3b83a5ff6 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -85,7 +85,7 @@ void OptionsModel::Init() #endif if (!settings.contains("nDatabaseCache")) - settings.setValue("nDatabaseCache", nDefaultDbCache); + settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache); if (!SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString())) strOverriddenByCommandLine += "-dbcache "; diff --git a/src/txdb.h b/src/txdb.h index 0512396e9..5eb5731db 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -19,11 +19,11 @@ class CCoins; class uint256; // -dbcache default (MiB) -static const int nDefaultDbCache = 100; +static const int64_t nDefaultDbCache = 100; // max. -dbcache in (MiB) -static const int nMaxDbCache = sizeof(void*) > 4 ? 4096 : 1024; +static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 4096 : 1024; // min. -dbcache in (MiB) -static const int nMinDbCache = 4; +static const int64_t nMinDbCache = 4; /** CCoinsView backed by the LevelDB coin database (chainstate/) */ class CCoinsViewDB : public CCoinsView