From 446ef9a1b994bee69921bc331aa3e10725b2c31d Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Tue, 31 Aug 2010 22:22:22 -0500
Subject: [PATCH] Issue #15 - rfb.js: wait for security type list.

Apparently the virtualbox VNC server send the size and then the
security type list in separate frames so we need to wait for the full
list.
---
 include/rfb.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/rfb.js b/include/rfb.js
index 49b7f55..d3f3dfd 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -678,6 +678,11 @@ init_msg = function() {
     case 'Security' :
         if (rfb_version >= 3.7) {
             num_types = rQ[rQi++];
+            if (rQlen() < num_types) {
+                rQi--;
+                Util.Debug("   waiting for security types");
+                return;
+            }
             if (num_types === 0) {
                 strlen = rQshift32();
                 reason = rQshiftStr(strlen);
@@ -702,7 +707,7 @@ init_msg = function() {
             send_array([rfb_auth_scheme]);
         } else {
             if (rQlen() < 4) {
-                updateState('failed', "Invalid security frame");
+                Util.Debug("   waiting for security scheme bytes");
                 return;
             }
             rfb_auth_scheme = rQshift32();
@@ -717,7 +722,7 @@ init_msg = function() {
         switch (rfb_auth_scheme) {
             case 0:  // connection failed
                 if (rQlen() < 4) {
-                    //Util.Debug("   waiting for auth reason bytes");
+                    Util.Debug("   waiting for auth reason bytes");
                     return;
                 }
                 strlen = rQshift32();
@@ -734,7 +739,7 @@ init_msg = function() {
                     return;
                 }
                 if (rQlen() < 16) {
-                    //Util.Debug("   waiting for auth challenge bytes");
+                    Util.Debug("   waiting for auth challenge bytes");
                     return;
                 }
                 challenge = rQshiftBytes(16);