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

dtudcfonted: Resolve further coverity issues

Browse Source
This commit is contained in:
Peter Howkins
2018-03-30 22:09:47 +01:00
parent e507de959e
commit e195df4b50
20 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtudcfonted/libfal/_fallcCT.c
View File

@@ -413,7 +413,7 @@ _fallcParseCharSet(charset)
if (charset->name) {
charset->xrm_name = falrmStringToQuark(charset->name);
strcpy(buf, charset->name);
snprintf(buf, sizeof(buf), "%s", charset->name);
if (ptr = strchr(buf, ':'))
*ptr = '\0';
charset->xrm_encoding_name = falrmStringToQuark(buf);

8
cde/programs/dtudcfonted/libfal/_fallcDB.c
View File

@@ -478,7 +478,7 @@ static int
append_value_list()
{
char **value_list = parse_info.value;
char *value;
char *value = NULL;
int value_num = parse_info.value_num;
int value_len = parse_info.value_len;
char *str = parse_info.buf;
@@ -533,9 +533,9 @@ append_value_list()
if(value_list){
Xfree((char **)value_list);
}
if(value){
Xfree(value);
}
Xfree(value);
parse_info.value = (char **)NULL;
parse_info.value_num = 0;
parse_info.value_len = 0;

2
cde/programs/dtudcfonted/libfal/_fallcDefConv.c
View File

@@ -271,6 +271,8 @@ create_conv(methods)
if (conv == NULL)
return (XlcConv) NULL;
conv->state = NULL;
state = (State) Xmalloc(sizeof(StateRec));
if (state == NULL)
goto err;

4
cde/programs/dtudcfonted/libfal/_fallcFile.c
View File

@@ -289,10 +289,10 @@ _fallcResolveLocaleName(lc_name, full_name, language, territory, codeset)
}
if(name != NULL){
strcpy(buf, name);
snprintf(buf, sizeof(buf), "%s", name);
Xfree(name);
}else{
strcpy(buf, lc_name);
snprintf(buf, sizeof(buf), "%s", lc_name);
}
if(full_name != NULL){
strcpy(full_name, buf);

2
cde/programs/dtudcfonted/libfal/_fallcGenConv.c
View File

@@ -1489,7 +1489,7 @@ mbtocs(conv, from, from_left, to, to_left, args, num_args)
XlcSide side;
CodeSet codeset = NULL;
XlcCharSet charset;
XlcCharSet charset = NULL;
ParseInfo parse_info;
XPointer p;

2
cde/programs/dtudcfonted/libfal/_fallcGeneric.c
View File

@@ -546,7 +546,7 @@ XLCdGenericPart *gen;
Xfree(charsetd->encoding_name);
}
*/
tmp = (char *)Xmalloc(strlen(value[0]+1));
tmp = (char *)Xmalloc(strlen(value[0]) + 1);
strcpy(tmp,value[0]);
charsetd->encoding_name = tmp;
charsetd->xrm_encoding_name =

2
cde/programs/dtudcfonted/libfal/_falomGeneric.c
View File

@@ -726,7 +726,7 @@ parse_omit_name(oc, font_data, pattern)
}
}
strcpy(buf, pattern);
snprintf(buf, sizeof(buf), "%s", pattern);
length = strlen(pattern);
last = buf + length - 1;
if (length > 1 && *last == '*' && *(last - 1) == '-') {

4
cde/programs/dtudcfonted/libfal/_faludcInf.c
View File

@@ -331,6 +331,7 @@ char *charsetname;
if( !_fallcCompareISOLatin1(font_data[i].name,charset_str)){
for(k=0;k<font_data[i].scopes_num;k++){
if( gi_to_vgi(gi,vgi,&(font_data[i].scopes[k])) == True){
XFree(font_data);
return(True);
}
}
@@ -341,6 +342,7 @@ char *charsetname;
free_fontdata(font_data);
*/
*vgi = gi;
XFree(font_data);
return(True);
}
@@ -607,12 +609,14 @@ char *charsetname;
for(k=0;k<font_data[i].scopes_num;k++){
if( vgi_to_gi(glyph,vglyph,&(font_data[i].scopes[k])) == True){
strcpy(charsetname,font_data[i].name);
XFree(font_data);
return(True);
}
}
}
}
*glyph = vglyph;
XFree(font_data);
return(True);
}
int

3
cde/programs/dtudcfonted/libfal/falfont.c
View File

@@ -274,6 +274,7 @@ int lockflag;
fal_utyerror = _FAL_OPEN_ER;
fal_utyderror = errno;
fal_utyerrno |= (FAL_FUNCNUM_OPNFNT<<8) ;
close( fd );
return (FalFontID)FAL_ERROR;
}
} else {
@@ -3086,7 +3087,7 @@ unsigned int *glidx ;
return FAL_ERROR;
}
GETCHARSETSTR( char_set, tmp_data.xlfdname ) ;
strcpy( charset_name, char_set ) ;
snprintf( charset_name, sizeof(charset_name), "%s", char_set ) ;
}
/*

1
cde/programs/dtudcfonted/libfal/readpcf.c
View File

@@ -848,6 +848,7 @@ FalFontData *databuff ;
}else{
set_errfile_str( fal_err_file, finf->fname ) ;
fal_utyerrno = FAL_ERR_PROP_FNAME ;
free(fnt);
return( _FAL_TRY_NEXT ) ;
}