jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UTF-8: send 0 as 256 during encoding too. 

0 is valid UTF-8, but in order to avoid WebSockets framing, we
encode/decode it as 256.

Also, be tolerant of 0 length messages.
This commit is contained in:
Joel Martin 2010-07-14 16:57:02 -05:00
parent d798572da4
commit 754e0c0bee
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/vnc.js
View File

@ -1135,10 +1135,17 @@ clientCutText: function (text) {
encode_message: function(arr) {
if (RFB.b64encode) {
/* base64 encode */
RFB.SQ = RFB.SQ + Base64.encode(arr);
} else {
/* UTF-8 encode. 0 -> 256 to avoid WebSockets framing */
RFB.SQ = RFB.SQ + arr.map(function (num) {
return String.fromCharCode(num); } ).join('');
if (num === 0) {
return String.fromCharCode(256);
} else {
return String.fromCharCode(num);
}
} ).join('');
}
},
@ -1146,9 +1153,10 @@ decode_message: function(data) {
var raw, i, length, RQ = RFB.RQ;
//Util.Debug(">> decode_message: " + data);
if (RFB.b64encode) {
/* base64 decode */
RFB.RQ = RFB.RQ.concat(Base64.decode(data, 0));
} else {
// A bit faster in firefox
/* UTF-8 decode. 256 -> 0 to WebSockets framing */
length = data.length;
for (i=0; i < length; i += 1) {
RQ.push(data.charCodeAt(i) % 256);
@ -1162,7 +1170,11 @@ recv_message: function(e) {
try {
RFB.decode_message(e.data);
RFB.handle_message();
if (RFB.RQ.length > 0) {
RFB.handle_message();
} else {
Util.Debug("Ignoring empty message");
}
} catch (exc) {
if (typeof exc.stack !== 'undefined') {
Util.Warn("recv_message, caught exception: " + exc.stack);