mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:29:55 +00:00
Code Issues Releases Wiki Activity

Don't break the read_packet contract

Browse source
This commit is contained in:
Evil Eye 2024-09-17 20:56:04 +02:00
parent b9cb028809
commit 2dcf1f7ed2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extern/osg-ffmpeg-videoplayer/videostate.cpp vendored
View file

@ -236,11 +236,17 @@ int VideoState::istream_read(void *user_data, uint8_t *buf, int buf_size)
std::istream& stream = *static_cast<VideoState*>(user_data)->stream; std::istream& stream = *static_cast<VideoState*>(user_data)->stream;
stream.clear(); stream.clear();
stream.read((char*)buf, buf_size); stream.read((char*)buf, buf_size);
return stream.gcount(); if (stream.bad())
return AVERROR_UNKNOWN;
auto count = stream.gcount();
// avio_alloc_context says we mustn't return 0 for stream protocols
if (!count)
return AVERROR_EOF;
return count;
} }
catch (std::exception& ) catch (std::exception& )
{ {
return 0; return AVERROR_UNKNOWN;
} }
} }