From b8ad89b9ce455d3b96101d6a4670ab1b5c4e0396 Mon Sep 17 00:00:00 2001
From: cjee21 <77721854+cjee21@users.noreply.github.com>
Date: Fri, 31 Jan 2025 14:40:01 +0800
Subject: [PATCH] Fix C6385 Reading invalid data (not all)

---
 .../MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp  |  2 +-
 Source/MediaInfo/Audio/File_Usac.cpp               |  3 +++
 Source/MediaInfo/TimeCode.cpp                      |  4 ++++
 Source/MediaInfo/Video/File_Avc.h                  | 14 ++++++++------
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp b/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp
index 1949e0893..40bbf3f65 100644
--- a/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp
+++ b/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp
@@ -893,7 +893,7 @@ bool Aac_f_master_Compute(int8u &num_env_bands_Master, int8u* f_Master, sbr_hand
     }
 
     int8u numBands0=2*Aac_bands_Compute(false, bands, k0, k1, divisor);
-    if (numBands0 == 0 || numBands0 >= 64)
+    if (numBands0 <= 0 || numBands0 >= 64)
         return false;
 
     int8u vDk0[64];
diff --git a/Source/MediaInfo/Audio/File_Usac.cpp b/Source/MediaInfo/Audio/File_Usac.cpp
index 1d9e35c00..4ed11ca2d 100644
--- a/Source/MediaInfo/Audio/File_Usac.cpp
+++ b/Source/MediaInfo/Audio/File_Usac.cpp
@@ -2902,6 +2902,7 @@ void File_Usac::uniDrcConfigExtension()
             default:
                 Skip_BS(bitSize,                                "Unknown");
         }
+        #pragma warning (suppress : 6385) //Visual Studio fail to detect 'uniDrcConfigExtType<UNIDRCCONFEXT_Max' check when it is inside function parameter and warns about reading invalid data
         BS_Bookmark(B, uniDrcConfigExtType<UNIDRCCONFEXT_Max?string(uniDrcConfigExtType_ConfNames[uniDrcConfigExtType]):("uniDrcConfigExtType"+to_string(uniDrcConfigExtType)));
         Element_End0();
     }
@@ -3377,6 +3378,7 @@ void File_Usac::UsacConfigExtension()
                 case ID_CONFIG_EXT_STREAM_ID                  : streamId(); break;
                 default                                       : Skip_BS(usacConfigExtLength,                "Unknown");
             }
+            #pragma warning (suppress : 6385) //Visual Studio fail to detect 'usacConfigExtType<ID_CONFIG_EXT_Max' check when it is inside function parameter and warns about reading invalid data
             if (BS_Bookmark(B, usacConfigExtType<ID_CONFIG_EXT_Max?string(usacConfigExtType_ConfNames[usacConfigExtType]):("usacConfigExtType"+to_string(usacConfigExtType))))
             {
                 #if MEDIAINFO_CONFORMANCE
@@ -5944,6 +5946,7 @@ void File_Usac::UsacExtElement(size_t elemIdx, bool usacIndependencyFlag)
                 default:
                     Skip_BS(usacExtElementPayloadLength,        usacExtElementType==ID_EXT_ELE_FILL?"(Not parsed)":"Unknown");
             }
+            #pragma warning (suppress : 6385) //Visual Studio fail to detect 'usacExtElementType<ID_EXT_ELE_Max' check when it is inside function parameter and warns about reading invalid data
             BS_Bookmark(B, usacExtElementType<ID_EXT_ELE_Max?string(usacExtElementType_Names[usacExtElementType]):("usacExtElementType"+to_string(usacExtElementType)));
         }
     }
diff --git a/Source/MediaInfo/TimeCode.cpp b/Source/MediaInfo/TimeCode.cpp
index 749e34890..cfa27d70d 100644
--- a/Source/MediaInfo/TimeCode.cpp
+++ b/Source/MediaInfo/TimeCode.cpp
@@ -508,6 +508,10 @@ int TimeCode::FromString(const string_view& V, bool Ignore1001FromDropFrame)
                 return 1;
             }
             int FramesRate_Index = i - 1 - i_Start;
+            if (FramesRate_Index < 0) {
+                *this = TimeCode();
+                return 1;
+            }
             uint64_t FramesRate = PowersOf10[FramesRate_Index];
             SetFramesMax((uint32_t)FramesRate - 1);
             switch (Unit)
diff --git a/Source/MediaInfo/Video/File_Avc.h b/Source/MediaInfo/Video/File_Avc.h
index 7d06f53b5..24bf5f688 100644
--- a/Source/MediaInfo/Video/File_Avc.h
+++ b/Source/MediaInfo/Video/File_Avc.h
@@ -75,12 +75,14 @@ private :
         {
             delete[] Iso14496_10_Buffer;
             Iso14496_10_Buffer_Size = (size_t)(Element_Size + 4);
-            Iso14496_10_Buffer = new int8u[Iso14496_10_Buffer_Size];
-            Iso14496_10_Buffer[0] = 0x00;
-            Iso14496_10_Buffer[1] = 0x00;
-            Iso14496_10_Buffer[2] = 0x01;
-            Iso14496_10_Buffer[3] = c;
-            std::memcpy(Iso14496_10_Buffer + 4, Buffer, (size_t)Element_Size);
+            if (Iso14496_10_Buffer_Size > 3) {
+                Iso14496_10_Buffer = new int8u[Iso14496_10_Buffer_Size];
+                Iso14496_10_Buffer[0] = 0x00;
+                Iso14496_10_Buffer[1] = 0x00;
+                Iso14496_10_Buffer[2] = 0x01;
+                Iso14496_10_Buffer[3] = c;
+                std::memcpy(Iso14496_10_Buffer + 4, Buffer, (size_t)Element_Size);
+            }
         }
 #endif //MEDIAINFO_DEMUX
     };