Marcus Rueckert
d7e8019fcf
- Test updates for rspamd-3.7 branch by @fatalbanana in #4708 - Fix rspamadm lua logger in rspamd-3.7 (#/4727) by @fatalbanana in #4729 - Some picks for rspamd-3.7 by @fatalbanana in #4731 - rspamd-3.7: fix systemd logging by @fatalbanana in #4734 - rspamd-3.7: [Fix] dkim_signing: siging_table: lowercase before lookup by @fatalbanana in #4737 - drop pwatches included in update: rspamd-d907a95.patch - refreshed patches to apply cleanly again: fix_missing_return.patch rspamd-conf.patch - While the fix for the logging bug was accepted into master. The 3.7.5 release uses a different solution apparently. Update patch fix_stack_smash.patch. https://github.com/rspamd/rspamd/pull/4732#issuecomment-1858255236 OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=102
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
https://bugzilla.suse.com/show_bug.cgi?id=1216830
|
|
https://github.com/rspamd/rspamd/pull/4732
|
|
|
|
The caller uses the value to size its memory allocation:
|
|
gsize niov = rspamd_log_fill_iov(NULL, now, module, id, function, level_flags, message,
|
|
mlen, rspamd_log);
|
|
struct iovec *iov = g_alloca(sizeof(struct iovec) * niov);
|
|
and that faulted on aarch64.
|
|
|
|
Index: rspamd-3.7.5/src/libserver/logger/logger.c
|
|
===================================================================
|
|
--- rspamd-3.7.5.orig/src/libserver/logger/logger.c
|
|
+++ rspamd-3.7.5/src/libserver/logger/logger.c
|
|
@@ -1046,25 +1046,7 @@ gsize rspamd_log_fill_iov(struct iovec *
|
|
gint r;
|
|
|
|
if (iov == NULL) {
|
|
- if (log_rspamadm) {
|
|
- if (logger->log_level == G_LOG_LEVEL_DEBUG) {
|
|
- return 4;
|
|
- }
|
|
- else {
|
|
- return 2; /* No time component */
|
|
- }
|
|
- }
|
|
- else if (log_systemd) {
|
|
- return 4;
|
|
- }
|
|
- else {
|
|
- if (log_color) {
|
|
- return 5;
|
|
- }
|
|
- else {
|
|
- return 4;
|
|
- }
|
|
- }
|
|
+ return 5;
|
|
}
|
|
else {
|
|
static gchar timebuf[64], modulebuf[64];
|