jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

encoder: add error checking to videoFrameSize

Browse Source 
av_image_get_buffer_size can return a negative error code. Prevents
casting such an error to a large positive integer that may cause a
bad_alloc exception on the subsequent buffer allocation.

Change-Id: Ie8a7987dcf16957a21496e791c34957bb2e35bfc
This commit is contained in:
jinboli
2018-11-22 15:30:33 -05:00
committed by philippegorley
parent 7ae0214dd7
commit c499a22be4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/media/media_buffer.cpp
View File

@ -34,7 +34,7 @@ namespace ring {
//=== HELPERS ==================================================================
std::size_t
int
videoFrameSize(int format, int width, int height)
{
return av_image_get_buffer_size((AVPixelFormat)format, width, height, 1);

2
src/media/media_buffer.h
View File

@ -42,7 +42,7 @@ using AudioFrame = DRing::AudioFrame;
using VideoFrame = DRing::VideoFrame;
// Some helpers
std::size_t videoFrameSize(int format, int width, int height);
int videoFrameSize(int format, int width, int height);
#endif // RING_VIDEO

4
src/media/media_encoder.cpp
View File

@ -286,7 +286,9 @@ MediaEncoder::addStream(const SystemCodecInfo& systemCodecInfo, std::string para
const int height = encoderCtx->height;
const int format = encoderCtx->pix_fmt;
scaledFrameBufferSize_ = videoFrameSize(format, width, height);
if (scaledFrameBufferSize_ <= AV_INPUT_BUFFER_MIN_SIZE)
if (scaledFrameBufferSize_ < 0)
throw MediaEncoderException(("Could not compute buffer size: " + libav_utils::getError(scaledFrameBufferSize_)).c_str());
else if (scaledFrameBufferSize_ <= AV_INPUT_BUFFER_MIN_SIZE)
throw MediaEncoderException("buffer too small");
scaledFrameBuffer_.reserve(scaledFrameBufferSize_);