Skip to content
Snippets Groups Projects
Commit ade54a34 authored by rswindell's avatar rswindell
Browse files

Use truncsp() for extra embedded-null protection: JS String.trim() does not

treat NULs as white-space.
parent 81011ec1
Branches
Tags
No related merge requests found
...@@ -67,10 +67,10 @@ function read(fname) ...@@ -67,10 +67,10 @@ function read(fname)
return false; return false;
var obj = { comment:[], cols:0, rows:0, ice_color:false }; var obj = { comment:[], cols:0, rows:0, ice_color:false };
obj.title = file.read(35).trim(); obj.title = truncsp(file.read(35));
obj.author = file.read(20).trim(); obj.author = truncsp(file.read(20));
obj.group = file.read(20).trim(); obj.group = truncsp(file.read(20));
obj.date = file.read(8).trim(); obj.date = truncsp(file.read(8));
obj.filesize = file.readBin(4); obj.filesize = file.readBin(4);
obj.datatype = file.readBin(1); obj.datatype = file.readBin(1);
obj.filetype = file.readBin(1); obj.filetype = file.readBin(1);
...@@ -105,7 +105,7 @@ function read(fname) ...@@ -105,7 +105,7 @@ function read(fname)
while(comments--) { while(comments--) {
var line = file.read(defs.comment_length); var line = file.read(defs.comment_length);
if(line) if(line)
obj.comment.push(line.trimRight()); obj.comment.push(truncsp(line));
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment