summaryrefslogtreecommitdiff
path: root/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2022-06-30 09:18:44 -0700
committerCy Schubert <cy@FreeBSD.org>2022-06-30 09:22:09 -0700
commit9f15b375dc27612c4f6ec121bf195e20e620e0a3 (patch)
treeba3d255cead9e32a941716b8c2fbf84a1495e85f /sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h
parentwww/ffsend: Return to pool (diff)
sysutils/syslog-ng: Update to 3.37.1
Update to 3.37.1 and apply a number of other fixes supplied by our upstream that didn't make it into the release. Patch was created and tested by our upstream representative Peter Czanik. Submitted by: Peter Czanik (CzP) <peter.czanik@oneidentity.com> Balabit (a OneIdentity company) / syslog-ng upstream
Diffstat (limited to 'sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h')
-rw-r--r--sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h b/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h
new file mode 100644
index 000000000000..de8126f674f4
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h
@@ -0,0 +1,28 @@
+--- lib/logmsg/logmsg.h.orig 2022-06-03 13:40:38 UTC
++++ lib/logmsg/logmsg.h
+@@ -315,6 +315,25 @@ gboolean log_msg_is_handle_match(NVHandle handle);
+ })
+
+ static inline gboolean
++log_msg_is_handle_referencable_from_an_indirect_value(NVHandle handle)
++{
++ if (handle == LM_V_NONE)
++ return FALSE;
++
++ /* macro values should not be referenced as they are dynamic, store the actual value instead */
++ if (log_msg_is_handle_macro(handle))
++ return FALSE;
++
++ /* matches are pretty temporary, so we should not reference them, as the
++ * next matching operation would overwrite them anyway */
++
++ if (log_msg_is_handle_match(handle))
++ return FALSE;
++
++ return TRUE;
++}
++
++static inline gboolean
+ log_msg_is_handle_settable_with_an_indirect_value(NVHandle handle)
+ {
+ return (handle >= LM_V_MAX);