CVE-2017-14160: fix bounds check on very low sample rates.

[platform/upstream/libvorbis.git] / lib / envelope.h

diff --git a/lib/envelope.h b/lib/envelope.h
index 20cf0ae..f466efd 100644 (file)
--- a/lib/envelope.h
+++ b/lib/envelope.h
@@ -5,13 +5,12 @@
  * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- last mod: $Id: envelope.h,v 1.20 2002/03/23 03:17:34 xiphmont Exp $
 
  ********************************************************************/
 
@@ -20,23 +19,33 @@
 
 #include "mdct.h"
 
-#define VE_DIV    4
-#define VE_CONV   3
-#define VE_BANDS  4
+#define VE_PRE    16
+#define VE_WIN    4
+#define VE_POST   2
+#define VE_AMP    (VE_PRE+VE_POST-1)
+
+#define VE_BANDS  7
+#define VE_NEARDC 15
+
+#define VE_MINSTRETCH 2   /* a bit less than short block */
+#define VE_MAXSTRETCH 12  /* one-third full block */
 
 typedef struct {
-  float ampbuf[VE_DIV];
+  float ampbuf[VE_AMP];
   int   ampptr;
-  float delbuf[VE_CONV-1];
-  float convbuf[2];
-  
-  float markers[1024];
+
+  float nearDC[VE_NEARDC];
+  float nearDC_acc;
+  float nearDC_partialacc;
+  int   nearptr;
+
 } envelope_filter_state;
 
 typedef struct {
   int begin;
   int end;
   float *window;
+  float total;
 } envelope_band;
 
 typedef struct {
@@ -50,6 +59,7 @@ typedef struct {
 
   envelope_band          band[VE_BANDS];
   envelope_filter_state *filter;
+  int   stretch;
 
   int                   *mark;
 
@@ -67,4 +77,3 @@ extern int  _ve_envelope_mark(vorbis_dsp_state *v);
 
 
 #endif
-