commit 64775ccc85bafdd32df28a33e230507882a773c3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 20:29:37 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 20:29:37 2022 +0000
tree 34b42a72382ed04d7dfd80c54e8a56f136c30920
parent 44aefc2a50ff23b5a675686afeae77169066b375
parent fecf470bfbdca2e9b73836ea31d1308625da67d8

Merge cherrypicks of [17615049] into security-aosp-rvc-release.

Change-Id: If7f996b43073574763f9f762aa3bcb6c8a3f4e28

libMpegTPDec/src/tpdec_lib.cpp

diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index ca35184..a4c0521 100644
--- a/libMpegTPDec/src/tpdec_lib.cpp
+++ b/libMpegTPDec/src/tpdec_lib.cpp
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright  1995 - 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten
 Forschung e.V. All rights reserved.
 
  1.    INTRODUCTION
@@ -351,6 +351,12 @@
         }
       }
     }
+
+    /* if an error is detected terminate config parsing to avoid that an invalid
+     * config is accepted in the second pass */
+    if (err != TRANSPORTDEC_OK) {
+      break;
+    }
   }
 
   if (err == TRANSPORTDEC_OK && fConfigFound) {