Differences From Artifact [997c49a87b]:

• File ssh.c — part of check-in [51b9f5b532] at 2001-01-29 07:19:59 on branch trunk — Remove a segfault in bombout() macro: don't sk_close() the socket if it's already NULL. The `Incorrect MAC' problem was causing ssh2_rdpkt to bombout(), setting s to NULL, and then a secondary bombout() was happening at the next level up, causing a segfault. (user: simon size: 102501)

To Artifact [2b9ebb5c8d]:

• File ssh.c — part of check-in [edd16e834d] at 2001-01-29 08:30:59 on branch trunk — Prevent duplicate sk_close() calls on the same socket when the connection dies unexpectedly (CONNABORTED / CONNRESET) (user: simon size: 102524)

1149
1150
1151
1152
1153
1154
1155

1156
1157
1158

1159
1160

1161
1162
1163
1164
1165
1166
1167

1149
1150
1151
1152
1153
1154
1155
1156
1157
1158

1159


1160
1161
1162
1163
1164
1165
1166
1167

+


-
+
-
-
+

    crFinishV;
}

static int ssh_receive(Socket skt, int urgent, char *data, int len) {
    if (urgent==3) {
        /* A socket error has occurred. */
        ssh_state = SSH_STATE_CLOSED;
        sk_close(s);
        s = NULL;
        connection_fatal(data);
        len = 0;
        return 0;
    }
    if (!len) {
    } else if (!len) {
	/* Connection has closed. */
	ssh_state = SSH_STATE_CLOSED;
	sk_close(s);
	s = NULL;
	return 0;
    }
    ssh_gotdata (data, len);