From 1266e5222769187a1dfddd323b690e1b2b2d131d Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 4 Jun 2008 15:32:40 +0200 Subject: [PATCH] notify_email plugin: Replace all sprintf's with ssnprintf's. Some other buffer handling has been improved, too. --- src/notify_email.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/notify_email.c b/src/notify_email.c index f6c628e1..3d35f870 100644 --- a/src/notify_email.c +++ b/src/notify_email.c @@ -92,7 +92,7 @@ static void monitor_cb (const char *buf, int buflen, int writing, void *arg) { char log_str[MAXSTRING]; - strncpy(log_str, buf, buflen); + sstrncpy (log_str, buf, sizeof (log_str)); if (buflen > 2) log_str[buflen - 2] = 0; /* replace \n with \0 */ @@ -115,7 +115,9 @@ static int notify_email_init() smtp_set_monitorcb (session, monitor_cb, NULL, 1); smtp_set_hostname (session, hostname_g); - sprintf(server, "%s:%i", smtp_host == NULL ? DEFAULT_SMTP_HOST : smtp_host, smtp_port); + ssnprintf(server, sizeof (server), "%s:%i", + (smtp_host == NULL) ? DEFAULT_SMTP_HOST : smtp_host, + smtp_port); smtp_set_server (session, server); if (smtp_user && smtp_password) { @@ -205,26 +207,28 @@ static int notify_email_notification (const notification_t *n) struct tm timestamp_tm; char timestamp_str[64]; - char severity[MAXSTRING]; + char severity[32]; char subject[MAXSTRING]; char buf[4096] = ""; int buf_len = sizeof (buf); int i; - sprintf (severity, "%s", + ssnprintf (severity, sizeof (severity), "%s", (n->severity == NOTIF_FAILURE) ? "FAILURE" : ((n->severity == NOTIF_WARNING) ? "WARNING" : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN"))); - sprintf (subject, smtp_subject == NULL ? DEFAULT_SMTP_SUBJECT : smtp_subject, severity, n->host); + ssnprintf (subject, sizeof (subject), + (smtp_subject == NULL) ? DEFAULT_SMTP_SUBJECT : smtp_subject, + severity, n->host); localtime_r (&n->time, ×tamp_tm); strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S", ×tamp_tm); timestamp_str[sizeof (timestamp_str) - 1] = '\0'; /* Let's make RFC822 message text with \r\n EOLs */ - snprintf (buf, buf_len, + ssnprintf (buf, buf_len, "MIME-Version: 1.0\r\n" "Content-Type: text/plain;\r\n" "Content-Transfer-Encoding: 8bit\r\n" -- 2.11.0