Skip to content

Commit

Permalink
Fix C6001 Using uninitialized memory
Browse files Browse the repository at this point in the history
  • Loading branch information
cjee21 committed Jan 30, 2025
1 parent 64ae7ec commit c4834ca
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Source/MediaInfo/Audio/File_Ac4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1820,7 +1820,7 @@ void File_Ac4::Read_Buffer_Unsynched()
bool File_Ac4::Synchronize()
{
//Synchronizing
size_t Buffer_Offset_Current;
size_t Buffer_Offset_Current{};
while (Buffer_Offset<Buffer_Size)
{
Buffer_Offset_Current=Buffer_Offset;
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Audio/File_DolbyE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,7 @@ void File_DolbyE::program_assignment()
{
bool b_standard_chan_assign;
Get_SB (b_standard_chan_assign, "b_standard_chan_assign");
int32u nonstd_bed_channel_assignment_mask;
int32u nonstd_bed_channel_assignment_mask{};
if (b_standard_chan_assign)
{
int16u bed_channel_assignment_mask;
Expand Down
21 changes: 14 additions & 7 deletions Source/MediaInfo/Audio/File_Dts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -956,13 +956,20 @@ void File_Dts_Common::FileHeader_Parse()
//https://www.atsc.org/wp-content/uploads/2015/03/Non-Real-Time-Content-Delivery.pdf
if (IsSub || CC8(Buffer)!=CHUNK_DTSHDHDR || CC4(Buffer+8))
return;
int64u StreamSize=-1;
int16u Bitw_Stream_Metadata;
bool Header_Parsed=false;
int64u Num_Samples_Orig_Audio_At_Max_Fs=0;
int32u Num_Frames_Total, TimeStamp, Max_Sample_Rate_Hz=0, Ext_Ss_Avg_Bit_Rate_Kbps=0, Ext_Ss_Peak_Bit_Rate_Kbps=0;
int16u Core_Ss_Bit_Rate_Kbps=0, Samples_Per_Frame_At_Max_Fs=0, Codec_Delay_At_Max_Fs=0;
int8u RefClockCode, TC_Frame_Rate=-1;
int64u StreamSize{ static_cast<int64u>(-1) };
int16u Bitw_Stream_Metadata{};
bool Header_Parsed{ false };
int64u Num_Samples_Orig_Audio_At_Max_Fs{ 0 };
int32u Num_Frames_Total{};
int32u TimeStamp{};
int32u Max_Sample_Rate_Hz{ 0 };
int32u Ext_Ss_Avg_Bit_Rate_Kbps{ 0 };
int32u Ext_Ss_Peak_Bit_Rate_Kbps{ 0 };
int16u Core_Ss_Bit_Rate_Kbps{ 0 };
int16u Samples_Per_Frame_At_Max_Fs{ 0 };
int16u Codec_Delay_At_Max_Fs{ 0 };
int8u RefClockCode{};
int8u TC_Frame_Rate{ static_cast<int8u>(-1) };
while (StreamSize==-1 && Element_Size-Element_Offset>=16)
{
int64u Name, Size;
Expand Down
6 changes: 3 additions & 3 deletions Source/MediaInfo/Audio/File_Usac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4489,7 +4489,7 @@ void File_Usac::UsacCoreCoderData(size_t nrChannels, bool usacIndependencyFlag)
Element_Begin1("UsacCoreCoderData");

bool coreModes[2];
bool tnsDataPresent[2];
bool tnsDataPresent[2]{};

for (size_t ch=0; ch<nrChannels; ch++)
Get_SB(coreModes[ch], "core_mode");
Expand Down Expand Up @@ -4750,7 +4750,7 @@ void File_Usac::pvcEnvelope(bool usacIndependencyFlag)
}
else
{
int8u num_grid_info;
int8u num_grid_info{};
switch (divMode)
{
case 4:
Expand Down Expand Up @@ -5606,7 +5606,7 @@ void File_Usac::LsbData(ec_data_type dataType, bool bsQuantCoarseXXX, int8u data
//---------------------------------------------------------------------------
void File_Usac::EcDataPair(ec_data_type dataType, int8u paramIdx, int8u setIdx, int8u dataBands, bool bsDataPairXXX, bool bsQuantCoarseXXX, bool usacIndependencyFlag)
{
int8u numQuantSteps;
int8u numQuantSteps{};
switch (dataType)
{
case CLD:
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Image/File_Png.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ void File_Png::Textual(bitset8 Method)
}
Get_ISO_8859_1(Zero-Element_Offset, Keyword, "Keyword");
Skip_B1( "Null separator");
int8u Compression;
int8u Compression{};
if (Method[IsCompressed])
{
if (Method[IsUTF8])
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Multiple/File_Mk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5361,7 +5361,7 @@ void File_Mk::sei_message_user_data_registered_itu_t_t35_B5_003C_0001_04()
Get_B1 (application_version, "application_version");
if (application_version<=1)
{
int32u targeted_system_display_maximum_luminance, maxscl[4], distribution_maxrgb_percentiles[16];
int32u targeted_system_display_maximum_luminance, maxscl[4]{}, distribution_maxrgb_percentiles[16];
int16u fraction_bright_pixels;
int8u num_distribution_maxrgb_percentiles, distribution_maxrgb_percentages[16], num_windows, num_bezier_curve_anchors;
bool targeted_system_display_actual_peak_luminance_flag, mastering_display_actual_peak_luminance_flag, color_saturation_mapping_flag;
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ void File_Mpeg4_Descriptors::Data_Parse()
void File_Mpeg4_Descriptors::Descriptor_01()
{
//Parsing
int8u ProfileLevel[5];
int8u ProfileLevel[5]{};
bool URL_Flag;
BS_Begin();
Skip_S2(10, "ObjectDescriptorID");
Expand Down
4 changes: 2 additions & 2 deletions Source/MediaInfo/Multiple/File_Mxf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2718,7 +2718,7 @@ void File_Mxf::Streams_Finish_Essence(int32u EssenceUID, int128u TrackUID)
//Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_TimeCode_FirstFrame), TC.ToString().c_str());
//Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_TimeCode_Source), "Time code track (stripped)");
}
size_t SDTI_TimeCode_StartTimecode_StreamPos_Last;
size_t SDTI_TimeCode_StartTimecode_StreamPos_Last{};
if (SDTI_TimeCode_StartTimecode.IsSet())
{
SDTI_TimeCode_StartTimecode_StreamPos_Last=StreamPos_Last;
Expand All @@ -2729,7 +2729,7 @@ void File_Mxf::Streams_Finish_Essence(int32u EssenceUID, int128u TrackUID)
//Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_TimeCode_FirstFrame), SDTI_TimeCode_StartTimecode.c_str());
//Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_TimeCode_Source), "SDTI");
}
size_t SystemScheme1_TimeCodeArray_StartTimecode_StreamPos_Last;
size_t SystemScheme1_TimeCodeArray_StartTimecode_StreamPos_Last{};
if (!SystemScheme1s.empty() && !SystemScheme1s.begin()->second.TimeCodeArray_StartTimecodes.empty())
{
SystemScheme1_TimeCodeArray_StartTimecode_StreamPos_Last=StreamPos_Last;
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Multiple/File_Nsv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ void File_StarDiva::Read_Buffer_Continue()


size_t Begin;
size_t End;
size_t End{};

Element_Begin1("StarDiva time line data");
Element_Begin1("Header");
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Video/File_Av1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ void File_Av1::sequence_header()
{
//Parsing
int32u max_frame_width_minus_1, max_frame_height_minus_1;
int8u seq_profile, seq_level_idx[33], operating_points_cnt_minus_1, buffer_delay_length_minus_1, frame_width_bits_minus_1, frame_height_bits_minus_1, seq_force_screen_content_tools, BitDepth, color_primaries, transfer_characteristics, matrix_coefficients, chroma_sample_position;
int8u seq_profile, seq_level_idx[33]{}, operating_points_cnt_minus_1, buffer_delay_length_minus_1, frame_width_bits_minus_1, frame_height_bits_minus_1, seq_force_screen_content_tools, BitDepth, color_primaries, transfer_characteristics, matrix_coefficients, chroma_sample_position;
bool reduced_still_picture_header, seq_tier[33], timing_info_present_flag, decoder_model_info_present_flag, seq_choose_screen_content_tools, mono_chrome, color_range, color_description_present_flag, subsampling_x, subsampling_y;
BS_Begin();
Get_S1 ( 3, seq_profile, "seq_profile"); Param_Info1(Av1_seq_profile(seq_profile));
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Video/File_Hevc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3182,7 +3182,7 @@ void File_Hevc::sei_message_user_data_registered_itu_t_t35_B5_003C_0001_04()
Get_B1 (application_version, "application_version");
if (application_version==1)
{
int32u targeted_system_display_maximum_luminance, maxscl[4], distribution_maxrgb_percentiles[16];
int32u targeted_system_display_maximum_luminance, maxscl[4]{}, distribution_maxrgb_percentiles[16];
int16u fraction_bright_pixels;
int8u num_distribution_maxrgb_percentiles, distribution_maxrgb_percentages[16], num_windows, num_bezier_curve_anchors;
bool targeted_system_display_actual_peak_luminance_flag, mastering_display_actual_peak_luminance_flag, color_saturation_mapping_flag;
Expand Down
2 changes: 1 addition & 1 deletion Source/MediaInfo/Video/File_ProRes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void File_ProRes::Read_Buffer_Continue()
//Parsing
int32u Name, creatorID;
int16u hdrSize, version, frameWidth, frameHeight;
int8u chrominance_factor, frame_type, primaries, transf_func, colorMatrix, alpha_info;
int8u chrominance_factor{}, frame_type{}, primaries{}, transf_func{}, colorMatrix{}, alpha_info{};
bool IsOk=true, luma, chroma;
Element_Begin1("Header");
Skip_B4( "Size");
Expand Down
6 changes: 3 additions & 3 deletions Source/MediaInfo/Video/File_Vp9.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ void File_Vp9::Read_Buffer_Continue()

Element_Begin1("uncompressed_header");
BS_Begin();
int16u width_minus_one, height_minus_one;
int8u FRAME_MARKER, profile, bit_depth, colorspace, subsampling;
bool version0, version1, version2, show_existing_frame, frame_type, show_frame, error_resilient_mode, yuv_range_flag;
int16u width_minus_one{}, height_minus_one{};
int8u FRAME_MARKER, profile, bit_depth{}, colorspace{}, subsampling{};
bool version0, version1, version2, show_existing_frame, frame_type, show_frame, error_resilient_mode, yuv_range_flag{};
Get_S1(2, FRAME_MARKER, "FRAME_MARKER (0b10)");
if (FRAME_MARKER!=0x2)
Trusted_IsNot("FRAME_MARKER is wrong");
Expand Down

0 comments on commit c4834ca

Please sign in to comment.