# HG changeset patch # User reimar # Date 1352149358 0 # Node ID 9a46ec65165d5577bdb2f22c4c2621e4352d022e # Parent 4ca7b3dfb574d2f8554d3f0d66f0c7611e9e39f6 Fix potential NULL dereference. diff -r 4ca7b3dfb574 -r 9a46ec65165d libmpcodecs/ad_ffmpeg.c --- a/libmpcodecs/ad_ffmpeg.c Mon Nov 05 20:58:38 2012 +0000 +++ b/libmpcodecs/ad_ffmpeg.c Mon Nov 05 21:02:38 2012 +0000 @@ -150,12 +150,12 @@ if(sh_audio->format==0x3343414D){ // MACE 3:1 sh_audio->ds->ss_div = 2*3; // 1 samples/packet - sh_audio->ds->ss_mul = 2*sh_audio->wf->nChannels; // 1 byte*ch/packet + sh_audio->ds->ss_mul = sh_audio->wf ? 2*sh_audio->wf->nChannels : 2; // 1 byte*ch/packet } else if(sh_audio->format==0x3643414D){ // MACE 6:1 sh_audio->ds->ss_div = 2*6; // 1 samples/packet - sh_audio->ds->ss_mul = 2*sh_audio->wf->nChannels; // 1 byte*ch/packet + sh_audio->ds->ss_mul = sh_audio->wf ? 2*sh_audio->wf->nChannels : 2; // 1 byte*ch/packet } // Decode at least 1 byte: (to get header filled)