Merge pull request #50 from prusa3d/et_fixes

Fixed out of bound access in function MeatPack::unbinarize()
prusa3d · Mar 18, 2024 · 638538c · 638538c
2 parents 33a1eeb + 1d5e22e
commit 638538c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/LibBGCode/binarize/meatpack.cpp b/src/LibBGCode/binarize/meatpack.cpp
@@ -407,11 +407,21 @@ void unbinarize(const std::vector<uint8_t>& src, std::string& dst)
                 is_gline_parameter(c_unbin[i])) {
                 *it_unbin_end = ' ';
                 ++it_unbin_end;
+                if (it_unbin_end == unbin_buffer.end()) {
+                    // the buffer is not big enough, resize it
+                    unbin_buffer.resize(2 * unbin_buffer.size(), 0);
+                    it_unbin_end = unbin_buffer.begin() + curr_unbin_buffer_length + 1;
+                }
             }
 
             if (c_unbin[i] != '\n' || std::distance(unbin_buffer.begin(), it_unbin_end) == 0 || *std::prev(it_unbin_end, 1) != '\n') {
                 *it_unbin_end = c_unbin[i];
                 ++it_unbin_end;
+                if (it_unbin_end == unbin_buffer.end()) {
+                    // the buffer is not big enough, resize it
+                    unbin_buffer.resize(2 * unbin_buffer.size(), 0);
+                    it_unbin_end = unbin_buffer.begin() + curr_unbin_buffer_length + 1;
+                }
             }
         }