oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

update_walk: fix unsafe readlink() usage

This commit is contained in:
Max Kellermann 2012-09-03 22:41:04 +02:00
parent acaa725478
commit 27535a7f78
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -17,6 +17,7 @@ ver 0.17.2 (2012/??/??)
* playlist: fix memory leak * playlist: fix memory leak
* state_file: save song priorities * state_file: save song priorities
* player: disable cross-fading in "single" mode * player: disable cross-fading in "single" mode
* update: fix unsafe readlink() usage
ver 0.17.1 (2012/07/31) ver 0.17.1 (2012/07/31)

12
src/update_walk.c
View File

@ -283,12 +283,20 @@ skip_symlink(const struct directory *directory, const char *utf8_name)
return true; return true;
char buffer[MPD_PATH_MAX]; char buffer[MPD_PATH_MAX];
ssize_t ret = readlink(path_fs, buffer, sizeof(buffer)); ssize_t length = readlink(path_fs, buffer, sizeof(buffer));
g_free(path_fs); g_free(path_fs);
if (ret < 0) if (length < 0)
/* don't skip if this is not a symlink */ /* don't skip if this is not a symlink */
return errno != EINVAL; return errno != EINVAL;
if ((size_t)length >= sizeof(buffer))
/* skip symlinks when the buffer is too small for the
link target */
return true;
/* null-terminate the buffer, because readlink() will not */
buffer[length] = 0;
if (!follow_inside_symlinks && !follow_outside_symlinks) { if (!follow_inside_symlinks && !follow_outside_symlinks) {
/* ignore all symlinks */ /* ignore all symlinks */
return true; return true;