Backported of: From f9308839198aca5e68a65194f151a1de92398f54 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse <kevinbackhouse@github.com> Date: Tue, 20 Apr 2021 12:04:13 +0100 Subject: [PATCH] Better bounds checking in Jp2Image::encodeJp2Header() diff --git a/src/jp2image.cpp b/src/jp2image.cpp index 73a689e..c729930 100644 --- a/src/jp2image.cpp +++ b/src/jp2image.cpp @@ -646,13 +646,13 @@ static void boxes_check(size_t b,size_t m) void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf) { DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space - int outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? - int inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? + long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? + long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? enforce(sizeof(Jp2BoxHeader) <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; - int32_t length = getLong((byte*)&pBox->length, bigEndian); + uint32_t length = getLong((byte*)&pBox->length, bigEndian); enforce(length <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); - int32_t count = sizeof (Jp2BoxHeader); + uint32_t count = sizeof (Jp2BoxHeader); char* p = (char*) boxBuf.pData_; bool bWroteColor = false ; @@ -670,6 +670,7 @@ static void boxes_check(size_t b,size_t m) #ifdef EXIV2_DEBUG_MESSAGES std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl; #endif + enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata); count += subBox.length; newBox.type = subBox.type; } else { @@ -678,7 +679,7 @@ static void boxes_check(size_t b,size_t m) count = length; } - int32_t newlen = subBox.length; + uint32_t newlen = subBox.length; if ( newBox.type == kJp2BoxTypeColorHeader ) { bWroteColor = true ; if ( ! iccProfileDefined() ) { @@ -689,6 +690,7 @@ static void boxes_check(size_t b,size_t m) ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); ::memcpy(output.pData_+outlen+sizeof(newBox) ,pad ,psize ); newlen = psize ; + enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); } else { const char* pad = "\0x02\x00\x00"; uint32_t psize = 3; @@ -698,8 +700,10 @@ static void boxes_check(size_t b,size_t m) ::memcpy(output.pData_+outlen+sizeof(newBox) , pad ,psize ); ::memcpy(output.pData_+outlen+sizeof(newBox)+psize,iccProfile_.pData_,iccProfile_.size_); newlen = psize + iccProfile_.size_; + enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); } } else { + enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); }