Merge branch '3.x' into 7774_remove_develop.rst

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/test_environment.py b/tests/test_environment.py
index 7290eb6a0..9791c2d5b 100644
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@@ -4,16 +4,17 @@
 
     Test the BuildEnvironment class.
 
-    :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
 import shutil
+
 import pytest
 
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.builders.latex import LaTeXBuilder
-from sphinx.environment import CONFIG_OK, CONFIG_CHANGED, CONFIG_EXTENSIONS_CHANGED, CONFIG_NEW
+from sphinx.environment import CONFIG_CHANGED, CONFIG_EXTENSIONS_CHANGED, CONFIG_NEW, CONFIG_OK
 from sphinx.testing.comparer import PathComparer
 
 
@@ -137,6 +138,11 @@ def test_env_relfn2path(app):
     assert relfn == '../logo.jpg'
     assert absfn == app.srcdir.parent / 'logo.jpg'
 
+    # relative path traversal
+    relfn, absfn = app.env.relfn2path('subdir/../logo.jpg', 'index')
+    assert relfn == 'logo.jpg'
+    assert absfn == app.srcdir / 'logo.jpg'
+
     # omit docname (w/ current docname)
     app.env.temp_data['docname'] = 'subdir/document'
     relfn, absfn = app.env.relfn2path('images/logo.jpg')