From 0d8de3dad35216726d6f2e0b5fe333b2b7aa6d10 Mon Sep 17 00:00:00 2001 From: Benoit Giannangeli Date: Fri, 17 Mar 2017 10:34:43 +0100 Subject: Fixed bad string length undump --- src/lundump.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/lundump.js') diff --git a/src/lundump.js b/src/lundump.js index 70adbec..7452c43 100644 --- a/src/lundump.js +++ b/src/lundump.js @@ -48,6 +48,10 @@ class BytecodeParser { return integer; } + readSize_t() { + return this.readInteger(); + } + peekInt() { return this.dataView.getInt32(this.offset, true); } @@ -71,10 +75,10 @@ class BytecodeParser { } read8bitString(n) { - let size = typeof n !== 'undefined' ? n : this.readByte() - 1; + let size = typeof n !== 'undefined' ? n : Math.max(this.readByte() - 1, 0); - if (size === 0xFF) // TODO: test - this.offset += this.size_tSize; + if (size + 1 === 0xFF) + size = this.readSize_t() - 1; if (size === 0) { return null; @@ -89,10 +93,10 @@ class BytecodeParser { } readString(n) { - let size = typeof n !== 'undefined' ? n : this.readByte() - 1; + let size = typeof n !== 'undefined' ? n : Math.max(this.readByte() - 1, 0); - if (size === 0xFF) // TODO: test - this.offset += this.size_tSize; + if (size + 1 === 0xFF) + size = this.readSize_t() - 1; if (size === 0) { return null; -- cgit v1.2.3-54-g00ecf