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
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
--- a/src/modules/joystick/sdl/JoystickModule.h
|
|
+++ b/src/modules/joystick/sdl/JoystickModule.h
|
|
@@ -68,7 +68,8 @@ private:
|
|
|
|
std::list<love::joystick::Joystick *> joysticks;
|
|
std::vector<love::joystick::Joystick *> activeSticks;
|
|
+ std::unordered_map<int, love::joystick::Joystick *> activeSticksById;
|
|
|
|
std::map<std::string, bool> recentGamepadGUIDs;
|
|
};
|
|
--- a/src/modules/joystick/sdl/JoystickModule.cpp
|
|
+++ b/src/modules/joystick/sdl/JoystickModule.cpp
|
|
@@ -98,13 +98,11 @@ love::joystick::Joystick *JoystickModule::getJoystickFromID(int instanceid)
|
|
{
|
|
- for (auto stick : activeSticks)
|
|
- {
|
|
- if (stick->getInstanceID() == instanceid)
|
|
- return stick;
|
|
- }
|
|
-
|
|
- return nullptr;
|
|
+ // CWE-407 fix: O(1) hash map lookup instead of O(n) linear scan.
|
|
+ auto it = activeSticksById.find(instanceid);
|
|
+ return (it != activeSticksById.end()) ? it->second : nullptr;
|
|
}
|
|
|
|
love::joystick::Joystick *JoystickModule::addJoystick(int64 deviceid)
|
|
@@ -160,6 +158,7 @@ love::joystick::Joystick *JoystickModule::addJoystick(int64 deviceid)
|
|
if (joystick->isGamepad())
|
|
recentGamepadGUIDs[joystick->getGUID()] = true;
|
|
|
|
+ activeSticksById[joystick->getInstanceID()] = joystick;
|
|
activeSticks.push_back(joystick);
|
|
return joystick;
|
|
}
|
|
@@ -171,6 +170,7 @@ void JoystickModule::removeJoystick(love::joystick::Joystick *joystick)
|
|
// Close the Joystick and remove it from the active joystick list.
|
|
auto it = std::find(activeSticks.begin(), activeSticks.end(), joystick);
|
|
if (it != activeSticks.end())
|
|
{
|
|
+ activeSticksById.erase(joystick->getInstanceID());
|
|
(*it)->close();
|
|
activeSticks.erase(it);
|
|
}
|