Attachment 58 Details for Bug 196 – Fix for id clobbering

[patch] Fix for id clobbering

sftp-ack-fix.diff (text/plain), 1.03 KB, created by Damien Miller on 2002-04-02 11:30:06 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2002-04-02 11:30:06 AEST

Size: 1.03 KB

patch

obsolete

>Index: sftp-client.c
>===================================================================
>RCS file: /var/cvs/openssh/sftp-client.c,v
>retrieving revision 1.28
>diff -u -r1.28 sftp-client.c
>--- sftp-client.c	22 Mar 2002 02:54:25 -0000	1.28
>+++ sftp-client.c	2 Apr 2002 01:27:21 -0000
>@@ -1065,10 +1065,12 @@
> 
> 		if (id == startid || len == 0 ||
> 		    id - ackid >= conn->num_requests) {
>+		    	u_int r_id;
>+
> 			buffer_clear(&msg);
> 			get_msg(conn->fd_in, &msg);
> 			type = buffer_get_char(&msg);
>-			id = buffer_get_int(&msg);
>+			r_id = buffer_get_int(&msg);
> 
> 			if (type != SSH2_FXP_STATUS)
> 				fatal("Expected SSH2_FXP_STATUS(%d) packet, "
>@@ -1079,11 +1081,11 @@
> 
> 			/* Find the request in our queue */
> 			for(ack = TAILQ_FIRST(&acks);
>-			    ack != NULL && ack->id != id;
>+			    ack != NULL && ack->id != r_id;
> 			    ack = TAILQ_NEXT(ack, tq))
> 				;
> 			if (ack == NULL)
>-				fatal("Can't find request for ID %d", id);
>+				fatal("Can't find request for ID %d", r_id);
> 			TAILQ_REMOVE(&acks, ack, tq);
> 
> 			if (status != SSH2_FX_OK) {

Actions: View | Diff

Attachments on bug 196: 58