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

#890: Corrected the case of Infinite loop in RiffVideo::nikonTagsHandler()

Browse Source
This commit is contained in:
Abhinav Badola 2013-03-13 20:52:36 +00:00
parent f00b9ead31
commit 1bbe01a119
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/riffvideo.cpp
View File

@ -744,7 +744,7 @@ namespace Exiv2 {
double denominator = 1;
io_->read(buf.pData_, 4); tempSize -= 4;
while(tempSize > 0) {
while((long)tempSize > 0) {
std::memset(buf.pData_, 0x0, buf.size_);
io_->read(buf.pData_, 4);
io_->read(buf2.pData_, 4);
@ -752,7 +752,7 @@ namespace Exiv2 {
internal_pos = io_->tell(); tempSize -= (internal_size + 8);
if(equalsRiffTag(buf, "NCVR")) {
while(temp > 3) {
while((long)temp > 3) {
std::memset(buf.pData_, 0x0, buf.size_);
io_->read(buf.pData_, 2);
tagID = Exiv2::getULong(buf.pData_, littleEndian);
@ -775,7 +775,7 @@ namespace Exiv2 {
}
}
else if(equalsRiffTag(buf, "NCTG")) {
while(temp > 3) {
while((long)temp > 3) {
std::memset(buf.pData_, 0x0, buf.size_);
io_->read(buf.pData_, 2);
tagID = Exiv2::getULong(buf.pData_, littleEndian);
@ -820,7 +820,13 @@ namespace Exiv2 {
io_->seek(internal_pos + internal_size, BasicIo::beg);
}
io_->seek(cur_pos + size, BasicIo::beg);
if (size ==0) {
io_->seek(cur_pos + 4, BasicIo::beg);
}
else {
io_->seek(cur_pos + size, BasicIo::beg);
}
} // RiffVideo::nikonTagsHandler
void RiffVideo::infoTagsHandler()