aacsbr: change order of operation to prevent out of array read

CC: libav-stable@libav.org Bug-Id: CID 732250

aacsbr: change order of operation to prevent out of array read
CC: libav-stable@libav.org Bug-Id: CID 732250
930ffd46 · Michael Niedermayer · Vittorio Giovara · 9f6f4074 · 930ffd46
Commit 930ffd46 authored Oct 30, 2014 by Michael Niedermayer Committed by Vittorio Giovara Nov 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

aacsbr.c libavcodec/aacsbr.c +2 -1

No files found.
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -549,7 +549,8 @@ static int sbr_hf_calc_npatches(AACContext *ac, SpectralBandReplication *sbr)
            k = sbr->n_master;
    } while (sb != sbr->kx[1] + sbr->m[1]);

-    if (sbr->patch_num_subbands[sbr->num_patches-1] < 3 && sbr->num_patches > 1)
+    if (sbr->num_patches > 1 &&
+        sbr->patch_num_subbands[sbr->num_patches - 1] < 3)
        sbr->num_patches--;

    return 0;