diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | recording.c | 14 | ||||
| -rw-r--r-- | recording.h | 4 |
4 files changed, 18 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 2a346191..d88e93f0 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -552,6 +552,8 @@ Helmut Auer <vdr@helmutauer.de> for separating the 'install' target into several individual targets for reporting a problem with scrolling with Up/Down in case there are non-selectable items at the beginning of the menu + for a patch that was used to implement stopping scanning the video directory if + there are too many levels of symbolic links Jeremy Hall <jhall@UU.NET> for fixing an incomplete initialization of the filter parameters in eit.c @@ -4323,3 +4323,6 @@ Video Disk Recorder Revision History Skawina). - The "Back" key now restores the original string when pressed while editing a string item (suggested by Markus Hahn). +- Now stopping scanning the video directory if there are too many levels of + symbolic links, which might indicate a recursive link loop (based on a patch + from Helmut Auer). diff --git a/recording.c b/recording.c index e7efba0b..67a92b0f 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.134 2006/02/05 12:34:08 kls Exp $ + * $Id: recording.c 1.135 2006/02/12 11:34:19 kls Exp $ */ #include "recording.h" @@ -58,6 +58,8 @@ #define MAX_SUBTITLE_LENGTH 40 +#define MAX_LINK_LEVEL 6 + bool VfatFileSystem = false; cRecordings DeletedRecordings(true); @@ -811,7 +813,7 @@ void cRecordings::Refresh(bool Foreground) ScanVideoDir(VideoDirectory, Foreground); } -void cRecordings::ScanVideoDir(const char *DirName, bool Foreground) +void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel) { cReadDir d(DirName); struct dirent *e; @@ -821,7 +823,13 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground) asprintf(&buffer, "%s/%s", DirName, e->d_name); struct stat st; if (stat(buffer, &st) == 0) { + int Link = 0; if (S_ISLNK(st.st_mode)) { + if (LinkLevel > MAX_LINK_LEVEL) { + isyslog("max link level exceeded - not scanning %s", buffer); + continue; + } + Link = 1; char *old = buffer; buffer = ReadLink(old); free(old); @@ -849,7 +857,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground) delete r; } else - ScanVideoDir(buffer, Foreground); + ScanVideoDir(buffer, Foreground, LinkLevel + Link); } } free(buffer); diff --git a/recording.h b/recording.h index 7eaddcc3..334e7469 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 1.49 2006/01/20 17:18:28 kls Exp $ + * $Id: recording.h 1.50 2006/02/12 11:34:34 kls Exp $ */ #ifndef __RECORDING_H @@ -104,7 +104,7 @@ private: int state; const char *UpdateFileName(void); void Refresh(bool Foreground = false); - void ScanVideoDir(const char *DirName, bool Foreground = false); + void ScanVideoDir(const char *DirName, bool Foreground = false, int LinkLevel = 0); protected: void Action(void); public: |