commit df4439f9ec28fefdec652ec94739faf85f1afa78
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 13 07:48:20 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 13 07:48:20 2022 +0000
tree 31d4c2de08f236f799e51486e9b07a13127357fc
parent f9af14856ca8d0dca12e24a52715f14a0f70228e
parent 2b57d2b0be28fd336085e8459ccef775c5bfca38

Snap for 9170954 from 2b57d2b0be28fd336085e8459ccef775c5bfca38 to qt-aml-tzdata-release

Change-Id: Ie7ddec5072b05ac8dfdcd3c8b7e9cff742d184eb

libMpegTPDec/src/tpdec_lib.cpp

diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index 506aed3..3603a77 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 - 2018 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) {