History

avcodec/opus/silk: don't assume stereo when calling silk_decode_frame()

Fixes use-of-uninitialized-value under MSAN.

James Almer committed 1 year ago

Commit 3f2b4521 parent 33e326a1 file · +4 −2Browse files

Unified · Split

libavcodec/opus/silk.c+4−2
@@ -844,8 +844,10 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, · 843 unmodified lines
844844 }
845845
846846 for (i = 0; i < nb_frames; i++) {
847− for (j = 0; j < coded_channels && !s->midonly; j++)
848− silk_decode_frame(s, rc, i, j, coded_channels, active[j][i], active[1][i], 0);
847+ for (j = 0; j < coded_channels && !s->midonly; j++) {
848+ int active1 = coded_channels > 1 ? active[1][i] : 0;
849+ silk_decode_frame(s, rc, i, j, coded_channels, active[j][i], active1, 0);
850+ }
849851
850852 /* reset the side channel if it is not coded */
851853 if (s->midonly && s->frame[1].coded)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t