Merge pull request #117 from RealAstolfo/array-index-ub-change

mmaneetsingh · web-flow · commit a947dc4ad51b · 2022-05-12T22:06:14.000-07:00
moved array sanity check to before the array access
diff --git a/src/common/displayport/src/dp_configcaps.cpp b/src/common/displayport/src/dp_configcaps.cpp
@@ -402,7 +402,7 @@ struct DPCDHALImpl : DPCDHAL
                 if (caps.linkRateTable[0] != 0)
                 {
                     bIndexedLinkrateCapable = true;
-                    for (int i = 0; caps.linkRateTable[i] && (i < NV_DPCD_SUPPORTED_LINK_RATES__SIZE); i++)
+                    for (int i = 0; (i < NV_DPCD_SUPPORTED_LINK_RATES__SIZE) && caps.linkRateTable[i]; i++)
                     {
                         if (linkRate < caps.linkRateTable[i])
                             linkRate = caps.linkRateTable[i];

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ struct DPCDHALImpl : DPCDHAL`
`402`	`402`	`if (caps.linkRateTable[0] != 0)`
`403`	`403`	`{`
`404`	`404`	`bIndexedLinkrateCapable = true;`
`405`		`- for (int i = 0; caps.linkRateTable[i] && (i < NV_DPCD_SUPPORTED_LINK_RATES__SIZE); i++)`
	`405`	`+ for (int i = 0; (i < NV_DPCD_SUPPORTED_LINK_RATES__SIZE) && caps.linkRateTable[i]; i++)`
`406`	`406`	`{`
`407`	`407`	`if (linkRate < caps.linkRateTable[i])`
`408`	`408`	`linkRate = caps.linkRateTable[i];`