public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2831 from fcassin/develop 

Protect against a null atext value in cloneAText
pull/2851/head
John McLear 2015-12-01 17:50:29 +00:00
parent 16bb28a0ff 2bd698343a
commit f44c444720
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node/db/Pad.js
View File

@ -188,7 +188,12 @@ Pad.prototype.getInternalRevisionAText = function getInternalRevisionAText(targe
db.getSub("pad:"+_this.id+":revs:"+keyRev, ["meta", "atext"], function(err, _atext) db.getSub("pad:"+_this.id+":revs:"+keyRev, ["meta", "atext"], function(err, _atext)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
try {
atext = Changeset.cloneAText(_atext); atext = Changeset.cloneAText(_atext);
} catch (e) {
return callback(e);
}
callback(); callback();
}); });
}, },

4
src/static/js/Changeset.js
View File

@ -1628,10 +1628,12 @@ exports.applyToAText = function (cs, atext, pool) {
* @param atext {AText} * @param atext {AText}
*/ */
exports.cloneAText = function (atext) { exports.cloneAText = function (atext) {
if (atext) {
return { return {
text: atext.text, text: atext.text,
attribs: atext.attribs attribs: atext.attribs
}; }
} else exports.error("atext is null");
}; };
/** /**