old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

fixed a fd leak and a bad memory access bug 

SVN revision: 13914
This commit is contained in:
Tilman Sauerbeck 2005-03-26 11:46:49 +00:00
parent 8c67d3f039
commit 80d218bca7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/loaders/loader_zlib.c
View File

@ -67,22 +67,28 @@ char load (ImlibImage *im, ImlibProgressFunction progress,
{
ImlibLoader *loader;
int src, dest;
char *file, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
char *file, *p, tmp[] = "/tmp/imlib2_loader_zlib-XXXXXX";
struct stat st;
assert (im);
/* we'll need a copy of it later */
file = im->real_file;
/* check that this file ends in *.gz */
p = strrchr(im->real_file, '.');
if (p) {
if (strcasecmp(p + 1, "gz"))
return 0;
} else
return 0;
if (stat (im->real_file, &st) < 0)
return 0;
if ((dest = mkstemp (tmp)) < 0)
return 0;
if ((src = open (im->real_file, O_RDONLY)) < 0) {
unlink (tmp);
return 0;
}
if ((dest = mkstemp (tmp)) < 0) {
close (src);
return 0;
}
@ -96,12 +102,15 @@ char load (ImlibImage *im, ImlibProgressFunction progress,
return 0;
}
/* remember the original filename */
file = strdup (im->real_file);
free (im->real_file);
im->real_file = strdup (tmp);
loader->load (im, progress, progress_granularity, immediate_load);
free (im->real_file);
im->real_file = strdup (file);
im->real_file = file;
unlink (tmp);
return 1;