Remove cch parameter from CopyString methods

boingoing · boingoing · commit d2b1cc2a49af · 2017-01-24T12:19:24.000-08:00
diff --git a/lib/Parser/Hash.cpp b/lib/Parser/Hash.cpp
@@ -324,7 +324,7 @@ IdentPtr HashTbl::PidHashNameLenWithHash(_In_reads_(cch) CharType const * prgch,
     pid->m_propertyId = Js::Constants::NoProperty;
     pid->assignmentState = NotAssigned;
 
-    HashTbl::CopyString(pid->m_sz, prgch, end, cch);
+    HashTbl::CopyString(pid->m_sz, prgch, end);
 
     return pid;
 }
diff --git a/lib/Parser/Hash.h b/lib/Parser/Hash.h
@@ -426,22 +426,22 @@ class HashTbl
         }
         return true;
     }
-    static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, __in_ecount(cch) LPCOLESTR psz2, LPCOLESTR psz2end, int32 cch)
+    static void CopyString(__in_ecount((psz2end - psz2) + 1) LPOLESTR psz1, __in_ecount(psz2end - psz2) LPCOLESTR psz2, LPCOLESTR psz2end)
     {
-        Unused(psz2end);
+        size_t cch = psz2end - psz2;
         js_memcpy_s(psz1, cch * sizeof(OLECHAR), psz2, cch * sizeof(OLECHAR));
         psz1[cch] = 0;
     }
-    static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, LPCUTF8 psz2, LPCUTF8 psz2end, int32 cch)
+    static void CopyString(LPOLESTR psz1, LPCUTF8 psz2, LPCUTF8 psz2end)
     {
-        Unused(cch);
         utf8::DecodeUnitsIntoAndNullTerminate(psz1, psz2, psz2end);
     }
-    static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, __in_ecount(cch) char const * psz2, char const * psz2end, int32 cch)
+    static void CopyString(LPOLESTR psz1, char const * psz2, char const * psz2end)
     {
-        Unused(psz2end);
-        while (cch-- > 0)
+        while (psz2 < psz2end)
+        {
             *(psz1++) = *psz2++;
+        }
         *psz1 = 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ IdentPtr HashTbl::PidHashNameLenWithHash(_In_reads_(cch) CharType const * prgch,`
`324`	`324`	`pid->m_propertyId = Js::Constants::NoProperty;`
`325`	`325`	`pid->assignmentState = NotAssigned;`
`326`	`326`
`327`		`- HashTbl::CopyString(pid->m_sz, prgch, end, cch);`
	`327`	`+ HashTbl::CopyString(pid->m_sz, prgch, end);`
`328`	`328`
`329`	`329`	`return pid;`
`330`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -426,22 +426,22 @@ class HashTbl`
`426`	`426`	`}`
`427`	`427`	`return true;`
`428`	`428`	`}`
`429`		`- static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, __in_ecount(cch) LPCOLESTR psz2, LPCOLESTR psz2end, int32 cch)`
	`429`	`+ static void CopyString(__in_ecount((psz2end - psz2) + 1) LPOLESTR psz1, __in_ecount(psz2end - psz2) LPCOLESTR psz2, LPCOLESTR psz2end)`
`430`	`430`	`{`
`431`		`- Unused(psz2end);`
	`431`	`+ size_t cch = psz2end - psz2;`
`432`	`432`	`js_memcpy_s(psz1, cch * sizeof(OLECHAR), psz2, cch * sizeof(OLECHAR));`
`433`	`433`	`psz1[cch] = 0;`
`434`	`434`	`}`
`435`		`- static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, LPCUTF8 psz2, LPCUTF8 psz2end, int32 cch)`
	`435`	`+ static void CopyString(LPOLESTR psz1, LPCUTF8 psz2, LPCUTF8 psz2end)`
`436`	`436`	`{`
`437`		`- Unused(cch);`
`438`	`437`	`utf8::DecodeUnitsIntoAndNullTerminate(psz1, psz2, psz2end);`
`439`	`438`	`}`
`440`		`- static void CopyString(__in_ecount(cch + 1) LPOLESTR psz1, __in_ecount(cch) char const * psz2, char const * psz2end, int32 cch)`
	`439`	`+ static void CopyString(LPOLESTR psz1, char const * psz2, char const * psz2end)`
`441`	`440`	`{`
`442`		`- Unused(psz2end);`
`443`		`- while (cch-- > 0)`
	`441`	`+ while (psz2 < psz2end)`
	`442`	`+ {`
`444`	`443`	`(psz1++) = psz2++;`
	`444`	`+ }`
`445`	`445`	`*psz1 = 0;`
`446`	`446`	`}`
`447`	`447`