Commit 3dc44676a for clamav.net
commit 3dc44676a49702bc4aa24fd8980ec5306428bf93
Author: Valerie Snyder <valsnyde@cisco.com>
Date: Tue Aug 18 12:15:31 2026 -0400
libclamav_rust: Treat log messages as data
Rust log records are fully formatted before they are passed to
variadic C logging functions. Passing a rendered record as the C
format string lets percent directives consume nonexistent variadic
arguments.
Use a fixed "%s" format for every Rust-to-C log level and pass the
rendered record as data.
Reported by Feng Xue.
CLAM-3062
diff --git a/libclamav_rust/src/logging.rs b/libclamav_rust/src/logging.rs
index 82c4e8ba3..38d70e268 100644
--- a/libclamav_rust/src/logging.rs
+++ b/libclamav_rust/src/logging.rs
@@ -40,19 +40,20 @@ impl log::Log for ClamLogger {
if self.enabled(record.metadata()) {
let msg = CString::new(format!("{}\n", record.args())).unwrap();
let ptr = msg.as_ptr();
+ let format = b"%s\0".as_ptr() as *const c_char;
match record.level() {
Level::Debug => unsafe {
- sys::cli_dbgmsg_no_inline(ptr);
+ sys::cli_dbgmsg_no_inline(format, ptr);
},
Level::Error => unsafe {
- sys::cli_errmsg(ptr);
+ sys::cli_errmsg(format, ptr);
},
Level::Info => unsafe {
- sys::cli_infomsg_simple(ptr);
+ sys::cli_infomsg_simple(format, ptr);
},
Level::Warn => unsafe {
- sys::cli_warnmsg(ptr);
+ sys::cli_warnmsg(format, ptr);
},
_ => {}
}