]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/aacpsy: Check model_priv_data before dereferencing in psy_3gpp_end()
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 18 Mar 2021 21:20:03 +0000 (22:20 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 26 Mar 2021 15:00:14 +0000 (16:00 +0100)
Fixes: null pointer dereference
Fixes: av_freep.mp4
Found-by: Rafael Dutra <rafael.dutra@cispa.de>
Tested-by: Rafael Dutra <rafael.dutra@cispa.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/aacpsy.c

index fca692cb153f17082e3bcb918841b8e2bbbfe2c4..482113d42757c56d24b5adcecec4627375dc0db4 100644 (file)
@@ -855,7 +855,8 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel,
 static av_cold void psy_3gpp_end(FFPsyContext *apc)
 {
     AacPsyContext *pctx = (AacPsyContext*) apc->model_priv_data;
-    av_freep(&pctx->ch);
+    if (pctx)
+        av_freep(&pctx->ch);
     av_freep(&apc->model_priv_data);
 }