summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 23:43:12 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 23:43:12 +0000
commit0fb8a20a11c9adccc5d77b0bed61c8b883b60b13 (patch)
treea4df0a12d408ab9feabb089807651b3edea30cd9 /media
parentfac4eb73dea5edd8b9351d29a1856d9ecee9c35e (diff)
downloadchromium_src-0fb8a20a11c9adccc5d77b0bed61c8b883b60b13.zip
chromium_src-0fb8a20a11c9adccc5d77b0bed61c8b883b60b13.tar.gz
chromium_src-0fb8a20a11c9adccc5d77b0bed61c8b883b60b13.tar.bz2
Fix abspath/normpath mixup in security check.
Standarizes the security check and the input sanitizer to use abspath. Currently causing tests to fail on the bots. BUG=109320 TEST=Ran server with relative path. Review URL: http://codereview.chromium.org/9113027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rwxr-xr-xmedia/tools/constrained_network_server/cns.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tools/constrained_network_server/cns.py b/media/tools/constrained_network_server/cns.py
index 835ecdb..4f0198d 100755
--- a/media/tools/constrained_network_server/cns.py
+++ b/media/tools/constrained_network_server/cns.py
@@ -297,8 +297,8 @@ def ParseArgs():
except ValueError:
parser.error('Invalid port range specified.')
- # Normalize the path to remove any . or ..
- options.www_root = os.path.normpath(options.www_root)
+ # Convert the path to an absolute to remove any . or ..
+ options.www_root = os.path.abspath(options.www_root)
return options