diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-09 15:10:53 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-09 15:10:53 +0100 |
| commit | c458b122eff6a26d9a8704a20ae64dcf922c28c3 (patch) | |
| tree | b2cef30f8886930ad9f006865e6801dfddea548d /lib/python/Plugins/Extensions | |
| parent | c0ecfb78c4aa1beb6c0a525c5bf9ac3653bd46ae (diff) | |
| download | enigma2-c458b122eff6a26d9a8704a20ae64dcf922c28c3.tar.gz enigma2-c458b122eff6a26d9a8704a20ae64dcf922c28c3.zip | |
refuse to operate on /, do not iterate into list of mountpoints, do not endlessly recurse into the same directory
Diffstat (limited to 'lib/python/Plugins/Extensions')
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 485dfe32..3e023841 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -659,12 +659,16 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB def copyDirectory(self, directory, recursive = True): print "copyDirectory", directory - filelist = FileList(directory, useServiceRef = True, isTop = True) + if directory == '/': + print "refusing to operate on /" + return + filelist = FileList(directory, useServiceRef = True, showMountpoints = False, isTop = True) for x in filelist.getFileList(): if x[0][1] == True: #isDir if recursive: - self.copyDirectory(x[0][0]) + if x[0][0] != directory: + self.copyDirectory(x[0][0]) elif filelist.getServiceRef() and filelist.getServiceRef().type == 4097: self.playlist.addFile(x[0][0]) self.playlist.updateList() |