Skip to content

fix(prof): fixed asserting length of INI #3508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2025
Merged

fix(prof): fixed asserting length of INI #3508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions profiling/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ use crate::bindings::{
datadog_php_profiling_copy_string_view_into_zval, ddog_php_prof_get_memoized_config,
zai_config_entry, zai_config_get_value, zai_config_minit, zai_config_name,
zai_config_system_ini_change, zend_ini_entry, zend_long, zend_string, zend_write, zval,
StringError, ZaiStr, IS_FALSE, IS_LONG, IS_TRUE, ZAI_CONFIG_ENTRIES_COUNT_MAX,
ZEND_INI_DISPLAY_ORIG,
StringError, ZaiStr, IS_FALSE, IS_LONG, IS_TRUE, ZAI_CONFIG_NAME_BUFSIZ, ZEND_INI_DISPLAY_ORIG,
};
use crate::zend::zai_str_from_zstr;
use core::fmt::{Display, Formatter};
Expand Down Expand Up @@ -287,7 +286,7 @@ unsafe extern "C" fn env_to_ini_name(env_name: ZaiStr, ini_name: *mut zai_config
// Env var name needs to fit.
let projection = "datadog.".len() - "DD_".len();
let null_byte = 1usize;
assert!(name.len() + projection + null_byte < ZAI_CONFIG_ENTRIES_COUNT_MAX as usize);
assert!(name.len() + projection + null_byte <= (ZAI_CONFIG_NAME_BUFSIZ as usize));

let (dest_prefix, src_prefix) = if name.starts_with("DD_TRACE_") {
("datadog.trace.", "DD_TRACE_")
Expand Down Expand Up @@ -1276,6 +1275,10 @@ mod tests {
b"DD_PROFILING_ALLOCATION_ENABLED\0",
"datadog.profiling.allocation_enabled",
),
(
b"DD_PROFILING_EXPERIMENTAL_EXCEPTION_SAMPLING_DISTANCE\0",
"datadog.profiling.experimental_exception_sampling_distance",
),
(
b"DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED\0",
"datadog.profiling.experimental_timeline_enabled",
Expand Down
Loading