mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 22:36:43 +00:00
Code Issues Releases Wiki Activity

Don't leak the IO context if avformat_open_input fails

Browse source
This commit is contained in:
Chris Robinson 2012-12-15 11:31:50 -08:00
parent 63e86555b6
commit c869444dcf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwrender/videoplayer.cpp
View file

@ -854,20 +854,20 @@ void VideoState::init(const std::string& resourceName)
if(this->stream.isNull()) if(this->stream.isNull())
throw std::runtime_error("Failed to open video resource"); throw std::runtime_error("Failed to open video resource");
AVIOContext *ioCtx = avio_alloc_context(NULL, 0, 0, this, OgreResource_Read, OgreResource_Write, OgreResource_Seek);
if(!ioCtx) throw std::runtime_error("Failed to allocate AVIOContext");
this->format_ctx = avformat_alloc_context(); this->format_ctx = avformat_alloc_context();
this->format_ctx->pb = avio_alloc_context(NULL, 0, 0, this, OgreResource_Read, OgreResource_Write, OgreResource_Seek); if(this->format_ctx)
if(!this->format_ctx->pb) this->format_ctx->pb = ioCtx;
{
avformat_free_context(this->format_ctx);
throw std::runtime_error("Failed to allocate ioContext ");
}
// Open video file // Open video file
/// \todo leak here, ffmpeg or valgrind bug ? /// \todo leak here, ffmpeg or valgrind bug ?
if (avformat_open_input(&this->format_ctx, resourceName.c_str(), NULL, NULL)) if(!this->format_ctx || avformat_open_input(&this->format_ctx, resourceName.c_str(), NULL, NULL))
{ {
// "Note that a user-supplied AVFormatContext will be freed on failure." // "Note that a user-supplied AVFormatContext will be freed on failure."
this->format_ctx = NULL; this->format_ctx = NULL;
av_free(ioCtx);
throw std::runtime_error("Failed to open video input"); throw std::runtime_error("Failed to open video input");
} }