Attachment 1071 Details for Bug 1131 – Apparent fix for bug 1131 against openssh-4.3p2.

Apparent fix for bug 1131 against openssh-4.3p2.

bug1131-patch.txt (text/plain), 1.80 KB, created by Cove Schneider on 2006-02-16 05:56:10 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cove Schneider

Created: 2006-02-16 05:56:10 AEDT

Size: 1.80 KB

patch

obsolete

>*** channels.c.orig	2006-02-14 17:15:47.000000000 -0800
>--- channels.c	2006-02-15 10:32:06.000000000 -0800
>***************
>*** 450,463 ****
>  	for (i = 0; i < channels_alloc; i++) {
>  		c = channels[i];
>  		if (c != NULL && c->type == SSH_CHANNEL_OPEN) {
>! #if 0
>! 			if (!compat20 &&
>! 			    buffer_len(&c->input) > packet_get_maxsize()) {
>  				debug2("channel %d: big input buffer %d",
>  				    c->self, buffer_len(&c->input));
>  				return 0;
>  			}
>- #endif
>  			if (buffer_len(&c->output) > packet_get_maxsize()) {
>  				debug2("channel %d: big output buffer %u > %u",
>  				    c->self, buffer_len(&c->output),
>--- 450,460 ----
>  	for (i = 0; i < channels_alloc; i++) {
>  		c = channels[i];
>  		if (c != NULL && c->type == SSH_CHANNEL_OPEN) {
>! 			if (buffer_len(&c->input) > packet_get_maxsize()) {
>  				debug2("channel %d: big input buffer %d",
>  				    c->self, buffer_len(&c->input));
>  				return 0;
>  			}
>  			if (buffer_len(&c->output) > packet_get_maxsize()) {
>  				debug2("channel %d: big output buffer %u > %u",
>  				    c->self, buffer_len(&c->output),
>*** serverloop.c.orig	2006-02-14 17:15:21.000000000 -0800
>--- serverloop.c	2006-02-15 10:31:22.000000000 -0800
>***************
>*** 274,284 ****
>  	channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0);
>  
>  	if (compat20) {
>! #if 0
>! 		/* wrong: bad condition XXX */
>! 		if (channel_not_very_much_buffered_data())
>! #endif
>! 		FD_SET(connection_in, *readsetp);
>  	} else {
>  		/*
>  		 * Read packets from the client unless we have too much
>--- 274,284 ----
>  	channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0);
>  
>  	if (compat20) {
>! 		if (channel_not_very_much_buffered_data()) {
>! 			FD_SET(connection_in, *readsetp);
>! 		} else {
>! 			FD_ZERO(*readsetp);
>! 		}
>  	} else {
>  		/*
>  		 * Read packets from the client unless we have too much

Actions: View

Attachments on bug 1131: 1071 | 1072 | 1092 | 1095 | 1100 | 1103 | 1113 | 1114 | 1115 | 1116 | 1117