mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/avpacket: Avoid unspecific return -1 for av_grow_packet()
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
057328b29d
commit
9520d51e21
|
@ -112,7 +112,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
|
||||||
av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
|
av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
|
||||||
if ((unsigned)grow_by >
|
if ((unsigned)grow_by >
|
||||||
INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE))
|
INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE))
|
||||||
return -1;
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE;
|
new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE;
|
||||||
if (pkt->buf) {
|
if (pkt->buf) {
|
||||||
|
@ -124,7 +124,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
|
||||||
} else {
|
} else {
|
||||||
data_offset = pkt->data - pkt->buf->data;
|
data_offset = pkt->data - pkt->buf->data;
|
||||||
if (data_offset > INT_MAX - new_size)
|
if (data_offset > INT_MAX - new_size)
|
||||||
return -1;
|
return AVERROR(ENOMEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_size + data_offset > pkt->buf->size) {
|
if (new_size + data_offset > pkt->buf->size) {
|
||||||
|
|
Loading…
Reference in New Issue