e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Valgrindings. 

SVN revision: 11113
This commit is contained in:
Kim Woelders 2004-07-30 20:46:35 +00:00
parent cb55e9df95
commit 496bbf4001
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/config.c
View File

@ -2452,13 +2452,13 @@ Config_ImageClass(FILE * ConfigFile)
/* This function will load an ImageClass off disk */
char s[FILEPATH_LEN_MAX];
char s1[FILEPATH_LEN_MAX];
char s2[FILEPATH_LEN_MAX];
int i1;
ImageClass *ic = 0;
ImageState *ICToRead = 0;
ColorModifierClass *cm = 0;
int fields;;
int l, r, t, b;
while (GetLine(s, sizeof(s), ConfigFile))
{
@ -2476,10 +2476,9 @@ Config_ImageClass(FILE * ConfigFile)
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(_("CONFIG: missing required data in \"%s\"\n"), s);
}
Alert(_("CONFIG: missing required data in \"%s\"\n"), s);
}
switch (i1)
{
case CONFIG_CLOSE:
@ -2488,18 +2487,14 @@ Config_ImageClass(FILE * ConfigFile)
return;
case ICLASS_LRTB:
{
char s3[FILEPATH_LEN_MAX];
char s4[FILEPATH_LEN_MAX];
char s5[FILEPATH_LEN_MAX];
ICToRead->border = Emalloc(sizeof(Imlib_Border));
sscanf(s, "%4000s %4000s %4000s %4000s %4000s", s1, s2, s3,
s4, s5);
ICToRead->border->left = atoi(s2);
ICToRead->border->right = atoi(s3);
ICToRead->border->top = atoi(s4);
ICToRead->border->bottom = atoi(s5);
l = r = t = b = 0;
sscanf(s, "%*s %i %i %i %i", &l, &r, &t, &b);
ICToRead->border->left = l;
ICToRead->border->right = r;
ICToRead->border->top = t;
ICToRead->border->bottom = b;
/* Hmmm... imlib2 works better with this */
ICToRead->border->right++;
ICToRead->border->bottom++;
@ -2544,16 +2539,12 @@ Config_ImageClass(FILE * ConfigFile)
break;
case ICLASS_PADDING:
{
char s3[FILEPATH_LEN_MAX];
char s4[FILEPATH_LEN_MAX];
char s5[FILEPATH_LEN_MAX];
sscanf(s, "%4000s %4000s %4000s %4000s %4000s", s1, s2, s3,
s4, s5);
ic->padding.left = atoi(s2);
ic->padding.right = atoi(s3);
ic->padding.top = atoi(s4);
ic->padding.bottom = atoi(s5);
l = r = t = b = 0;
sscanf(s, "%*s %i %i %i %i", &l, &r, &t, &b);
ic->padding.left = l;
ic->padding.right = r;
ic->padding.top = t;
ic->padding.bottom = b;
}
break;
case CONFIG_CLASSNAME:

7
src/theme.c
View File

@ -92,7 +92,7 @@ append_merge_dir(char *dir, char ***list, int *count)
char s[FILEPATH_LEN_MAX], ss[FILEPATH_LEN_MAX];
char **str = NULL, *def = NULL;
char already, *tmp, *tmp2;
int i, j, num;
int i, j, num, len;
str = E_ls(dir, &num);
if (!str)
@ -120,8 +120,11 @@ append_merge_dir(char *dir, char ***list, int *count)
if (!strcmp(str[i], "DEFAULT"))
{
if (readlink(ss, s, sizeof(s)) > 0)
memset(s, 0, sizeof(s));
len = readlink(ss, s, sizeof(s) - 1);
if (len > 0)
{
s[len] = '\0'; /* Redundant due to memset */
if (s[0] == '/')
def = Estrdup(s);
else