From b241414cda82cd1f7a833f7ce6afe3cea16814e5 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 6 Apr 2014 16:48:40 -0600
Subject: [PATCH] AttachArea.C: NULL is not 0, sprintf needs a format

---
 cde/programs/dtmail/dtmail/AttachArea.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cde/programs/dtmail/dtmail/AttachArea.C b/cde/programs/dtmail/dtmail/AttachArea.C
index 7f1c21ea..c4848173 100644
--- a/cde/programs/dtmail/dtmail/AttachArea.C
+++ b/cde/programs/dtmail/dtmail/AttachArea.C
@@ -663,7 +663,7 @@ AttachArea::addAttachment(
 	buffer = new char[s.st_size + 1];
 
 	if (!buffer) {
-	    sprintf(buf, 
+            sprintf(buf, "%s",
 		    GETMSG(DT_catd, 3, 36, "Unable to allocate memory."));
             helpId = DTMAILHELPNOALLOCMEM;
 	    answer = this->handleErrorDialog(GETMSG(DT_catd, 1, 83, "Mailer"), 
@@ -1471,7 +1471,7 @@ AttachArea::undeleteLastDeletedAttachment(
 
     Attachment *tmpAttachment;
     Attachment **list;
-    time_t time_deleted = NULL, tmpTime = NULL;
+    time_t time_deleted = 0, tmpTime = 0;
     int i;
 
     if (_deleteCount == 0) {
-- 
2.25.1