Fix prefast and copyright check warnings

chakra-core · May 5, 2016 · 04922c8 · 04922c8
1 parent 0d5c29b
commit 04922c8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/bin/ch/Debugger.cpp b/bin/ch/Debugger.cpp
@@ -302,7 +302,8 @@ bool Debugger::SetBaseline()
     {
         Helpers::LogError(_u("opening baseline file '%s'"), HostConfigFlags::flags.dbgbaseline);
     }
-    else
+
+    if(file != nullptr)
     {
         int fileSize = _filelength(_fileno(file));
         if (fileSize <= MAX_BASELINE_SIZE)
@@ -489,14 +490,17 @@ bool Debugger::CompareOrWriteBaselineFile(LPCWSTR fileName)
             return false;
         }
 
-        int countWritten = static_cast<int>(fwrite(baselineDataANSI, sizeof(baselineDataANSI[0]), strlen(baselineDataANSI), file));
-        if (countWritten != (int)strlen(baselineDataANSI))
+        if (file != nullptr)
         {
-            Assert(false);
-            return false;
-        }
+            int countWritten = static_cast<int>(fwrite(baselineDataANSI, sizeof(baselineDataANSI[0]), strlen(baselineDataANSI), file));
+            if (countWritten != (int)strlen(baselineDataANSI))
+            {
+                Assert(false);
+                return false;
+            }
 
-        fclose(file);
+            fclose(file);
+        }
 
         if (!HostConfigFlags::flags.dbgbaselineIsEnabled)
         {

diff --git a/bin/ch/Encode.js b/bin/ch/Encode.js
@@ -1,4 +1,7 @@
-
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
 
 if (WScript.arguments.length != 2)
 {

diff --git a/lib/Jsrt/JsrtDebugUtils.cpp b/lib/Jsrt/JsrtDebugUtils.cpp
@@ -363,9 +363,16 @@ void JsrtDebugUtils::AddPropertyToObject(Js::DynamicObject * object, JsrtDebugPr
     JsrtDebugUtils::AddVarPropertyToObject(object, propertyId, Js::JavascriptNumber::ToVarNoCheck(value, scriptContext), scriptContext);
 }
 
-void JsrtDebugUtils::AddPropertyToObject(Js::DynamicObject * object, JsrtDebugPropertyId propertyId, const char16 * value, charcount_t len, Js::ScriptContext * scriptContext)
+void JsrtDebugUtils::AddPropertyToObject(Js::DynamicObject * object, JsrtDebugPropertyId propertyId, const char16 * value, size_t len, Js::ScriptContext * scriptContext)
 {
-    JsrtDebugUtils::AddVarPropertyToObject(object, propertyId, Js::JavascriptString::NewCopyBuffer(value, len, scriptContext), scriptContext);
+    charcount_t charCount = static_cast<charcount_t>(len);
+
+    Assert(charCount == len);
+
+    if (charCount == len)
+    {
+        JsrtDebugUtils::AddVarPropertyToObject(object, propertyId, Js::JavascriptString::NewCopyBuffer(value, charCount, scriptContext), scriptContext);
+    }
 }
 
 void JsrtDebugUtils::AddPropertyToObject(Js::DynamicObject * object, JsrtDebugPropertyId propertyId, Js::JavascriptString* jsString, Js::ScriptContext * scriptContext)

diff --git a/lib/Jsrt/JsrtDebugUtils.h b/lib/Jsrt/JsrtDebugUtils.h
@@ -31,7 +31,7 @@ class JsrtDebugUtils
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, UINT value, Js::ScriptContext* scriptContext);
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, ULONG value, Js::ScriptContext* scriptContext);
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, LONG value, Js::ScriptContext* scriptContext);
-    static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, const char16 * value, charcount_t len, Js::ScriptContext* scriptContext);
+    static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, const char16 * value, size_t len, Js::ScriptContext* scriptContext);
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, Js::JavascriptString* jsString, Js::ScriptContext* scriptContext);
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, bool value, Js::ScriptContext* scriptContext);
     static void AddPropertyToObject(Js::DynamicObject* object, JsrtDebugPropertyId propertyId, Js::Var value, Js::ScriptContext* scriptContext);

diff --git a/lib/Jsrt/JsrtDiag.cpp b/lib/Jsrt/JsrtDiag.cpp
@@ -669,7 +669,13 @@ CHAKRA_API JsDiagEvaluate(
             return JsErrorDiagObjectNotFound;
         }
 
-        Js::DynamicObject* result = debuggerStackFrame->Evaluate(scriptContext, expression, wcslen(expression), false);
+        size_t len = wcslen(expression);
+        if (len != static_cast<int>(len))
+        {
+            return JsErrorInvalidArgument;
+        }
+
+        Js::DynamicObject* result = debuggerStackFrame->Evaluate(scriptContext, expression, static_cast<int>(len), false);
 
         if (result != nullptr)
         {