Merge pull request #223 from jeremyhannon/checkLimitBeforeUsingIndex

mvandervoord · web-flow · commit a912ee364e4c · 2016-09-26T23:09:35.000-04:00
check 'i' limit before using it as an array index.
diff --git a/src/unity.c b/src/unity.c
@@ -1004,7 +1004,7 @@ void UnityAssertEqualStringLen(const char* expected,
     /* if both pointers not null compare the strings */
     if (expected && actual)
     {
-        for (i = 0; (expected[i] || actual[i]) && i < length; i++)
+        for (i = 0; (i < length) && (expected[i] || actual[i]); i++)
         {
             if (expected[i] != actual[i])
             {

Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ void UnityAssertEqualStringLen(const char* expected,`
`1004`	`1004`	`/* if both pointers not null compare the strings */`
`1005`	`1005`	`if (expected && actual)`
`1006`	`1006`	`{`
`1007`		`- for (i = 0; (expected[i] \|\| actual[i]) && i < length; i++)`
	`1007`	`+ for (i = 0; (i < length) && (expected[i] \|\| actual[i]); i++)`
`1008`	`1008`	`{`
`1009`	`1009`	`if (expected[i] != actual[i])`
`1010`	`1010`	`{`