MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 22:55:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved mcrec corrupt file handling.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-03-03 15:14:08 -08:00
parent 248e1054a4
commit 3eacf00ea5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mcrec.js
View File

@ -63,7 +63,15 @@ function createIndex(state, ptr) {
state.lastIndex += 10; state.lastIndex += 10;
} }
function processBlock(state, block) { function processBlock(state, block, err) {
if (err != null) {
// Error reading the next block, exit now.
fs.close(state.recFile, function () {
for (var i in state) { delete state[i]; } // Clear the state.
log("Error.");
});
return;
}
if (block == null) { if (block == null) {
// We are done, close this file. // We are done, close this file.
writeIndex(state, function () { writeIndex(state, function () {
@ -254,13 +262,14 @@ function readNextBlock(state, func) {
if ((state.recFilePtr + 16) > state.recFileSize) { func(state, null); return; } if ((state.recFilePtr + 16) > state.recFileSize) { func(state, null); return; }
var r = {}, buf = Buffer.alloc(16); var r = {}, buf = Buffer.alloc(16);
fs.read(state.recFile, buf, 0, 16, state.recFilePtr, function (err, bytesRead, buf) { fs.read(state.recFile, buf, 0, 16, state.recFilePtr, function (err, bytesRead, buf) {
if (bytesRead != 16) { func(state, null, true); return; } // Error
r.type = buf.readInt16BE(0); r.type = buf.readInt16BE(0);
r.flags = buf.readInt16BE(2); r.flags = buf.readInt16BE(2);
r.size = buf.readInt32BE(4); r.size = buf.readInt32BE(4);
r.time = buf.readIntBE(8, 8); r.time = buf.readIntBE(8, 8);
r.date = new Date(r.time); r.date = new Date(r.time);
r.ptr = state.recFilePtr; r.ptr = state.recFilePtr;
if ((state.recFilePtr + 16 + r.size) > state.recFileSize) { func(state, null); return; } if ((state.recFilePtr + 16 + r.size) > state.recFileSize) { func(state, null, true); return; } // Error
if (r.size == 0) { if (r.size == 0) {
r.data = null; r.data = null;
func(state, r); func(state, r);