iLBC: Handle a case of bad input data

webrtc/modules/audio_coding/codecs/ilbc/ilbc.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 /******************************************************************
 
  iLBC Speech Coder ANSI-C Source Code
 
  iLBCInterface.c
 
 ******************************************************************/
 
 #include "ilbc.h"
 #include "defines.h"
 #include "init_encode.h"
 #include "encode.h"
 #include "init_decode.h"
 #include "decode.h"
+#include "webrtc/base/checks.h"
 #include <stdlib.h>
 
 int16_t WebRtcIlbcfix_EncoderAssign(IlbcEncoderInstance** iLBC_encinst,
                                     int16_t* ILBCENC_inst_Addr,
                                     int16_t* size) {
   *iLBC_encinst=(IlbcEncoderInstance*)ILBCENC_inst_Addr;
   *size=sizeof(IlbcEncoder)/sizeof(int16_t);
   if (*iLBC_encinst!=NULL) {
     return(0);
   } else {
@@ skipping 138 matching lines @@
             ((IlbcDecoder*)iLBCdec_inst), 20,
             ((IlbcDecoder*)iLBCdec_inst)->use_enhancer);
       } else {
         /* Unsupported frame length */
         return(-1);
       }
     }
   }
 
   while ((i*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)<len) {
-    WebRtcIlbcfix_DecodeImpl(
-        &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl],
-        (const uint16_t*)&encoded
-            [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
-        (IlbcDecoder*)iLBCdec_inst, 1);
+    if (WebRtcIlbcfix_DecodeImpl(
+            &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl],
+            (const uint16_t*)&encoded
+                [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
+            (IlbcDecoder*)iLBCdec_inst, 1) == -1)
+      return -1;
     i++;
   }
   /* iLBC does not support VAD/CNG yet */
   *speechType=1;
   return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
 int WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance* iLBCdec_inst,
                              const uint8_t* encoded,
                              size_t len,
                              int16_t* decoded,
                              int16_t* speechType)
 {
   size_t i=0;
   if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
     /* ok, do nothing */
   } else {
     return(-1);
   }
 
   while ((i*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)<len) {
-    WebRtcIlbcfix_DecodeImpl(
+    if (!WebRtcIlbcfix_DecodeImpl(
         &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl],
         (const uint16_t*)&encoded
             [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
-        (IlbcDecoder*)iLBCdec_inst, 1);
+        (IlbcDecoder*)iLBCdec_inst, 1))
+      return -1;
     i++;
   }
   /* iLBC does not support VAD/CNG yet */
   *speechType=1;
   return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
 int WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance* iLBCdec_inst,
                              const uint8_t* encoded,
                              size_t len,
                              int16_t* decoded,
                              int16_t* speechType)
 {
   size_t i=0;
   if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
       (len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
     /* ok, do nothing */
   } else {
     return(-1);
   }
 
   while ((i*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)<len) {
-    WebRtcIlbcfix_DecodeImpl(
+    if (!WebRtcIlbcfix_DecodeImpl(
         &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl],
         (const uint16_t*)&encoded
             [2 * i * ((IlbcDecoder*)iLBCdec_inst)->no_of_words],
-        (IlbcDecoder*)iLBCdec_inst, 1);
+        (IlbcDecoder*)iLBCdec_inst, 1))
+      return -1;
     i++;
   }
   /* iLBC does not support VAD/CNG yet */
   *speechType=1;
   return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
 size_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance* iLBCdec_inst,
                                int16_t* decoded,
                                size_t noOfLostFrames) {
   size_t i;
   uint16_t dummy;
 
   for (i=0;i<noOfLostFrames;i++) {
-    /* call decoder */
-    WebRtcIlbcfix_DecodeImpl(
+    // PLC decoding shouldn't fail, because there is no external input data
+    // that can be bad.
+    RTC_CHECK(WebRtcIlbcfix_DecodeImpl(
         &decoded[i * ((IlbcDecoder*)iLBCdec_inst)->blockl], &dummy,
-        (IlbcDecoder*)iLBCdec_inst, 0);
+        (IlbcDecoder*)iLBCdec_inst, 0));
   }
   return (noOfLostFrames*((IlbcDecoder*)iLBCdec_inst)->blockl);
 }
 
 size_t WebRtcIlbcfix_NetEqPlc(IlbcDecoderInstance* iLBCdec_inst,
                               int16_t* decoded,
                               size_t noOfLostFrames) {
   /* Two input parameters not used, but needed for function pointers in NetEQ */
   (void)(decoded = NULL);
   (void)(noOfLostFrames = 0);
 
   WebRtcSpl_MemSetW16(((IlbcDecoder*)iLBCdec_inst)->enh_buf, 0, ENH_BUFL);
   ((IlbcDecoder*)iLBCdec_inst)->prev_enh_pl = 2;
 
   return (0);
 }
 
 void WebRtcIlbcfix_version(char *version)
 {
   strcpy((char*)version, "1.1.1");
 }