walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix small memory error (tried to free argv); use basename and dirname 

correctly (they can modify their arguments).
This commit is contained in:
Patrick Lam 2005-11-01 05:52:28 +00:00
parent e77c17184a
commit d6946c1a11
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-10-31 Patrick Lam <plam@mit.edu>
* fc-cat/fc-cat.c (FcCacheFileRead, main):
* src/fcfreetype.c (FcFreeTypeQuery):
Fix small memory error (tried to free argv); use basename and
dirname correctly (they can modify their arguments).
2005-10-31 Patrick Lam <plam@mit.edu> 2005-10-31 Patrick Lam <plam@mit.edu>
* fc-cat/fc-cat.c: * fc-cat/fc-cat.c:
* src/fccache.c: * src/fccache.c:

4
fc-cat/fc-cat.c
View File

@ -198,13 +198,11 @@ FcCacheFileRead (FcFontSet * set, FcStrSet *dirs, char * dir, char *cache_file)
goto bail1; goto bail1;
close(fd); close(fd);
free (cache_file);
return FcTrue; return FcTrue;
bail1: bail1:
close (fd); close (fd);
bail: bail:
free (cache_file);
return FcFalse; return FcFalse;
} }
@ -327,7 +325,7 @@ main (int argc, char **argv)
i = 1; i = 1;
#endif #endif
if (FcCacheFileRead (fs, dirs, dirname (argv[i]), argv[i])) if (FcCacheFileRead (fs, dirs, dirname (strdup(argv[i])), argv[i]))
FcCachePrintSet (fs, dirs, argv[i]); FcCachePrintSet (fs, dirs, argv[i]);
FcStrSetDestroy (dirs); FcStrSetDestroy (dirs);

2
src/fcfreetype.c
View File

@ -1288,7 +1288,7 @@ FcFreeTypeQuery (const FcChar8 *file,
printf ("Saving unique fullname %s\n", full); printf ("Saving unique fullname %s\n", full);
} }
if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)file))) if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)FcStrCopy(file))))
goto bail1; goto bail1;
FcPatternAddFullFname (pat, (const char *)file); FcPatternAddFullFname (pat, (const char *)file);