tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/02/16 14:03:43 

[session.c]
     proper payload-length check for x11 w/o screen-number
This commit is contained in:
Ben Lindstrom 2001-02-16 16:02:14 +00:00
parent 813f9402ae
commit 8dcdeb8421
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- markus@cvs.openbsd.org 2001/02/16 13:38:18
[channel.c]
remove debug
- markus@cvs.openbsd.org 2001/02/16 14:03:43
[session.c]
proper payload-length check for x11 w/o screen-number
20010216
- (bal) added '--with-prce' to allow overriding of system regex when
@ -4001,4 +4004,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.781 2001/02/16 15:56:31 mouring Exp $
$Id: ChangeLog,v 1.782 2001/02/16 16:02:14 mouring Exp $

14
session.c
View File

@ -33,7 +33,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: session.c,v 1.55 2001/02/08 19:30:52 itojun Exp $");
RCSID("$OpenBSD: session.c,v 1.56 2001/02/16 14:03:43 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@ -343,12 +343,18 @@ do_authenticated(struct passwd * pw)
s->auth_proto = packet_get_string(&proto_len);
s->auth_data = packet_get_string(&data_len);
packet_integrity_check(plen, 4 + proto_len + 4 + data_len + 4, type);
if (packet_get_protocol_flags() & SSH_PROTOFLAG_SCREEN_NUMBER)
if (packet_get_protocol_flags() & SSH_PROTOFLAG_SCREEN_NUMBER) {
debug2("SSH_PROTOFLAG_SCREEN_NUMBER == true");
packet_integrity_check(plen,
4 + proto_len + 4 + data_len + 4, type);
s->screen = packet_get_int();
else
} else {
debug2("SSH_PROTOFLAG_SCREEN_NUMBER == false");
packet_integrity_check(plen,
4 + proto_len + 4 + data_len, type);
s->screen = 0;
}
s->display = x11_create_display_inet(s->screen, options.x11_display_offset);
if (s->display == NULL)