frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed following symbolic links in RemoveFileOrDir() (cont'd)

Browse Source
This commit is contained in:
Klaus Schmidinger
2010-10-24 11:33:46 +02:00
parent 12870faf87
commit 208b703e5b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@@ -740,6 +740,7 @@ Steffen Barszus <st_barszus@gmx.de>
or Makefile.config as defaults
for helping to debug a crash when using the --terminal option without having access
to the given terminal
for fixing following symbolic links in RemoveFileOrDir()
Peter Seyringer <e9425234@student.tuwien.ac.at>
for reporting a bug in saving the polarization parameter of channels that have a

2
HISTORY
View File

@@ -6484,3 +6484,5 @@ Video Disk Recorder Revision History
2010-10-24: Version 1.7.17
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
Steffen Barszus).

8
tools.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: tools.c 2.8 2010/08/29 15:03:08 kls Exp $
* $Id: tools.c 2.9 2010/10/24 11:32:27 kls Exp $
*/
#include "tools.h"
@@ -368,7 +368,7 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
cString buffer = AddDirectory(FileName, e->d_name);
if (FollowSymlinks) {
struct stat st2;
if (stat(buffer, &st2) == 0) {
if (lstat(buffer, &st2) == 0) {
if (S_ISLNK(st2.st_mode)) {
int size = st2.st_size + 1;
char *l = MALLOC(char, size);
@@ -377,14 +377,12 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
if (errno != EINVAL)
LOG_ERROR_STR(*buffer);
}
else if (n < size) {
else {
l[n] = 0;
dsyslog("removing %s", l);
if (remove(l) < 0)
LOG_ERROR_STR(l);
}
else
esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
free(l);
}
}