Skip to content

Commit f971fde

Browse files
PenguinwizzardPenguinwizzard
committed
[1.10>master] [MERGE #5272 @Penguinwizzard] Address issues picked up by Dev15 code analysis
Merge pull request #5272 from Penguinwizzard:dev15_prefast_fixes This is one of the things that was preventing us from moving our jenkins CI to dev15.
2 parents d634a2b + 7368d59 commit f971fde

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+239
-117
lines changed

‎bin/External/catch.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7374,7 +7374,7 @@ namespace Catch {
73747374
return TestCaseInfo::None;
73757375
}
73767376
inline bool isReservedTag( std::string const& tag ) {
7377-
return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
7377+
return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( (unsigned char)tag[0] );
73787378
}
73797379
inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
73807380
if( isReservedTag( tag ) ) {

‎bin/GCStress/StubExternalApi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
bool ConfigParserAPI::FillConsoleTitle(__ecount(cchBufferSize) LPWSTR buffer, size_t cchBufferSize, __in LPWSTR moduleName)
1111
{
12-
swprintf_s(buffer, cchBufferSize, _u("Chakra GC: %d - %s"), GetCurrentProcessId(), moduleName);
12+
swprintf_s(buffer, cchBufferSize, _u("Chakra GC: %lu - %s"), GetCurrentProcessId(), moduleName);
1313

1414
return true;
1515
}

‎bin/GCStress/WeightedTable.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ template <class T>
1313
class WeightedTable
1414
{
1515
public:
16-
WeightedTable() :
16+
WeightedTable() noexcept :
1717
entries(nullptr), size(0)
1818
{
1919
}
2020

2121
void AddWeightedEntry(T value, unsigned int weight)
2222
{
23-
T * newEntries = static_cast<T *>(realloc(entries, (size + weight) * sizeof(T)));
23+
T * newEntries = static_cast<T *>(realloc(entries, ((size_t)size + weight) * sizeof(T)));
2424
if (newEntries == nullptr)
2525
{
2626
// Should throw something better

‎bin/NativeTests/CodexTests.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
44
//-------------------------------------------------------------------------------------------------------
55
#include "stdafx.h"
6+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
7+
#pragma warning(disable:26439) // Implicit noexcept
8+
#pragma warning(disable:26451) // Arithmetic overflow
9+
#pragma warning(disable:26495) // Uninitialized member variable
610
#include "catch.hpp"
711
#include <process.h>
812
#include "Codex\Utf8Codex.h"
@@ -280,4 +284,4 @@ namespace CodexTest
280284

281285
RunUtf8DecodeTestCase(testCases, utf8::DecodeUnitsIntoAndNullTerminateNoAdvance);
282286
}
283-
};
287+
};

‎bin/NativeTests/FileLoadHelpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ HRESULT FileLoadHelpers::LoadScriptFromFile(LPCSTR filename, LPCWSTR& contents,
114114
utf8::DecodeOptions decodeOptions = utf8::doAllowInvalidWCHARs;
115115

116116
UINT cUtf16Chars = utf8::ByteIndexIntoCharacterIndex(pRawBytes, lengthBytes, decodeOptions);
117-
contents = (LPCWSTR)HeapAlloc(GetProcessHeap(), 0, (cUtf16Chars + 1) * sizeof(WCHAR));
117+
contents = (LPCWSTR)HeapAlloc(GetProcessHeap(), 0, (cUtf16Chars + (size_t)1) * sizeof(WCHAR));
118118
if (nullptr == contents)
119119
{
120120
fwprintf(stderr, _u("out of memory"));

‎bin/NativeTests/FunctionExecutionTest.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
44
//-------------------------------------------------------------------------------------------------------
55
#include "stdafx.h"
6+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
7+
#pragma warning(disable:26439) // Implicit noexcept
8+
#pragma warning(disable:26451) // Arithmetic overflow
9+
#pragma warning(disable:26495) // Uninitialized member variable
610
#include "catch.hpp"
711
#include "FunctionExecutionTest.h"
812

‎bin/NativeTests/FunctionExecutionTest.h

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// This file contains stubs needed to make FunctionExecutionTest successfully compile and link as well
77
// as a means to emulate behavior of objects that interact with FunctionExecutionStateMachine
88

9+
#include "..\..\lib\Common\Warnings.h"
910
#include "..\..\lib\Common\Core\CommonMinMax.h"
1011

1112
#define ENUM_CLASS_HELPERS(x, y)

‎bin/NativeTests/JsDiagApiTest.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
//-------------------------------------------------------------------------------------------------------
55

66
#include "stdafx.h"
7+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
8+
#pragma warning(disable:26439) // Implicit noexcept
9+
#pragma warning(disable:26451) // Arithmetic overflow
10+
#pragma warning(disable:26495) // Uninitialized member variable
711
#include "catch.hpp"
812
#include <process.h>
913

‎bin/NativeTests/JsRTApiTest.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
44
//-------------------------------------------------------------------------------------------------------
55
#include "stdafx.h"
6+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
7+
#pragma warning(disable:26439) // Implicit noexcept
8+
#pragma warning(disable:26451) // Arithmetic overflow
9+
#pragma warning(disable:26495) // Uninitialized member variable
610
#include "catch.hpp"
711
#include <array>
812
#include <process.h>
13+
#include <suppress.h>
914

1015
#pragma warning(disable:4100) // unreferenced formal parameter
1116
#pragma warning(disable:6387) // suppressing preFAST which raises warning for passing null to the JsRT APIs
@@ -1243,7 +1248,8 @@ namespace JsRTApiTest
12431248
size_t length;
12441249
REQUIRE(JsStringToPointer(nameValue, &name, &length) == JsNoError);
12451250

1246-
CHECK(length == 1);
1251+
REQUIRE(length == 1);
1252+
#pragma prefast(suppress:__WARNING_MAYBE_UNINIT_VAR, "The require on the previous line should ensure that name[0] is initialized")
12471253
CHECK(name[0] == ('a' + index));
12481254
}
12491255
}

‎bin/NativeTests/MemoryPolicyTest.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
44
//-------------------------------------------------------------------------------------------------------
55
#include "stdafx.h"
6+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
7+
#pragma warning(disable:26439) // Implicit noexcept
8+
#pragma warning(disable:26451) // Arithmetic overflow
9+
#pragma warning(disable:26495) // Uninitialized member variable
610
#include "catch.hpp"
711

812
#pragma warning(disable:6387) // suppressing preFAST which raises warning for passing null to the JsRT APIs

‎bin/NativeTests/NativeTests.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
// conversion from 'int' to 'char', possible loss of data
1010
#pragma warning(disable:4242)
1111
#pragma warning(disable:4244)
12+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
13+
#pragma warning(disable:26439) // Implicit noexcept
14+
#pragma warning(disable:26451) // Arithmetic overflow
15+
#pragma warning(disable:26495) // Uninitialized member variable
1216
#include "catch.hpp"
1317
#pragma warning(pop)
1418

‎bin/NativeTests/ThreadServiceTest.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
//-------------------------------------------------------------------------------------------------------
55

66
#include "stdafx.h"
7+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
8+
#pragma warning(disable:26439) // Implicit noexcept
9+
#pragma warning(disable:26451) // Arithmetic overflow
10+
#pragma warning(disable:26495) // Uninitialized member variable
711
#include "catch.hpp"
812

913
#pragma warning(disable:6387) // suppressing preFAST which raises warning for passing null to the JsRT APIs

‎bin/NativeTests/UnicodeTextTests.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
//-------------------------------------------------------------------------------------------------------
55

66
#include "stdafx.h"
7+
#pragma warning(disable:26434) // Function definition hides non-virtual function in base class
8+
#pragma warning(disable:26439) // Implicit noexcept
9+
#pragma warning(disable:26451) // Arithmetic overflow
10+
#pragma warning(disable:26495) // Uninitialized member variable
711
#include "catch.hpp"
812

913
namespace UnicodeTextTest

‎bin/ch/Debugger.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ bool Debugger::SetBaseline()
306306
#ifdef _WIN32
307307
LPSTR script = nullptr;
308308
FILE *file = nullptr;
309-
int numChars = 0;
309+
size_t numChars = 0;
310310
HRESULT hr = S_OK;
311311

312312
if (_wfopen_s(&file, HostConfigFlags::flags.dbgbaseline, _u("rb")) != 0)
@@ -316,13 +316,13 @@ bool Debugger::SetBaseline()
316316

317317
if(file != nullptr)
318318
{
319-
int fileSize = _filelength(_fileno(file));
320-
if (fileSize <= MAX_BASELINE_SIZE)
319+
long fileSize = _filelength(_fileno(file));
320+
if (0 <= fileSize && fileSize <= MAX_BASELINE_SIZE)
321321
{
322-
script = new char[fileSize + 1];
322+
script = new char[(size_t)fileSize + 1];
323323

324-
numChars = static_cast<int>(fread(script, sizeof(script[0]), fileSize, file));
325-
if (numChars == fileSize)
324+
numChars = fread(script, sizeof(script[0]), fileSize, file);
325+
if (numChars == (size_t)fileSize)
326326
{
327327
script[numChars] = '\0';
328328

‎bin/ch/HostConfigFlags.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ void HostConfigFlags::RemoveArg(int& argc, _Inout_updates_to_(argc, argc) LPWSTR
9696
Assert(index >= 0 && index < argc);
9797
for (int i = index + 1; i < argc; ++i)
9898
{
99+
#pragma prefast(suppress:__WARNING_READ_OVERRUN, "Operation is safe but PREfast is difficult to convince")
99100
argv[i - 1] = argv[i];
100101
}
101102
--argc;

‎bin/ch/JITProcessManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ HRESULT JITProcessManager::CreateServerProcess(int argc, __in_ecount(argc) LPWST
5252
STARTUPINFOW si = { 0 };
5353

5454
// overallocate constant cmd line (jshost -jitserver:<guid>)
55-
size_t cmdLineSize = (MAX_PATH + argc) * sizeof(WCHAR);
55+
size_t cmdLineSize = (MAX_PATH + (size_t)argc) * sizeof(WCHAR);
5656
for (int i = 0; i < argc; ++i)
5757
{
5858
// calculate space requirement for each arg

‎bin/ch/RuntimeThreadData.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@ RuntimeThreadLocalData& GetRuntimeThreadLocalData()
2020
return threadLocalData;
2121
}
2222

23-
RuntimeThreadData::RuntimeThreadData()
23+
RuntimeThreadData::RuntimeThreadData() :
24+
hSemaphore(nullptr),
25+
hThread(nullptr),
26+
sharedContent(nullptr),
27+
receiveBroadcastCallbackFunc(nullptr),
28+
runtime(nullptr),
29+
context(nullptr),
30+
parent(nullptr),
31+
leaving(false)
2432
{
2533
this->hevntInitialScriptCompleted = CreateEvent(NULL, TRUE, FALSE, NULL);
2634
this->hevntReceivedBroadcast = CreateEvent(NULL, FALSE, FALSE, NULL);
2735
this->hevntShutdown = CreateEvent(NULL, TRUE, FALSE, NULL);
2836

29-
this->sharedContent = nullptr;
30-
this->receiveBroadcastCallbackFunc = nullptr;
31-
32-
this->leaving = false;
33-
3437
InitializeCriticalSection(&csReportQ);
35-
3638
}
3739

3840
RuntimeThreadData::~RuntimeThreadData()

‎bin/ch/WScriptJsrt.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#endif // FreeBSD or unix ?
3636
#endif // _WIN32 ?
3737

38+
#pragma prefast(disable:26444, "This warning unfortunately raises false positives when auto is used for declaring the type of an iterator in a loop.")
3839
#ifdef HAS_ICU
3940
#define INTL_LIBRARY_TEXT "icu"
4041
#elif defined(_WIN32)
@@ -133,7 +134,7 @@ JsValueRef __stdcall WScriptJsrt::EchoCallback(JsValueRef callee, bool isConstru
133134
}
134135
charcount_t len;
135136
LPWSTR ws = str.GetWideString(&len);
136-
LPWSTR wsNoNull = new WCHAR[len + 1];
137+
LPWSTR wsNoNull = new WCHAR[((size_t)len) + 1];
137138
charcount_t newIndex = 0;
138139
for (charcount_t j = 0; j < len; j++)
139140
{

‎bin/ch/ch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void __stdcall PrintChakraCoreVersion()
145145
// Doesn't matter if you are on 32 bit or 64 bit,
146146
// DWORD is always 32 bits, so first two revision numbers
147147
// come from dwFileVersionMS, last two come from dwFileVersionLS
148-
wprintf(_u("%s version %u.%u.%u.%u\n"),
148+
wprintf(_u("%s version %lu.%lu.%lu.%lu\n"),
149149
chakraDllName,
150150
(verInfo->dwFileVersionMS >> 16) & 0xffff,
151151
(verInfo->dwFileVersionMS >> 0) & 0xffff,

‎bin/rl/rl.h

+15
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,22 @@
2121
#include "xmlreader.h"
2222
#include "rlfeint.h"
2323

24+
// Note that some of these look pretty bad, and are; this is a test host, so
25+
// we're not as concerned here.
2426
#pragma warning(disable:4127) // expression is constant, e.g., while(TRUE)
27+
#pragma warning(disable:6001) // using uninitialized memory
28+
#pragma warning(disable:6011) // dereferencing null pointer, potentially
29+
#pragma warning(disable:6031) // ignoring return value from some system calls
30+
#pragma warning(disable:6054) // string may not be zero-terminated
31+
#pragma warning(disable:6271) // Extra parameter not used by format string
32+
#pragma warning(disable:6262) // Function using too much stack for analyzer to look at it
33+
#pragma warning(disable:6335) // leaking process information handle
34+
#pragma warning(disable:6386) // Potential buffer overrun
35+
#pragma warning(disable:6387) // Potential misadherance to specification of library functions
36+
#pragma warning(disable:26439) // implicit noexcept
37+
#pragma warning(disable:26451) // Arithmetic on smaller type before widening conversion
38+
#pragma warning(disable:26495) // uninitialized member
39+
#pragma warning(disable:28193) // ignoring value that must be examined
2540

2641
#define LOCAL static
2742
typedef __int32 int32;

‎bin/rl/xmlreader.h

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
namespace Xml
1616
{
1717

18+
#pragma prefast(disable:26439) // implicit noexcept
19+
#pragma prefast(disable:26495) // uninitialized member variable
1820

1921
// May want Unicode someday.
2022

‎lib/Backend/Lower.cpp

+9-11
Original file line numberDiff line numberDiff line change
@@ -10518,7 +10518,7 @@ Lowerer::LowerStLoopBodyCount(IR::Instr* instr)
1051810518
IR::MemRefOpnd *loopBodyCounterOpnd = IR::MemRefOpnd::New((BYTE*)(header) + Js::LoopHeader::GetOffsetOfProfiledLoopCounter(), TyUint32, this->m_func);
1051910519
instr->SetDst(loopBodyCounterOpnd);
1052010520
instr->ReplaceSrc1(instr->GetSrc1()->AsRegOpnd()->UseWithNewType(TyUint32, this->m_func));
10521-
IR::AutoReuseOpnd(loopBodyCounterOpnd, this->m_func);
10521+
IR::AutoReuseOpnd autoReuse(loopBodyCounterOpnd, this->m_func);
1052210522
m_lowererMD.ChangeToAssign(instr);
1052310523
return;
1052410524
}
@@ -21155,8 +21155,12 @@ Lowerer::GenerateArgOutForStackArgs(IR::Instr* callInstr, IR::Instr* stackArgsIn
2115521155

2115621156

2115721157
#if defined(_M_IX86)
21158-
Assert(false);
21159-
#endif
21158+
// We get a compilation error on x86 due to assigning a negative to a uint
21159+
// TODO: don't even define this function on x86 - we Assert(false) anyway there.
21160+
// Alternatively, don't define when INT_ARG_REG_COUNT - 4 < 0
21161+
AssertOrFailFast(false);
21162+
return nullptr;
21163+
#else
2116021164

2116121165
Assert(stackArgsInstr->m_opcode == Js::OpCode::ArgOut_A_FromStackArgs);
2116221166
Assert(callInstr->m_opcode == Js::OpCode::CallIDynamic);
@@ -21224,14 +21228,7 @@ Lowerer::GenerateArgOutForStackArgs(IR::Instr* callInstr, IR::Instr* stackArgsIn
2122421228

2122521229
// 4 to denote this is 4th register after this, callinfo & function object
2122621230
// INT_ARG_REG_COUNT is the number of parameters passed in int regs
21227-
uint current_reg_pass =
21228-
#if defined(_M_IX86)
21229-
// We get a compilation error on x86 due to assiging a negative to a uint
21230-
// TODO: don't even define this function on x86 - we Assert(false) anyway there.
21231-
0;
21232-
#else
21233-
INT_ARG_REG_COUNT - 4;
21234-
#endif
21231+
uint current_reg_pass = INT_ARG_REG_COUNT - 4;
2123521232

2123621233
do
2123721234
{
@@ -21277,6 +21274,7 @@ Lowerer::GenerateArgOutForStackArgs(IR::Instr* callInstr, IR::Instr* stackArgsIn
2127721274

2127821275
/*return the length which will be used for callInfo generations & stack allocation*/
2127921276
return saveLenInstr->GetDst()->AsRegOpnd();
21277+
#endif
2128021278
}
2128121279

2128221280
void

‎lib/Common/Codex/Utf8Codex.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#pragma warning(push)
1818

1919
#pragma warning(disable: 4127) // constant expression for template parameter
20+
#pragma warning(disable: 26451) // size-conversion/arithmetic-operation ordering
2021
#endif
2122

2223
namespace utf8

0 commit comments

Comments
 (0)