commit 6c72374eeaf99e2b9db1c8cb5c9f945311317a1c
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 16 22:42:01 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 16 22:42:01 2019 +0000
tree b9ce6ce1f5f3d0a4936db3b5b87deaa5064e80f3
parent 69514bb3082c0f26a3684501240c982b79ecc22b
parent da401d271ecedd339b093201a6d7b1ecf436899c

Merge cherrypicks of [7077329, 7077440, 7077330, 7077468, 7076852, 7077469, 7077580, 7077581, 7077582, 7074025, 7077706, 7077707, 7077708, 7077388, 7077583, 7077584, 7077585, 7077726, 7077727, 7077331, 7077332, 7077459, 7077709, 7077710, 7077711, 7077712, 7077460, 7077461, 7077333, 7077334, 7077696] into pi-qpr3-release

Change-Id: If9c7aea7b790ca80bfe8aea213d90c3308e5f5c1

libFDK/src/nlc_dec.cpp

diff --git a/libFDK/src/nlc_dec.cpp b/libFDK/src/nlc_dec.cpp
index 8a8ccfd..6e98ce0 100644
--- a/libFDK/src/nlc_dec.cpp
+++ b/libFDK/src/nlc_dec.cpp
@@ -647,6 +647,10 @@
             }
             df_rest_flag_1 = num_val_1_int % 2;
             if (df_rest_flag_1) num_val_1_int -= 1;
+            if (num_val_1_int < 0) {
+              err = HUFFDEC_NOTOK;
+              goto bail;
+            }
           }
           if (out_data_2 != NULL) {
             if (diff_type_2 == DIFF_FREQ) {
@@ -658,6 +662,10 @@
             }
             df_rest_flag_2 = num_val_2_int % 2;
             if (df_rest_flag_2) num_val_2_int -= 1;
+            if (num_val_2_int < 0) {
+              err = HUFFDEC_NOTOK;
+              goto bail;
+            }
           }
 
           if (out_data_1 != NULL) {