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
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
--- a/sql/sql_select.cc
|
|
+++ b/sql/sql_select.cc
|
|
@@ -29057,12 +29057,22 @@ setup_new_fields(THD *thd, List<Item> &fields,
|
|
List<Item> &all_fields, ORDER *new_field)
|
|
{
|
|
Item **item;
|
|
uint counter;
|
|
enum_resolution_type not_used;
|
|
DBUG_ENTER("setup_new_fields");
|
|
|
|
thd->column_usage= MARK_COLUMNS_READ; // Not really needed, but...
|
|
+ // CWE-407 fix (mariadb-0002): build name->item* map once before the loop.
|
|
+ // find_item_in_list is O(S) per call; with N new fields this is O(N*S).
|
|
+ // An upfront index reduces the loop body to O(1) for name-matched items.
|
|
+ std::unordered_map<std::string, Item **> field_index;
|
|
+ {
|
|
+ List_iterator<Item> idx_it(fields);
|
|
+ Item *idx_item;
|
|
+ uint idx_pos = 0;
|
|
+ while ((idx_item = idx_it++)) {
|
|
+ if (idx_item->item_name.is_set())
|
|
+ field_index[std::string(idx_item->item_name.ptr())] =
|
|
+ fields.elem(idx_pos);
|
|
+ ++idx_pos;
|
|
+ }
|
|
+ }
|
|
for (; new_field ; new_field= new_field->next)
|
|
{
|
|
- if ((item= find_item_in_list(*new_field->item, fields, &counter,
|
|
- IGNORE_ERRORS, ¬_used)))
|
|
+ // Fast path: O(1) name lookup via pre-built index
|
|
+ std::string lookup_name;
|
|
+ if ((*new_field->item)->item_name.is_set())
|
|
+ lookup_name = (*new_field->item)->item_name.ptr();
|
|
+ auto fast = (!lookup_name.empty()) ? field_index.find(lookup_name)
|
|
+ : field_index.end();
|
|
+ if (fast != field_index.end()) {
|
|
+ item = fast->second;
|
|
+ } else if ((item= find_item_in_list(*new_field->item, fields, &counter,
|
|
+ IGNORE_ERRORS, ¬_used))) {
|
|
+ // fallback to linear scan for alias/table-qualified names
|
|
+ } else {
|
|
+ item = nullptr;
|
|
+ }
|
|
+ if (item)
|
|
new_field->item=item; /* Change to shared Item */
|
|
else
|
|
{
|