p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #14715 -- More informative ValueError for safe_join util. Thanks btubbs. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Beaven 2010-11-26 02:28:07 +00:00
parent 188324881c
commit aff9ff9bf5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/_os.py
View File

@ -41,6 +41,6 @@ def safe_join(base, *paths):
# equal to base_path). # equal to base_path).
if not final_path.startswith(base_path) \ if not final_path.startswith(base_path) \
or final_path[base_path_len:base_path_len+1] not in ('', sep): or final_path[base_path_len:base_path_len+1] not in ('', sep):
raise ValueError('the joined path is located outside of the base path' raise ValueError('The joined path (%s) is located outside of the base '
' component') 'path component (%s)' % (final_path, base_path))
return final_path return final_path