diff mbox series

[FFmpeg-devel,08/25] avformat/utils: Remove always-false check

Message ID AM7PR03MB6660520FD96F3D4B2A13520C8FC89@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit f265374bc0b234fa26b744945d55981e8c6062d5
Headers show
Series [FFmpeg-devel,01/25] avformat/matroskadec: Fix heap-buffer overflow upon gigantic timestamps | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/configureppc warning Failed to apply patch

Commit Message

Andreas Rheinhardt Aug. 27, 2021, 2:27 p.m. UTC 
AVFormatContext.internal is already allocated by
avformat_alloc_context() on success; and on error,
avformat_alloc_context() cleans up manually without
avformat_free_context().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/utils.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Andreas Rheinhardt Aug. 30, 2021, 2:15 p.m. UTC | #1 
Andreas Rheinhardt:
> AVFormatContext.internal is already allocated by
> avformat_alloc_context() on success; and on error,
> avformat_alloc_context() cleans up manually without
> avformat_free_context().
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/utils.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index 4caa3017fb..7d7fd16257 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -1742,8 +1742,6 @@ return_packet:
>  /* XXX: suppress the packet queue */
>  static void flush_packet_queue(AVFormatContext *s)
>  {
> -    if (!s->internal)
> -        return;
>      avpriv_packet_list_free(&s->internal->parse_queue,       &s->internal->parse_queue_end);
>      avpriv_packet_list_free(&s->internal->packet_buffer,     &s->internal->packet_buffer_end);
>      avpriv_packet_list_free(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end);
> 
Will apply patches 8-17 (with the reference to FFStream removed from the
commit message of #14) tomorrow unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4caa3017fb..7d7fd16257 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1742,8 +1742,6 @@  return_packet:
 /* XXX: suppress the packet queue */
 static void flush_packet_queue(AVFormatContext *s)
 {
-    if (!s->internal)
-        return;
     avpriv_packet_list_free(&s->internal->parse_queue,       &s->internal->parse_queue_end);
     avpriv_packet_list_free(&s->internal->packet_buffer,     &s->internal->packet_buffer_end);
     avpriv_packet_list_free(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end);