Merge pull request #524 from kanaka/bug/tight-buffer-overread

Fix buffer over-reads in handle_tight

2 files changed, 5 insertions, 1 deletions

diff --git a/include/rfb.js b/include/rfb.js
index b7a811d..b45537c 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1782,8 +1782,8 @@ var RFB;
                 return dest;
             }.bind(this);
 
-            var rQ = this._sock.get_rQ();
             var rQi = this._sock.get_rQi();
+            var rQ = this._sock.rQwhole();
             var cmode, data;
             var cl_header, cl_data;
 
diff --git a/include/websock.js b/include/websock.js
index 61d9467..892238b 100644
--- a/include/websock.js
+++ b/include/websock.js
@@ -154,6 +154,10 @@ function Websock() {
             this._rQi += len;
         },
 
+        rQwhole: function () {
+            return new Uint8Array(this._rQ.buffer, 0, this._rQlen);
+        },
+
         rQslice: function (start, end) {
             if (end) {
                 return new Uint8Array(this._rQ.buffer, this._rQi + start, end - start);