luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PaCheckCompressed() removed API quirkiness 

When constifying there is this inconsistent quirk in this API returning
'filename' or a malloced storage.  When special handling needs to be
made by the caller to detect this to decide if it needs a free.

This appears to done to save a strdup().

Make it always return a malloc block so the API contract is
strightforward to the caller.  A non-NULL return requires
free() by the caller.
This commit is contained in:
Darryl L. Miles 2024-10-12 08:05:28 +01:00 committed by Tim Edwards
parent e7bfa72298
commit e22e5d63b9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/flock.c
View File

@ -129,7 +129,7 @@ gzFile flock_zopen(filename, mode, is_locked, fdp)
fd = open(fname, oflag);
if (fdp != NULL) *fdp = fd;
if (fname != filename) freeMagic(fname);
freeMagic(fname);
return gzdopen(fd, mode);
}
@ -196,7 +196,7 @@ gzFile flock_zopen(filename, mode, is_locked, fdp)
done:
if (fdp != NULL) *fdp = fd;
if (fname != filename) freeMagic(fname);
freeMagic(fname);
return f;
}

11
utils/path.c
View File

@ -70,10 +70,10 @@ bool FileLocking = TRUE;
* attempting to open the file.
*
* Return value:
* The string value that resulted in a valid file descriptor.
* This is a dynamically allocated string *or* a pointer to the
* original filename; the calling routine should check and
* free if needed.
* The string value that resulted in a valid file descriptor
* (a file that could be opened using that filename).
* Return value is a dynamically allocated string the calling
* routine should free.
*
*-------------------------------------------------------------------
*/
@ -91,8 +91,7 @@ PaCheckCompressed(filename)
fd = open(gzname, O_RDONLY);
if (fd < 0)
{
freeMagic(gzname);
gzname = filename;
strcpy(gzname, filename); /* always shorter than allocation */
}
else
close(fd);