Skip to content
8 changes: 7 additions & 1 deletion src/coreclr/pal/src/file/filetime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,13 @@ BOOL PALAPI FileTimeToSystemTime( CONST FILETIME * lpFileTime,
#else /* HAVE_GMTIME_R */
UnixSystemTime = gmtime( &UnixFileTime );
#endif /* HAVE_GMTIME_R */

if (!UnixSystemTime)
{
ERROR( "gmtime failed.\n" );
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}

/* Convert unix system time to Windows system time. */
lpSystemTime->wDay = (WORD)UnixSystemTime->tm_mday;

Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/pal/src/thread/process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2821,6 +2821,12 @@ CorUnix::InitializeProcessCommandLine(
if (lpwstrFullPath)
{
LPWSTR lpwstr = PAL_wcsrchr(lpwstrFullPath, '/');
if (!lpwstr)
{
ERROR("Invalid full path\n");
palError = ERROR_INTERNAL_ERROR;
goto exit;
}
lpwstr[0] = '\0';
size_t n = PAL_wcslen(lpwstrFullPath) + 1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ private uint LookupIbcMethodToken(MetadataType methodMetadataType, uint ibcToken
if (method.Name == methodName)
{
EcmaMethod ecmaCandidateMethod = method as EcmaMethod;
if (method == null)
if (ecmaCandidateMethod == null)
continue;

MetadataReader metadataReader = ecmaCandidateMethod.MetadataReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ internal ConfigurationSection FindImmediateParentSection(ConfigurationSection se

string configKey = section.SectionInformation.SectionName;
SectionRecord sectionRecord = GetSectionRecord(configKey, false);
Debug.Assert(sectionRecord != null);
if (sectionRecord.HasLocationInputs)
{
SectionInput input = sectionRecord.LastLocationInput;
Expand Down