third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add test/data for video support : add enforce exceptions

Browse Source
This commit is contained in:
Mohamed Ali Chebbi 2023-02-04 23:02:45 +01:00
parent 340b46623d
commit 19f8b437c3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/asfvideo.cpp
View File

@ -4,6 +4,7 @@
#include <iostream>
#include "basicio.hpp"
#include "config.h"
#include "enforce.hpp"
#include "error.hpp"
#include "futils.hpp"
#include "helper_functions.hpp"
@ -370,7 +371,8 @@ void AsfVideo::codecList() {
xmpData()[codec + std::string(".CodecDescription")] = readStringWcharTag(io_, codec_desc_length);
uint16_t codec_info_length = readWORDTag(io_);
if (codec_info_length && codec_info_length + io_->tell() <= io_->size())
Internal::enforce(codec_info_length && codec_info_length + io_->tell() < io_->size(),
Exiv2::ErrorCode::kerCorruptedMetadata);
xmpData()[codec + std::string(".CodecInfo")] = readStringTag(io_, codec_info_length);
}
} // AsfVideo::codecList

4
src/riffvideo.cpp
View File

@ -8,6 +8,7 @@
// included header files
#include "riffvideo.hpp"
#include "enforce.hpp"
#include "error.hpp"
#include "futils.hpp"
#include "helper_functions.hpp"
@ -388,11 +389,10 @@ void RiffVideo::readMetadata() {
} // RiffVideo::readMetadata
RiffVideo::HeaderReader::HeaderReader(BasicIo::UniquePtr& io) {
if (io->size() >= io->tell() + DWORD + DWORD) {
Internal::enforce(io->size() > io->tell() + DWORD + DWORD, Exiv2::ErrorCode::kerCorruptedMetadata);
id_ = readStringTag(io);
size_ = readDWORDTag(io);
}
}
bool RiffVideo::equal(const std::string& str1, const std::string& str2) {
if (str1.size() != str2.size())