mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from TsudaKageyu/iterator

Browse Source 
Avoid possible overruns of iterators
This commit is contained in:
Tsuda Kageyu 2013-04-02 17:40:33 -07:00
commit 2aaf41e0bb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
taglib/toolkit/tbytevector.cpp
View File

@ -166,13 +166,19 @@ namespace TagLib {
TIterator itBuffer = it;
TIterator itPattern = patternBegin + patternSize - 1;
while(itPattern >= patternBegin && *itBuffer == *itPattern) {
--itBuffer;
--itPattern;
}
while(*itBuffer == *itPattern)
{
if(itPattern == patternBegin)
{
if((itBuffer - dataBegin - offset) % byteAlign == 0)
return (itBuffer - dataBegin);
else
break;
}
if(itPattern < patternBegin && (itBuffer - dataBegin + 1 - offset) % byteAlign == 0)
return (itBuffer - dataBegin + 1);
--itBuffer;
--itPattern;
}
}
return ByteVector::npos;