Changeset 76779 in vbox for trunk/src/VBox/RDP/client-1.8.4/cssp.c

Timestamp:

Jan 11, 2019 2:44:34 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128107

Message:

RDP: add client-1.8.4.
bugref:9356: Update rdesktop-vrdp to 1.8.4
client-1.8.4 is a Subversion copy of 1.8.3 with the upstream 1.8.3 to 1.8.4
patch applied and a couple of fixes and changes after review, namely:

• Stopped disabling the new pointer data format for our build, as this is no

longer needed.

• Adjusted some snprintf buffers to make GCC happy.

Location:

trunk/src/VBox/RDP/client-1.8.4

Files:

• . (copied) (copied from trunk/src/VBox/RDP/client-1.8.3 )
• cssp.c (modified) (4 diffs)

trunk/src/VBox/RDP/client-1.8.4/cssp.c

@@ -658 +658 @@
         int length;
         int tagval;
+        struct stream packet;
 
         s = tcp_recv(NULL, 4);
@@ -683 +684 @@
         // receive the remainings of message
         s = tcp_recv(s, length);
+        packet = *s;
 
 #if WITH_DEBUG_CREDSSP
@@ -699 +701 @@
             tagval != (BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 0))
                 return False;
+
+        if (!s_check_rem(s, length))
+        {
+                 rdp_protocol_error("cssp_read_tsrequest(), consume of version from stream would overrun",
+                                    &packet);
+        }
         in_uint8s(s, length);
 
@@ -720 +728 @@
                         return False;
 
-                token->end = token->p = token->data;
+                if (!s_check_rem(s, length))
+                {
+                        rdp_protocol_error("cssp_read_tsrequest(), consume of token from stream would overrun",
+                                           &packet);
+                }
+
+                s_realloc(token, length);
+                s_reset(token);
                 out_uint8p(token, s->p, length);
                 s_mark_end(token);