debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtmail: fix NULL char embedded in format string

Browse Source
This commit is contained in:
Jon Trulson
2019-10-15 21:12:17 -06:00
parent ab741a1241
commit a38f72c0c8
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
View File

@@ -3669,14 +3669,9 @@ char *
RFCMailBox::generateUniqueLockId(void) RFCMailBox::generateUniqueLockId(void)
{ {
char theId[128]; char theId[128];
char hwserialbuf[64];
#if !defined(__aix) && !defined(__hpux) && !defined(__linux__) && !defined(CSRG_BASED) snprintf(theId, sizeof(theId), "%08ld%08ld%s", (long)getpid(),
if (sysinfo(SI_HW_SERIAL, (char *)hwserialbuf, sizeof(hwserialbuf)-1) == -1) (long)time(NULL), "dtmail");
#endif
strcpy(hwserialbuf, "dtmail");
(void) sprintf(theId, "%08ld%08ld%s\0", (long)getpid(), (long)time(NULL), hwserialbuf);
assert(strlen(theId)<sizeof(theId));
return(strdup(theId)); return(strdup(theId));
} }