mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let libFLAC handle symlinks on metadata handling 

Without this commit, libFLAC happily overwrites symlinks with
a new file. With this patch, it tries to follow the symlink,
and fails if it points to another filesystem (i.e. when rename
doesn't work)
This commit is contained in:
Martijn van Beurden 2024-08-30 17:55:20 +02:00
parent 348b3a449f
commit 685f4f69d1
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libFLAC/metadata_iterators.c
View File

@ -1525,8 +1525,10 @@ static FLAC__bool chain_rewrite_file_(FLAC__Metadata_Chain *chain, const char *t
/* move the tempfile on top of the original */
(void)fclose(f);
if(!transport_tempfile_(chain->filename, &tempfile, &tempfilename, &status))
if(!transport_tempfile_(chain->filename, &tempfile, &tempfilename, &status)) {
chain->status = get_equivalent_status_(status);
return false;
}
return true;
@ -3475,6 +3477,41 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem
}
#endif
#ifndef _WIN32
/* Need to check whether filename refers to a symlink or not */
{
struct stat filestat;
if(lstat(filename, &filestat) != 0) {
cleanup_tempfile_(tempfile, tempfilename);
*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR;
return false;
}
if(S_ISLNK(filestat.st_mode)) {
/* file is symlink, find out name of symlinked file */
char linked_name[1024];
ssize_t len = readlink(filename, linked_name, sizeof(linked_name) - 1);
if (len == sizeof(linked_name) - 1) {
/* name too long */
cleanup_tempfile_(tempfile, tempfilename);
*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR;
return false;
}
linked_name[len] = '\0';
if(0 != flac_rename(*tempfilename, linked_name)) {
cleanup_tempfile_(tempfile, tempfilename);
*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR;
return false;
}
return true;
}
/* else, continue with normale code */
}
#endif
/*@@@ to fully support the tempfile_path_prefix we need to update this piece to actually copy across filesystems instead of just flac_rename(): */
if(0 != flac_rename(*tempfilename, filename)) {
cleanup_tempfile_(tempfile, tempfilename);