Merge remote-tracking branch 'origin/master' into webcrypto

2018-09-02 10:07:57 +02:00
parent 30b7be0781 d66800b8ce
commit b191e2c437
8 changed files with 4 additions and 67 deletions
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -3092,7 +3092,7 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) {
            for (var i = 0; i < $head.length; ++i) {
                newDoc.write($head[i].outerHTML);
            }
-            newDoc.write('</head><body><pre>' + DOMPurify.sanitize(paste) + '</pre></body></html>');
+            newDoc.write('</head><body><pre>' + DOMPurify.sanitize($('<div />').text(paste).html()) + '</pre></body></html>');
            newDoc.close();
        }