Some fixes

graphitemaster · Dec 15, 2016 · 485976e · 485976e
1 parent 38fb290
commit 485976e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/r_model.cpp b/r_model.cpp
@@ -499,6 +499,7 @@ model::model()
     : m_geomMethods(&geomMethods::instance())
     , m_indices(0)
     , m_half(false)
+    , m_stats(nullptr)
 {
 }
 

diff --git a/r_world.cpp b/r_world.cpp
@@ -300,9 +300,11 @@ bool World::PointLightChunk::buildMesh(kdMap *map) {
 
 ///! modelChunk
 World::ModelChunk::ModelChunk()
-    : collect(false)
+    : frame(0.0f)
+    , collect(false)
     , highlight(false)
     , visible(false)
+    , model(nullptr)
 {
 }
 
@@ -432,8 +434,10 @@ ColorGrader *World::getColorGrader() {
 ///! world
 World::World()
     : m_geomMethods(&geomMethods::instance())
+    , m_gun(nullptr)
     , m_kdWorld(nullptr)
     , m_uploaded(false)
+    , m_stats(nullptr)
 {
 }
 

diff --git a/s_memory.cpp b/s_memory.cpp
@@ -57,8 +57,8 @@ U_MALLOC_LIKE void *Memory::reallocate(void *old, size_t resize) {
 }
 
 void Memory::free(void *old) {
-    neoFree(old);
     del(old);
+    neoFree(old);
 }
 
 void Memory::maybeRehash() {

diff --git a/u_buffer.h b/u_buffer.h
@@ -294,8 +294,8 @@ inline void buffer<T>::swap(buffer<T> &other) {
 template <typename T>
 inline void buffer<T>::shrink_to_fit() {
     if (last == first) {
-        neoFree(first);
         capacity = first;
+        neoFree(first);
     } else if (capacity != last) {
         const size_t size = size_t(last - first);
         T *resize = (T*)neoMalloc(sizeof *resize * size);

diff --git a/u_log.cpp b/u_log.cpp
@@ -13,7 +13,10 @@ Logger Log::err(stderr);
 Logger Log::out(stdout);
 #endif
 
-Logger::Logger(FILE *fp) {
+Logger::Logger(FILE *fp)
+    : m_mutex(nullptr)
+    , m_file(nullptr)
+{
     // prevent concurrent initialization
     if (SDL_AtomicAdd(&m_init, 1) != 0) return;
     m_mutex = (void *)SDL_CreateMutex();
@@ -24,7 +27,10 @@ Logger::Logger(FILE *fp) {
     setvbuf(m_file, nullptr, _IONBF, 0);
 }
 
-Logger::Logger(const char *file) {
+Logger::Logger(const char *file)
+    : m_mutex(nullptr)
+    , m_file(nullptr)
+{
     // prevent concurrent initialization
     if (SDL_AtomicAdd(&m_init, 1) != 0) return;
     m_mutex = (void *)SDL_CreateMutex();