Fix sphinx-doc#4070: crashes when the warning message contains format…

… strings
BogusCurry · Sep 24, 2017 · a455ffc · a455ffc
1 parent 6b7e33a
commit a455ffc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -34,6 +34,7 @@ Bugs fixed
 * #4049: Fix typo in output of sphinx-build -h
 * #4062: hashlib.sha1() must take bytes, not unicode on Python 3
 * Avoid indent after index entries in latex (refs: #4066)
+* #4070: crashes when the warning message contains format strings
 
 
 Testing

diff --git a/sphinx/util/logging.py b/sphinx/util/logging.py
@@ -356,10 +356,11 @@ def filter(self, record):
             return True
         elif self.app.warningiserror:
             location = getattr(record, 'location', '')
+            message = record.msg.replace('%', '%%')
             if location:
-                raise SphinxWarning(location + ":" + record.msg % record.args)
+                raise SphinxWarning(location + ":" + message % record.args)
             else:
-                raise SphinxWarning(record.msg % record.args)
+                raise SphinxWarning(message % record.args)
         else:
             return True