Browse Source

ws_snd1: Fix wrong samples count and crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9fb7a5af97)

Addresses CVE-2012-0848

Reviewed-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 697a45d861)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
tags/n0.8.11
Michael Niedermayer Reinhard Tartler 14 years ago
parent
commit
e676bbb8cf
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/ws-snd1.c

+ 2
- 2
libavcodec/ws-snd1.c View File

@@ -95,8 +95,8 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,

/* make sure we don't write more than out_size samples */
switch (code) {
case 0: smp = 4; break;
case 1: smp = 2; break;
case 0: smp = 4*(count+1); break;
case 1: smp = 2*(count+1); break;
case 2: smp = (count & 0x20) ? 1 : count + 1; break;
default: smp = count + 1; break;
}


Loading…
Cancel
Save