mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 11:35:53 +00:00
Code Issues 30 Releases Wiki Activity

Safely join paths in staticfiles finder.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-01-02 01:31:55 +00:00
parent 9c950db518
commit e45d1e2dac
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/staticfiles/finders.py
View File

@ -6,6 +6,7 @@ from django.core.files.storage import default_storage, Storage, FileSystemStorag
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
from django.utils.functional import memoize, LazyObject from django.utils.functional import memoize, LazyObject
from django.utils.importlib import import_module from django.utils.importlib import import_module
from django.utils._os import safe_join
from django.contrib.staticfiles import utils from django.contrib.staticfiles import utils
from django.contrib.staticfiles.storage import AppStaticStorage from django.contrib.staticfiles.storage import AppStaticStorage
@ -83,7 +84,7 @@ class FileSystemFinder(BaseFinder):
if not path.startswith(prefix): if not path.startswith(prefix):
return None return None
path = path[len(prefix):] path = path[len(prefix):]
path = os.path.join(root, path) path = safe_join(root, path)
if os.path.exists(path): if os.path.exists(path):
return path return path