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
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
|
|
--- a/Zend/zend_execute.c
|
|
+++ b/Zend/zend_execute.c
|
|
@@ -5475,15 +5475,20 @@ static uint32_t zend_get_arg_offset_by_name(
|
|
if (EXPECTED(*cache_slot == unique_id)) {
|
|
return *(uintptr_t *)(cache_slot + 1);
|
|
}
|
|
|
|
- // TODO: Use a hash table?
|
|
- uint32_t num_args = fbc->common.num_args;
|
|
- for (uint32_t i = 0; i < num_args; i++) {
|
|
- const zend_arg_info *arg_info = &fbc->common.arg_info[i];
|
|
- if (zend_string_equals(arg_name, arg_info->name)) {
|
|
- if (...) {
|
|
- *cache_slot = unique_id;
|
|
- *(uintptr_t *)(cache_slot + 1) = i;
|
|
- }
|
|
- return i;
|
|
- }
|
|
- }
|
|
+ /*
|
|
+ * Reuse the compile-time hash built by zend_get_arg_num() if available,
|
|
+ * falling back to linear scan only for internal functions that never go
|
|
+ * through the compile path. O(1) for user functions; O(M) only for
|
|
+ * internal functions on first hit per cache slot.
|
|
+ */
|
|
+ if (fbc->op_array.arg_name_map) {
|
|
+ zval *zv = zend_hash_find(fbc->op_array.arg_name_map, arg_name);
|
|
+ if (zv) {
|
|
+ uint32_t i = (uint32_t)Z_LVAL_P(zv) - 1;
|
|
+ *cache_slot = unique_id;
|
|
+ *(uintptr_t *)(cache_slot + 1) = i;
|
|
+ return i;
|
|
+ }
|
|
+ } else {
|
|
+ uint32_t num_args = fbc->common.num_args;
|
|
+ for (uint32_t i = 0; i < num_args; i++) {
|
|
+ const zend_arg_info *arg_info = &fbc->common.arg_info[i];
|
|
+ if (zend_string_equals(arg_name, arg_info->name)) {
|
|
+ *cache_slot = unique_id;
|
|
+ *(uintptr_t *)(cache_slot + 1) = i;
|
|
+ return i;
|
|
+ }
|
|
+ }
|
|
+ }
|