russell@unturf.com
9934133dcf
Add 88 new defect entries to HIGH and MEDIUM tables:
HIGH: mysql-0001/0002, mariadb-0001, redis-0001/0002, valkey-0001/0002, openvpn-0001,
vlc-0001, prometheus-0001, otel-collector-0001, cockroachdb-0001..0004,
tidb-0001..0008, kubernetes-0001/0002, go-0001, kotlin-0002, scala-0001,
allegro5-0001, sdl2-0001, grafana-0001, clickhouse-0001, duckdb-0001,
mongodb-0001, envoy-0001, istio-0001, cilium-0001, linkerd2-0001,
linux-0001/0002/0003, tor-0002/0003, curl-0001, julia-0001, lua-0001,
perl5-0001, nats-0001, spring-0003/0004, tomcat-0001, onos-0002, odl-0002
MEDIUM: helm-0001, mariadb-0002, openssl-0001/0002, memcached-0001,
cassandra-0001..0004, flink-0001, storm-0001/0002, zookeeper-0001..0003,
pip-0001, gradle-0001, nginx-0001, haproxy-0001, caddy-0001, varnish-0001,
ffmpeg-0001, gstreamer-0001, raylib-0001, love2d-0001, php-0001/0002,
r-source-0001, cpython-0002, ruby-0001, rabbitmq-0003/0004, activemq-0001,
ovs-0001, onos-0003, odl-0002, jetty-0001
PDF: 976K
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
--- a/pkg/planner/core/rule/rule_predicate_simplification.go
|
|
+++ b/pkg/planner/core/rule/rule_predicate_simplification.go
|
|
@@ -228,7 +228,9 @@ func mergeInAndNotEQLists(sctx base.PlanContext, predicates []expression.Express
|
|
specialCase := false
|
|
- removeValues := make([]int, 0, len(predicates))
|
|
+ // CWE-407 fix: use a map so the filter loop below is O(N) instead of
|
|
+ // O(N * |removeValues|) from slices.Contains on a growing slice.
|
|
+ removeSet := make(map[int]struct{})
|
|
for i := range predicates {
|
|
for j := i + 1; j < len(predicates); j++ {
|
|
ithPredicate := predicates[i]
|
|
@@ -248,13 +250,13 @@ func mergeInAndNotEQLists(sctx base.PlanContext, predicates []expression.Express
|
|
if iCol.Equals(jCol) {
|
|
if iType == notEqualPredicate && jType == inListPredicate {
|
|
predicates[j], specialCase = updateInPredicate(sctx, jthPredicate, ithPredicate)
|
|
if maybeOverOptimized4PlanCache {
|
|
sctx.GetSessionVars().StmtCtx.SetSkipPlanCache("NE/INList simplification is triggered")
|
|
}
|
|
if !specialCase {
|
|
- removeValues = append(removeValues, i)
|
|
+ removeSet[i] = struct{}{}
|
|
}
|
|
} else if iType == inListPredicate && jType == notEqualPredicate {
|
|
predicates[i], specialCase = updateInPredicate(sctx, ithPredicate, jthPredicate)
|
|
if maybeOverOptimized4PlanCache {
|
|
sctx.GetSessionVars().StmtCtx.SetSkipPlanCache("NE/INList simplification is triggered")
|
|
}
|
|
if !specialCase {
|
|
- removeValues = append(removeValues, j)
|
|
+ removeSet[j] = struct{}{}
|
|
}
|
|
}
|
|
}
|
|
@@ -263,7 +265,7 @@ func mergeInAndNotEQLists(sctx base.PlanContext, predicates []expression.Express
|
|
newValues := make([]expression.Expression, 0, len(predicates))
|
|
for i, value := range predicates {
|
|
- if !(slices.Contains(removeValues, i)) {
|
|
+ if _, skip := removeSet[i]; !skip {
|
|
newValues = append(newValues, value)
|
|
}
|
|
}
|