diff mbox

[FFmpeg-devel,1/5] CodeAi generated fix for CWE 476 Null Pointer Dereference

Message ID 1520376143-5925-2-git-send-email-benjamin.bales@assrc.us
State New
Headers show

Commit Message

C0deAi March 6, 2018, 10:42 p.m. UTC 
Tighten condition to prevent possible Null Dereference from
access to field 'pts' loaded from variable 'in'.

Signed-off-by: C0deAi <benjamin.bales@assrc.us>
---
 libavfilter/af_afade.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer March 7, 2018, 1:28 a.m. UTC | #1 
On Tue, Mar 06, 2018 at 05:42:19PM -0500, C0deAi wrote:
> Tighten condition to prevent possible Null Dereference from
> access to field 'pts' loaded from variable 'in'.
> 
> Signed-off-by: C0deAi <benjamin.bales@assrc.us>
> ---
>  libavfilter/af_afade.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

breaks fate-filter-acrossfade

[...]
diff mbox

Patch

diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index 285b5b6..7f5106e 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -460,7 +460,7 @@  static int activate(AVFilterContext *ctx)
         return ff_filter_frame(outlink, in);
     }
 
-    if (ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) > s->nb_samples) {
+    if (in && (ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) > s->nb_samples)) {
         nb_samples = ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) - s->nb_samples;
         if (nb_samples > 0) {
             ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in);