From cec5ac493869012fc366d91815f378deefe9d5dd Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 8 Jul 2025 13:01:32 +0200 Subject: [PATCH] Process review comments from rgacogne Signed-off-by: Otto Moerbeek --- pdns/recursordist/Makefile.am | 2 +- pdns/recursordist/docs/lua-scripting/functions.rst | 2 +- pdns/recursordist/protozero-helpers.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index 3c76a6125a..a2cd2e28d6 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -326,8 +326,8 @@ testrunner_SOURCES = \ ratelimitedlog.hh \ rcpgenerator.cc \ rec-eventtrace.cc rec-eventtrace.hh \ - rec-responsestats.hh rec-responsestats.cc \ rec-nsspeeds.cc rec-nsspeeds.hh \ + rec-responsestats.hh rec-responsestats.cc \ rec-rust-lib/cxxsupport.cc \ rec-system-resolve.hh rec-system-resolve.cc \ rec-taskqueue.cc rec-taskqueue.hh \ diff --git a/pdns/recursordist/docs/lua-scripting/functions.rst b/pdns/recursordist/docs/lua-scripting/functions.rst index 298b9d0977..3786b871e9 100644 --- a/pdns/recursordist/docs/lua-scripting/functions.rst +++ b/pdns/recursordist/docs/lua-scripting/functions.rst @@ -67,7 +67,7 @@ These are some functions that don't really have a place in one of the other cate .. function:: getConfigDirAndName() -> str, str - .. versionadded:: 5.2.x + .. versionadded:: 5.3.0 Get the configuration directory and the instance name. These two values correspond to the :ref:`setting-yaml-recursor.config_dir` and :ref:`setting-yaml-recursor.config_name` settings. diff --git a/pdns/recursordist/protozero-helpers.hh b/pdns/recursordist/protozero-helpers.hh index 468578b37e..95d79920ab 100644 --- a/pdns/recursordist/protozero-helpers.hh +++ b/pdns/recursordist/protozero-helpers.hh @@ -94,5 +94,5 @@ template void decodeNetmask(protozero::pbf_message& message, Netmask& subnet) { auto data = message.get_bytes(); - memcpy(&subnet, data.data(), data.size()); + memcpy(&subnet, data.data(), std::min(sizeof(subnet), data.size())); } -- 2.47.2