feat(tianmu): fix invalid write/read issue. (#817)

stoneatom · Nov 8, 2022 · 6d89387 · 6d89387
1 parent eeca82b
commit 6d89387
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/storage/tianmu/core/engine_results.cpp b/storage/tianmu/core/engine_results.cpp
@@ -36,7 +36,7 @@ void scan_fields(mem_root_deque<Item *> &fields, uint *&buf_lens, std::map<int,
   Item::Type item_type;
   Item_sum::Sumfunctype sum_type;
 
-  buf_lens = new uint[CountVisibleFields(fields)];  // stonedb8
+  buf_lens = new uint[fields.size()];
   uint item_id = 0;
   uint field_length = 0;
   uint total_length = 0;

diff --git a/storage/tianmu/system/cacheable_item.cpp b/storage/tianmu/system/cacheable_item.cpp
@@ -34,7 +34,7 @@ CacheableItem::CacheableItem(char const *owner_name, char const *object_id, int
     // read the configuration parameter
     std::string temp_filename = tianmu_sysvar_cachefolder;
     filename_n_position = temp_filename.length();
-    filename = new char[filename_n_position + 37];  // "...path.../XXXXXXnnnnnnAAAAAAAABBBBBBBB.tianmu_tmp"
+    filename = new char[filename_n_position + 37 + 4];  // "...path.../XXXXXXnnnnnnAAAAAAAABBBBBBBB.tianmu_tmp"
     std::strcpy(filename, temp_filename.c_str());
     if (filename[filename_n_position - 1] != '/' && filename[filename_n_position - 1] != '\\') {
       filename[filename_n_position] = '/';
@@ -43,11 +43,6 @@ CacheableItem::CacheableItem(char const *owner_name, char const *object_id, int
     filename_n_position += 6;
   }
 
-  if (filename == nullptr) {
-    // if the temporary path is not set, use the current folder
-    filename = new char[36];  // "XXXXXXnnnnnnAAAAAAAABBBBBBBB.tianmu_tmp"
-    filename_n_position = 6;
-  }
   max_file_id = 0;
   max_file_pos = 0;
   no_block = 0;