b356e1
diff --git a/babel/localedata.py b/babel/localedata.py
b356e1
index 4b6d3b6..080b723 100644
b356e1
--- a/babel/localedata.py
b356e1
+++ b/babel/localedata.py
b356e1
@@ -13,6 +13,8 @@
b356e1
 """
b356e1
 
b356e1
 import os
b356e1
+import re
b356e1
+import sys
b356e1
 import threading
b356e1
 from collections import MutableMapping
b356e1
 from itertools import chain
b356e1
@@ -33,6 +35,7 @@ def get_base_dir():
b356e1
 _cache = {}
b356e1
 _cache_lock = threading.RLock()
b356e1
 _dirname = os.path.join(get_base_dir(), 'locale-data')
b356e1
+_windows_reserved_name_re = re.compile("^(con|prn|aux|nul|com[0-9]|lpt[0-9])$", re.I)
b356e1
 
b356e1
 
b356e1
 def normalize_locale(name):
b356e1
@@ -49,6 +52,22 @@ def normalize_locale(name):
b356e1
             return locale_id
b356e1
 
b356e1
 
b356e1
+def resolve_locale_filename(name):
b356e1
+    """
b356e1
+    Resolve a locale identifier to a `.dat` path on disk.
b356e1
+    """
b356e1
+
b356e1
+    # Clean up any possible relative paths.
b356e1
+    name = os.path.basename(name)
b356e1
+
b356e1
+    # Ensure we're not left with one of the Windows reserved names.
b356e1
+    if sys.platform == "win32" and _windows_reserved_name_re.match(os.path.splitext(name)[0]):
b356e1
+        raise ValueError("Name %s is invalid on Windows" % name)
b356e1
+
b356e1
+    # Build the path.
b356e1
+    return os.path.join(_dirname, '%s.dat' % name)
b356e1
+
b356e1
+
b356e1
 def exists(name):
b356e1
     """Check whether locale data is available for the given locale.
b356e1
 
b356e1
@@ -60,7 +79,7 @@ def exists(name):
b356e1
         return False
b356e1
     if name in _cache:
b356e1
         return True
b356e1
-    file_found = os.path.exists(os.path.join(_dirname, '%s.dat' % name))
b356e1
+    file_found = os.path.exists(resolve_locale_filename(name))
b356e1
     return True if file_found else bool(normalize_locale(name))
b356e1
 
b356e1
 
b356e1
@@ -102,6 +121,7 @@ def load(name, merge_inherited=True):
b356e1
     :raise `IOError`: if no locale data file is found for the given locale
b356e1
                       identifer, or one of the locales it inherits from
b356e1
     """
b356e1
+    name = os.path.basename(name)
b356e1
     _cache_lock.acquire()
b356e1
     try:
b356e1
         data = _cache.get(name)
b356e1
@@ -119,7 +139,7 @@ def load(name, merge_inherited=True):
b356e1
                     else:
b356e1
                         parent = '_'.join(parts[:-1])
b356e1
                 data = load(parent).copy()
b356e1
-            filename = os.path.join(_dirname, '%s.dat' % name)
b356e1
+            filename = resolve_locale_filename(name)
b356e1
             with open(filename, 'rb') as fileobj:
b356e1
                 if name != 'root' and merge_inherited:
b356e1
                     merge(data, pickle.load(fileobj))
b356e1
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
b356e1
index 3599b21..173e7a3 100644
b356e1
--- a/tests/test_localedata.py
b356e1
+++ b/tests/test_localedata.py
b356e1
@@ -11,12 +11,18 @@
b356e1
 # individuals. For the exact contribution history, see the revision
b356e1
 # history and logs, available at http://babel.edgewall.org/log/.
b356e1
 
b356e1
+import os
b356e1
+import pickle
b356e1
+import sys
b356e1
+import tempfile
b356e1
 import unittest
b356e1
 import random
b356e1
 from operator import methodcaller
b356e1
 import sys
b356e1
 
b356e1
-from babel import localedata, numbers
b356e1
+import pytest
b356e1
+
b356e1
+from babel import localedata, Locale, UnknownLocaleError, numbers
b356e1
 
b356e1
 class MergeResolveTestCase(unittest.TestCase):
b356e1
 
b356e1
@@ -117,3 +123,33 @@ def test_locale_argument_acceptance():
b356e1
     assert normalized_locale == None
b356e1
     locale_exist = localedata.exists(['en_us', None])
b356e1
     assert locale_exist == False
b356e1
+
b356e1
+def test_locale_name_cleanup():
b356e1
+    """
b356e1
+    Test that locale identifiers are cleaned up to avoid directory traversal.
b356e1
+    """
b356e1
+    no_exist_name = os.path.join(tempfile.gettempdir(), "babel%d.dat" % random.randint(1, 99999))
b356e1
+    with open(no_exist_name, "wb") as f:
b356e1
+        pickle.dump({}, f)
b356e1
+
b356e1
+    try:
b356e1
+        name = os.path.splitext(os.path.relpath(no_exist_name, localedata._dirname))[0]
b356e1
+    except ValueError:
b356e1
+        if sys.platform == "win32":
b356e1
+            pytest.skip("unable to form relpath")
b356e1
+        raise
b356e1
+
b356e1
+    assert not localedata.exists(name)
b356e1
+    with pytest.raises(IOError):
b356e1
+        localedata.load(name)
b356e1
+    with pytest.raises(UnknownLocaleError):
b356e1
+        Locale(name)
b356e1
+
b356e1
+
b356e1
+@pytest.mark.skipif(sys.platform != "win32", reason="windows-only test")
b356e1
+def test_reserved_locale_names():
b356e1
+    for name in ("con", "aux", "nul", "prn", "com8", "lpt5"):
b356e1
+        with pytest.raises(ValueError):
b356e1
+            localedata.load(name)
b356e1
+        with pytest.raises(ValueError):
b356e1
+            Locale(name)