More of static analysis fixes (#1496)

- fixes: - lack of null-terminated buffers - uninitialized variables - replaces throw from the constructor to explicit terminate Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
NVIDIA · Nov 25, 2019 · fe65df0 · fe65df0
1 parent 1dfe1a3
commit fe65df0
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 11 deletions.
diff --git a/dali/kernels/alloc.cc b/dali/kernels/alloc.cc
@@ -39,7 +39,11 @@ struct Allocator<AllocType::Host> {
 template <>
 struct Allocator<AllocType::Pinned> {
   static void Deallocate(void *ptr, int device) noexcept {
-    DeviceGuard guard(device);
+    try {
+      DeviceGuard guard(device);
+    } catch (...) {
+      std::terminate();
+    }
     cudaFreeHost(ptr);
   }
 
@@ -53,7 +57,11 @@ struct Allocator<AllocType::Pinned> {
 template <>
 struct Allocator<AllocType::GPU> {
   static void Deallocate(void *ptr, int device) noexcept {
-    DeviceGuard guard(device);
+    try {
+      DeviceGuard guard(device);
+    } catch (...) {
+      std::terminate();
+    }
     cudaFree(ptr);
   }
 
@@ -68,7 +76,11 @@ struct Allocator<AllocType::GPU> {
 template <>
 struct Allocator<AllocType::Unified> {
   static void Deallocate(void *ptr, int device) noexcept {
-    DeviceGuard guard(device);
+    try {
+      DeviceGuard guard(device);
+    } catch (...) {
+      std::terminate();
+    }
     cudaFree(ptr);
   }
 

diff --git a/dali/operators/decoder/cache/image_cache_blob.cc b/dali/operators/decoder/cache/image_cache_blob.cc
@@ -39,7 +39,11 @@ ImageCacheBlob::ImageCacheBlob(std::size_t cache_size,
 }
 
 ImageCacheBlob::~ImageCacheBlob() {
-  if (stats_enabled_ && images_seen() > 0) print_stats();
+  try {
+    if (stats_enabled_ && images_seen() > 0) print_stats();
+  } catch (...) {
+    std::terminate();
+  }
 }
 
 bool ImageCacheBlob::IsCached(const ImageKey& image_key) const {

diff --git a/dali/operators/reader/loader/video_loader.h b/dali/operators/reader/loader/video_loader.h
@@ -137,6 +137,7 @@ class VideoLoader : public Loader<GPUBackend, SequenceWrapper> {
       codec_id_(0),
       skip_vfr_check_(spec.GetArgument<bool>("skip_vfr_check")),
       stats_({0, 0, 0, 0, 0}),
+      current_frame_idx_(-1),
       stop_(false) {
     if (step_ < 0)
       step_ = count_ * stride_;

diff --git a/dali/operators/reader/nvdecoder/cuvideoparser.h b/dali/operators/reader/nvdecoder/cuvideoparser.h
@@ -94,7 +94,11 @@ class CUVideoParser {
 
   ~CUVideoParser() {
     if (initialized_) {
-      NVCUVID_CALL(cuvidDestroyVideoParser(parser_));
+      try {
+        NVCUVID_CALL(cuvidDestroyVideoParser(parser_));
+      } catch (...) {
+        std::terminate();
+      }
     }
   }
 

diff --git a/dali/operators/reader/parser/tf_feature.h b/dali/operators/reader/parser/tf_feature.h
@@ -41,7 +41,7 @@ class Feature {
     float float32;
   };
 
-  Feature() {}
+  Feature() : has_shape_(false), type_(int64) {}
 
   Feature(std::vector<Index> shape, FeatureType type, Value val) {
     has_shape_ = true;
@@ -181,7 +181,7 @@ class Feature {
 
     // default value
     DaliProtoPriv value_arg = arg.extra_args(3);
-    TFUtil::Feature::Value val;
+    TFUtil::Feature::Value val = {};
     switch (type) {
       case TFUtil::FeatureType::int64:
         val.int64 = value_arg.ints(0);

diff --git a/dali/test/dali_test_config.cc b/dali/test/dali_test_config.cc
@@ -45,7 +45,7 @@ const std::string &dali_extra_path() {
       }
       auto check_hash = "cd " + *_dali_extra_path + " ; git rev-parse HEAD";
       constexpr int kHashLen = 40;
-      char hash[kHashLen + 1] = {0, };
+      char hash[kHashLen + 1] = {};
       auto pipe = popen(check_hash.c_str(), "r");
       if (pipe == NULL) {
         std::cerr << "WARNING: Could not read the sha of DALI_extra at " << *_dali_extra_path

diff --git a/dali/test/dali_test_info.h.in b/dali/test/dali_test_info.h.in
@@ -15,6 +15,6 @@
 #ifndef DALI_TEST_DALI_TEST_INFO_H_
 #define DALI_TEST_DALI_TEST_INFO_H_
 
-#cmakedefine DALI_EXTRA_VERSION "@DALI_EXTRA_VERSION@"
+#cmakedefine DALI_EXTRA_VERSION "@DALI_EXTRA_VERSION@\0"
 
 #endif  // DALI_TEST_DALI_TEST_INFO_H_
diff --git a/dali/util/local_file.cc b/dali/util/local_file.cc
@@ -44,7 +44,7 @@ static int get_max_vm_cnt() {
 #if !defined(__aarch64__)
   size_t vm_cnt_sz = sizeof(vm_cnt);
   int name[] = { CTL_VM, VM_MAX_MAP_COUNT };
-  struct __sysctl_args args = {0, };
+  struct __sysctl_args args = {};
 
   args.name = name;
   args.nlen = sizeof(name)/sizeof(name[0]);
@@ -57,12 +57,13 @@ static int get_max_vm_cnt() {
     // fallback to reading /proc
     FILE * fp;
     int constexpr MAX_BUFF_SIZE = 256;
-    char buffer[MAX_BUFF_SIZE + 1] = {0, };
+    char buffer[MAX_BUFF_SIZE + 1];
     fp = std::fopen("/proc/sys/vm/max_map_count", "r");
     if (fp == nullptr) {
       return vm_cnt;
     }
     auto elements_read = std::fread(buffer, 1, MAX_BUFF_SIZE, fp);
+    buffer[elements_read] = '\0';
     std::fclose(fp);
     if (!elements_read) {
       return vm_cnt;