hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to OGG library Read function

Browse source
This commit is contained in:
Ramoe 2017-04-16 13:47:44 +02:00 • committed by Thulinma
parent 482da790ea
commit 19198e3abd
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ogg.cpp
View file

@ -107,6 +107,7 @@ namespace OGG {
/// Reads an OGG Page from the source and if valid, removes it from source.
bool Page::read(std::string & newData){
int len = newData.size();
int total = 0;
segments.clear();
if (newData.size() < 27){
return false;
@ -119,14 +120,25 @@ namespace OGG {
if (newData.size() < 27u + getPageSegments()){ //check input size
return false;
}
newData.erase(0, 27);
memcpy(data + 27, newData.c_str(), getPageSegments());
newData.erase(0, getPageSegments());
memcpy(data + 27, newData.data()+27, getPageSegments());
std::deque<unsigned int> segSizes = decodeXiphSize(data + 27, getPageSegments());
for (std::deque<unsigned int>::iterator it = segSizes.begin(); it != segSizes.end(); it++){
total += *it;
}
total += 27;
//return false if the segment is not complete
total += getPageSegments();
if(total >= len){
return false;
}
newData.erase(0, getPageSegments()+27);
for (std::deque<unsigned int>::iterator it = segSizes.begin(); it != segSizes.end(); it++){
segments.push_back(std::string(newData.data(), *it));
newData.erase(0, *it);
}
INFO_MSG("Erased %lu bytes from the input", len - newData.size());
return true;
}