From: Jon Trulson <jon@radscan.com>
Date: Wed, 16 Oct 2019 03:12:17 +0000 (-0600)
Subject: dtmail: fix NULL char embedded in format string
X-Git-Tag: 2.3.1~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a38f72c0c838001bbdccd1567ce77ac01d14bff8;p=oweals%2Fcde.git

dtmail: fix NULL char embedded in format string
---

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
index 9afb24d8..8e91838b 100644
--- a/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
@@ -3669,14 +3669,9 @@ char *
 RFCMailBox::generateUniqueLockId(void)
 {
   char theId[128];
-  char hwserialbuf[64];
 
-#if !defined(__aix) && !defined(__hpux) && !defined(__linux__) && !defined(CSRG_BASED)
-  if (sysinfo(SI_HW_SERIAL, (char *)hwserialbuf, sizeof(hwserialbuf)-1) == -1)
-#endif
-    strcpy(hwserialbuf, "dtmail");
-  (void) sprintf(theId, "%08ld%08ld%s\0", (long)getpid(), (long)time(NULL), hwserialbuf);
-  assert(strlen(theId)<sizeof(theId));
+  snprintf(theId, sizeof(theId), "%08ld%08ld%s", (long)getpid(),
+           (long)time(NULL), "dtmail");
   return(strdup(theId));
 }