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

Do not crash if page load fails during Output::prepareNext

Browse source
This commit is contained in:
Thulinma 2020-06-11 11:13:25 +02:00
parent 36a1a88cb0
commit e6f61f5643
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/output/output.cpp
View file

@ -1428,7 +1428,10 @@ namespace Mist{
if (M.getPageNumberForTime(nxt.tid, nxt.time) != currentPage[nxt.tid]){ if (M.getPageNumberForTime(nxt.tid, nxt.time) != currentPage[nxt.tid]){
loadPageForKey(nxt.tid, M.getPageNumberForTime(nxt.tid, nxt.time)); loadPageForKey(nxt.tid, M.getPageNumberForTime(nxt.tid, nxt.time));
nxt.offset = 0; nxt.offset = 0;
nxt.time = getDTSCTime(curPage[nxt.tid].mapped, 0); //Only read the next time if the page load succeeded and there is a packet to read from
if (curPage[nxt.tid].mapped && curPage[nxt.tid].mapped[0] == 'D'){
nxt.time = getDTSCTime(curPage[nxt.tid].mapped, 0);
}
buffer.erase(buffer.begin()); buffer.erase(buffer.begin());
buffer.insert(nxt); buffer.insert(nxt);
return false; return false;