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

dthelp: coverity fixes

Browse Source
This commit is contained in:
Peter Howkins
2018-04-13 20:26:23 +01:00
parent fee6003be1
commit 9b4b82c1f0
13 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
View File

@@ -75,7 +75,7 @@ int main(argc, argv)
fprintf(stderr, "**** Specify interface file ****\n") ;
exit(TRUE) ;
}
strncpy(iffile, argv[1], IFLEN) ;
snprintf(iffile, IFLEN, "%s", argv[1]) ;
initialize() ;
while (TRUE) {
m_token = scan() ;

28
cde/programs/dthelp/parser/pass1/helptag/help.c
View File

@@ -125,7 +125,7 @@ if ( *(m_argv[0]) == '/' )
else
{
/* not fully specified, check each component of path for ourself */
strcpy(patbuf, getenv("PATH"));
snprintf(patbuf, sizeof(patbuf), "%s", getenv("PATH"));
path = patbuf;
cp = path;
@@ -822,9 +822,7 @@ if (listtype == ORDER)
switch (lastlist->lastlist->order)
{
case UROMAN:
strcpy(orderString, ROMAN100[count / 100]);
strcat(orderString, ROMAN10[(count / 10) % 10]);
strcat(orderString, ROMAN0[count % 10]);
snprintf(orderString, sizeof(orderString), "%s%s%s", ROMAN100[count / 100], ROMAN10[(count / 10) % 10], ROMAN0[count % 10]);
type = romanString;
break;
case UALPHA:
@@ -846,9 +844,7 @@ if (listtype == ORDER)
type = arabicString;
break;
case LROMAN:
strcpy(orderString, roman100[count / 100]);
strcat(orderString, roman10[(count / 10) % 10]);
strcat(orderString, roman0[count % 10]);
snprintf(orderString, sizeof(orderString), "%s%s%s", roman100[count / 100], roman10[(count / 10) % 10], roman0[count % 10]);
type = romanString;
break;
case LALPHA:
@@ -1512,11 +1508,10 @@ int execVer;
int compVer;
int isStd;
strcpy(myLocale, pLang);
snprintf(myLocale, sizeof(myLocale), "%s", pLang);
if (*pCharset)
{
strcat(myLocale, ".");
strcat(myLocale, pCharset);
snprintf(myLocale, sizeof(myLocale), "%s.%s", myLocale, pCharset);
}
if ((_DtLcxOpenAllDbs(&myDb) != 0) ||
@@ -1604,14 +1599,14 @@ else
else
strcpy(pLang, cString);
if (*charset)
if ( *charset)
{
strcpy(pCharset, charset);
mb_free(&charset);
}
else
strcpy(pCharset, isoString);
}
mb_free(&charset);
_DtLcxCloseDb(&myDb);
free(charset);
@@ -1772,9 +1767,9 @@ if (!charset)
if (dotPtr)
*dotPtr = '\0';
strcpy(stdLang, locale);
snprintf(stdLang, sizeof(stdLang), "%s", locale);
if (charset)
strcpy(stdCharset, charset);
snprintf(stdCharset, sizeof(stdCharset), "%s", charset);
SetStdLocale(stdLang, stdCharset);
if (*stdCharset)
@@ -2751,7 +2746,7 @@ if (! notehead)
}
icon = GetDefaultHeaderString(iconFile, M_SYSTEM, "");
if (*icon)
if (icon && *icon)
{
char id[32];
@@ -2762,8 +2757,8 @@ if (*icon)
fputs("CLASS=\"ICON\" SSI=\"NCW-ICON\">", outfile);
fputs("</REFITEM>\n</SNREF></HEAD>\n", outfile);
AddToSNB(id, icon);
m_free(icon, "icon name");
}
m_free(icon, "icon name");
}
@@ -2876,6 +2871,7 @@ else
}
if (try != pathbuf) mb_free(&try);
mb_free(&mb_inputname);
}
/* Below is a modified version of m_cyclent() that returns a pointer

4
cde/programs/dthelp/parser/pass1/helptag/help.if
View File

@@ -775,11 +775,11 @@ static char ident6[]="@(#) (c) Copyright 1993, 1994 Unix System Labs, Inc., a su
thisnodelevel = 2;
sprintf(id, "%s%s", sdlReservedName, glossary_string);
mb_starthelpnode("_GLOSSARY", id, thisnodelevel);
strcpy(chapstring, string) ;
if (strlen(chapstring) + 1 > sizeof(chapstring)) {
if (strlen(string) + 1 > sizeof(chapstring)) {
m_error("Program error: exceeded chapstring") ;
m_exit(TRUE) ;
}
snprintf(chapstring, sizeof(chapstring), "%s", string) ;
fputs("\nGlossary\n", stderr) ;
glossary = TRUE ;
fprintf(outfile, "<HEAD SSI=\"CHAPHEAD\">%s</HEAD>\n", string);

4
cde/programs/dthelp/parser/pass1/helptag/out.c
View File

@@ -198,7 +198,7 @@ if (bufflen == 1)
exLineNum++;
if (special[index])
{
strcpy(exbuff, special[index]);
snprintf(exbuff, sizeof(exbuff), "%s", special[index]);
bufflen = strlen(exbuff);
}
}
@@ -230,7 +230,7 @@ if (bufflen == 1)
index = (unsigned char) imbuff[0];
if (special[index])
{
strcpy(imbuff, special[index]);
snprintf(imbuff, sizeof(imbuff), "%s", special[index]);
bufflen = strlen(imbuff);
}
mb_strcode(imbuff, outfile);

3
cde/programs/dthelp/parser/pass1/util/entout.c
View File

@@ -72,8 +72,7 @@ void entout(fname)
int nameindex ;
LOGICAL start ;
strncpy(efilename, fname, ENTFILENAME) ;
strncpy(&efilename[strlen(efilename)], ".h", 2) ;
snprintf(efilename, sizeof(efilename), "%s.h", fname) ;
m_openchk(&entfile, efilename, "w") ;
fprintf(entfile, "#include \"entdef.h\"\n") ;