From: James Zern <jzern@google.com>
Date: Sat, 15 Mar 2014 01:37:20 +0000 (-0700)
Subject: svc_encodeframe: quiet -Warray-bounds warnings
X-Git-Tag: v1.4.0~2045^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c0565a4cc0ea835a4b92ade5713894fb6c7824a;p=libvpx

svc_encodeframe: quiet -Warray-bounds warnings

si->layers is validated prior to assignment; add an assertion prior to
first use as a loop bound

Change-Id: I727d4e24be3c352c3e5320d92e89d3f787944812
---

diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c
index 3e22fdf38..4f3f7ec87 100644
--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -13,6 +13,7 @@
  * VP9 SVC encoding support via libvpx
  */
 
+#include <assert.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -550,6 +551,7 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
     float total = 0;
     float alloc_ratio[VPX_SS_MAX_LAYERS] = {0};
 
+    assert(si->layers <= VPX_SS_MAX_LAYERS);
     for (i = 0; i < si->layers; ++i) {
       int pos = i + VPX_SS_MAX_LAYERS - svc_ctx->spatial_layers;
       if (pos < VPX_SS_MAX_LAYERS && si->scaling_factor_den[pos] > 0) {