summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2018-04-04 08:40:21 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2018-04-04 08:40:31 +0200
commit5070ca2111dd5b3f333a942059ef2c592de8dc24 (patch)
tree3d3076cbc571d2c210a9b0714ea13ed327d85786
parent8e0b80aa369df7d1142053f077df928106c6ce8c (diff)
downloadminetest-5070ca2111dd5b3f333a942059ef2c592de8dc24.tar.gz
minetest-5070ca2111dd5b3f333a942059ef2c592de8dc24.tar.bz2
minetest-5070ca2111dd5b3f333a942059ef2c592de8dc24.zip
Fix 5 issues reported by PVS studio
* src/sky.cpp 146 warn V519 The 'suncolor_f.r' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 142, 146. * src/sky.cpp 147 warn V519 The 'suncolor_f.g' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 143, 147. * src/sky.cpp 148 warn V519 The 'suncolor_f.b' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 144, 148. * src/threading/thread.cpp 63 err V730 Not all members of a class are initialized inside the constructor. Consider inspecting: m_thread_obj. * src/server.cpp 3243 err V595 The 'log' pointer was utilized before it was verified against nullptr. Check lines: 3243, 3258.
-rw-r--r--src/server.cpp3
-rw-r--r--src/sky.cpp6
-rw-r--r--src/threading/thread.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp
index e0a15ab87..5bdf22c7e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3237,7 +3237,8 @@ bool Server::rollbackRevertActions(const std::list<RollbackAction> &actions,
ServerMap *map = (ServerMap*)(&m_env->getMap());
// Fail if no actions to handle
- if(actions.empty()){
+ if (actions.empty()) {
+ assert(log);
log->push_back("Nothing to do.");
return false;
}
diff --git a/src/sky.cpp b/src/sky.cpp
index 03afc4464..e2f578cb6 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -141,9 +141,9 @@ void Sky::render()
suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7 + m_time_brightness * 0.5));
suncolor_f.b = MYMAX(0.0, m_brightness * 0.95);
video::SColorf suncolor2_f(1, 1, 1, 1);
- suncolor_f.r = 1;
- suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5));
- suncolor_f.b = MYMAX(0.0, m_brightness);
+ suncolor2_f.r = 1;
+ suncolor2_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5));
+ suncolor2_f.b = MYMAX(0.0, m_brightness);
float moonsize = 0.04;
video::SColorf mooncolor_f(0.50, 0.57, 0.65, 1);
diff --git a/src/threading/thread.h b/src/threading/thread.h
index dab5d0ec7..cea92226f 100644
--- a/src/threading/thread.h
+++ b/src/threading/thread.h
@@ -152,7 +152,7 @@ private:
std::mutex m_mutex;
std::mutex m_start_finished_mutex;
- std::thread *m_thread_obj;
+ std::thread *m_thread_obj = nullptr;
#ifdef _AIX