IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6403 from tk0miya/6402_unknown_image

Browse Source 
Fix #6402: image directive crashes by unknown image format
This commit is contained in:
Takeshi KOMIYA 2019-05-30 01:30:33 +09:00 committed by GitHub
commit 29336e6c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -130,6 +130,7 @@ Bugs fixed
* #6378: linkcheck: Send commonly used User-Agent * #6378: linkcheck: Send commonly used User-Agent
* #6387: html search: failed to search document with haiku and scrolls themes * #6387: html search: failed to search document with haiku and scrolls themes
* #6406: Wrong year is returned for ``SOURCE_DATE_EPOCH`` * #6406: Wrong year is returned for ``SOURCE_DATE_EPOCH``
* #6402: image directive crashes by unknown image format
Testing Testing
-------- --------

3
sphinx/environment/collectors/asset.py
View File

@ -100,6 +100,9 @@ class ImageCollector(EnvironmentCollector):
filename) filename)
try: try:
mimetype = guess_mimetype(filename) mimetype = guess_mimetype(filename)
if mimetype is None:
basename, suffix = path.splitext(filename)
mimetype = 'image/x-' + suffix[1:]
if mimetype not in candidates: if mimetype not in candidates:
globbed.setdefault(mimetype, []).append(new_imgpath) globbed.setdefault(mimetype, []).append(new_imgpath)
except OSError as err: except OSError as err: