Merge pull request #1180 from NicolasM0/fix_log_file_chunks_received_…

…size log_files: fix chunks_received size in download_log_file
mavlink · Aug 28, 2020 · a2fd088 · a2fd088
2 parents 2efde2f + 4a42999
commit a2fd088
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/core/mavsdk.cpp b/src/core/mavsdk.cpp
@@ -149,5 +149,4 @@ void Mavsdk::Configuration::set_usage_type(Mavsdk::Configuration::UsageType usag
     _usage_type = usage_type;
 }
 
-
 } // namespace mavsdk
diff --git a/src/core/mavsdk.h b/src/core/mavsdk.h
@@ -162,7 +162,7 @@ class Mavsdk {
          */
         uint8_t get_system_id() const;
 
-        /** 
+        /**
          * @brief Set the system id of this configuration.
          */
         void set_system_id(uint8_t system_id);

diff --git a/src/plugins/log_files/log_files_impl.cpp b/src/plugins/log_files/log_files_impl.cpp
@@ -242,7 +242,9 @@ void LogFilesImpl::download_log_file_async(
         _data.part_start = 0;
         const auto part_size = determine_part_end() - _data.part_start;
         _data.bytes.resize(part_size);
-        _data.chunks_received.resize(part_size / MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN);
+        _data.chunks_received.resize(
+            part_size / MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN +
+            ((part_size % MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN) != 0));
 
         _parent->register_timeout_handler(
             std::bind(&LogFilesImpl::data_timeout, this), DATA_TIMEOUT_S, &_data.cookie);
@@ -376,7 +378,9 @@ void LogFilesImpl::check_part()
 
             const auto part_size = determine_part_end() - _data.part_start;
             _data.bytes.resize(part_size);
-            _data.chunks_received.resize(part_size / MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN);
+            _data.chunks_received.resize(
+                part_size / MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN +
+                ((part_size % MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN) != 0));
             std::fill(_data.chunks_received.begin(), _data.chunks_received.end(), false);
 
             request_log_data(_data.id, _data.part_start, _data.bytes.size());