virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/util: Make size argument of ff_alloc_packet2() int64_t

Browse Source 
This ensures that huge sizes dont get truncated before the check in ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-09 17:08:03 +02:00
parent a5615b82eb
commit 9a0e20817a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/internal.h
View File

@ -171,7 +171,7 @@ int avpriv_unlock_avformat(void);
* @param size the minimum required packet size * @param size the minimum required packet size
* @return 0 on success, negative error code on failure * @return 0 on success, negative error code on failure
*/ */
int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int size); int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size);
int ff_alloc_packet(AVPacket *avpkt, int size); int ff_alloc_packet(AVPacket *avpkt, int size);

8
libavcodec/utils.c
View File

@ -1425,14 +1425,14 @@ free_and_end:
goto end; goto end;
} }
int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int size) int ff_alloc_packet2(AVCodecContext *avctx, AVPacket *avpkt, int64_t size)
{ {
if (avpkt->size < 0) { if (avpkt->size < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid negative user packet size %d\n", avpkt->size); av_log(avctx, AV_LOG_ERROR, "Invalid negative user packet size %d\n", avpkt->size);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (size < 0 || size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) { if (size < 0 || size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
av_log(avctx, AV_LOG_ERROR, "Invalid minimum required packet size %d (max allowed is %d)\n", av_log(avctx, AV_LOG_ERROR, "Invalid minimum required packet size %"PRId64" (max allowed is %d)\n",
size, INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE); size, INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -1456,7 +1456,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
if (avpkt->size < size) { if (avpkt->size < size) {
av_log(avctx, AV_LOG_ERROR, "User packet is too small (%d < %d)\n", avpkt->size, size); av_log(avctx, AV_LOG_ERROR, "User packet is too small (%d < %"PRId64")\n", avpkt->size, size);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -1472,7 +1472,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else { } else {
int ret = av_new_packet(avpkt, size); int ret = av_new_packet(avpkt, size);
if (ret < 0) if (ret < 0)
av_log(avctx, AV_LOG_ERROR, "Failed to allocate packet of size %d\n", size); av_log(avctx, AV_LOG_ERROR, "Failed to allocate packet of size %"PRId64"\n", size);
return ret; return ret;
} }
} }