Merge remote-tracking branch 'origin/develop' into develop

2017-11-06 18:02:44 +00:00 · 2017-11-06 18:02:44 +00:00 · afc9c36e4e
parent 16771cac4f 17ae37bd3b
commit afc9c36e4e
1 changed files with 1 additions and 1 deletions
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@ -208,7 +208,7 @@ const sanitizeHtmlParams = {
            // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
            // because transformTags is used _before_ we filter by allowedSchemesByTag and
            // we don't want to allow images with `https?` `src`s.
-            if (!attribs.src.startsWith('mxc://')) {
+            if (!attribs.src || !attribs.src.startsWith('mxc://')) {
                return { tagName, attribs: {}};
            }
            attribs.src = MatrixClientPeg.get().mxcUrlToHttp(