libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity

dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad

Browse source
This commit is contained in:
John McLear 2013-02-12 23:23:44 +00:00
parent 14dca92692
commit 086132de66
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/ImportHtml.js
View file

@ -29,7 +29,6 @@ function setPadHTML(pad, html, callback)
// by several orders of magnitude. // by several orders of magnitude.
pad.setText(""); pad.setText("");
var padText = pad.text(); var padText = pad.text();
// Parse the incoming HTML with jsdom // Parse the incoming HTML with jsdom
var doc = jsdom(html.replace(/>\n+</g, '><')); var doc = jsdom(html.replace(/>\n+</g, '><'));
apiLogger.debug('html:'); apiLogger.debug('html:');
@ -38,8 +37,15 @@ function setPadHTML(pad, html, callback)
// Convert a dom tree into a list of lines and attribute liens // Convert a dom tree into a list of lines and attribute liens
// using the content collector object // using the content collector object
var cc = contentcollector.makeContentCollector(true, null, pad.pool); var cc = contentcollector.makeContentCollector(true, null, pad.pool);
try{ // we use a try here because if the HTML is bad it will blow up
cc.collectContent(doc.childNodes[0]); cc.collectContent(doc.childNodes[0]);
}catch(e){
apiLogger.warn("HTML was not properly formed", e);
return; // We don't process the HTML because it was bad..
}
var result = cc.finish(); var result = cc.finish();
apiLogger.debug('Lines:'); apiLogger.debug('Lines:');
var i; var i;
for (i = 0; i < result.lines.length; i += 1) for (i = 0; i < result.lines.length; i += 1)