Fix arithmetic operation overflow

8 years ago · d09c4bb7cd
parent d1b4df5533
commit d09c4bb7cd
1 changed files with 4 additions and 2 deletions
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@ -37,6 +37,7 @@
 #include "error.hpp"
 #include "futils.hpp"
 #include "types.hpp"
+#include "safe_op.hpp"

 // + standard includes
 #include <string>
@ -265,8 +266,9 @@ namespace Exiv2
                            std::cout << "Exiv2::Jp2Image::readMetadata: "
                                     << "Color data found" << std::endl;
 #endif
+
                            const long pad = 3 ; // 3 padding bytes 2 0 0
-                            DataBuf data(subBox.length+8);
+                            DataBuf data(Safe::add(subBox.length, static_cast<uint32_t>(8)));
                            io_->read(data.pData_,data.size_);
                            const long    iccLength = getULong(data.pData_+pad, bigEndian);
                            // subtracting pad from data.size_ is safe: