Bernhard Wiedemann
a039ffc796
- fix_stack_smash.patch: upstream rework of logging doesn't allocate enough memory for an array (bsc#1216830) OBS-URL: https://build.opensuse.org/request/show/1132062 OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=99
39 lines
797 B
Diff
39 lines
797 B
Diff
Index: rspamd-3.7.4/src/libserver/logger/logger.c
|
|
===================================================================
|
|
--- rspamd-3.7.4.orig/src/libserver/logger/logger.c
|
|
+++ rspamd-3.7.4/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 3; /* No time component */
|
|
- }
|
|
- }
|
|
- else if (log_systemd) {
|
|
- return 3;
|
|
- }
|
|
- else {
|
|
- if (log_color) {
|
|
- return 5;
|
|
- }
|
|
- else {
|
|
- return 4;
|
|
- }
|
|
- }
|
|
+ return 5;
|
|
}
|
|
else {
|
|
static gchar timebuf[64], modulebuf[64];
|
|
@@ -1197,4 +1179,4 @@ gsize rspamd_log_fill_iov(struct iovec *
|
|
return niov;
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|