diff mbox

[FFmpeg-devel] avformat/latmenc: abort if no extradata is available

Message ID 20191015143842.1157-1-jamrial@gmail.com
State Accepted
Commit dd01947397b98e94c3f2a79d5820aaf4594f4d3b
Headers show

Commit Message

James Almer Oct. 15, 2019, 2:38 p.m. UTC 
Fixes ticket #8273.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/latmenc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Paul B Mahol Oct. 15, 2019, 3 p.m. UTC | #1 
LGTM

On 10/15/19, James Almer <jamrial@gmail.com> wrote:
> Fixes ticket #8273.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/latmenc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
> index db867ebf1a..5ae677f5da 100644
> --- a/libavformat/latmenc.c
> +++ b/libavformat/latmenc.c
> @@ -176,7 +176,8 @@ static int latm_write_packet(AVFormatContext *s,
> AVPacket *pkt)
>                  if (ret < 0)
>                      return ret;
>                  memcpy(par->extradata, side_data, side_data_size);
> -            }
> +            } else
> +                return AVERROR_INVALIDDATA;
>          }
>      }
>
> --
> 2.23.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
James Almer Oct. 15, 2019, 4:04 p.m. UTC | #2 
On 10/15/2019 12:00 PM, Paul B Mahol wrote:
> LGTM
> 
> On 10/15/19, James Almer <jamrial@gmail.com> wrote:
>> Fixes ticket #8273.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavformat/latmenc.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
>> index db867ebf1a..5ae677f5da 100644
>> --- a/libavformat/latmenc.c
>> +++ b/libavformat/latmenc.c
>> @@ -176,7 +176,8 @@ static int latm_write_packet(AVFormatContext *s,
>> AVPacket *pkt)
>>                  if (ret < 0)
>>                      return ret;
>>                  memcpy(par->extradata, side_data, side_data_size);
>> -            }
>> +            } else
>> +                return AVERROR_INVALIDDATA;
>>          }
>>      }

Pushed, thanks.
diff mbox

Patch

diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index db867ebf1a..5ae677f5da 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -176,7 +176,8 @@  static int latm_write_packet(AVFormatContext *s, AVPacket *pkt)
                 if (ret < 0)
                     return ret;
                 memcpy(par->extradata, side_data, side_data_size);
-            }
+            } else
+                return AVERROR_INVALIDDATA;
         }
     }