mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-22 14:39:24 -05:00
A major purpose of PuTTY's memory-allocation functions is to succeed or die
trying, so there's no need to check their return values for NULL. Spotted by Ben Rudiak-Gould. [originally from svn r5978]
This commit is contained in:
parent
b400397f69
commit
93712a3ee1
2
pscp.c
2
pscp.c
@ -213,8 +213,6 @@ int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
|
|||||||
if (pendsize < pendlen + len) {
|
if (pendsize < pendlen + len) {
|
||||||
pendsize = pendlen + len + 4096;
|
pendsize = pendlen + len + 4096;
|
||||||
pending = sresize(pending, pendsize, unsigned char);
|
pending = sresize(pending, pendsize, unsigned char);
|
||||||
if (!pending)
|
|
||||||
fatalbox("Out of memory");
|
|
||||||
}
|
}
|
||||||
memcpy(pending + pendlen, p, len);
|
memcpy(pending + pendlen, p, len);
|
||||||
pendlen += len;
|
pendlen += len;
|
||||||
|
8
ssh.c
8
ssh.c
@ -1652,8 +1652,6 @@ static unsigned char *ssh2_mpint_fmt(Bignum b, int *len)
|
|||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
int i, n = (bignum_bitcount(b) + 7) / 8;
|
int i, n = (bignum_bitcount(b) + 7) / 8;
|
||||||
p = snewn(n + 1, unsigned char);
|
p = snewn(n + 1, unsigned char);
|
||||||
if (!p)
|
|
||||||
fatalbox("out of memory");
|
|
||||||
p[0] = 0;
|
p[0] = 0;
|
||||||
for (i = 1; i <= n; i++)
|
for (i = 1; i <= n; i++)
|
||||||
p[i] = bignum_byte(b, n - i);
|
p[i] = bignum_byte(b, n - i);
|
||||||
@ -2657,8 +2655,6 @@ static const char *connect_to_host(Ssh ssh, char *host, int port,
|
|||||||
const char *err;
|
const char *err;
|
||||||
|
|
||||||
ssh->savedhost = snewn(1 + strlen(host), char);
|
ssh->savedhost = snewn(1 + strlen(host), char);
|
||||||
if (!ssh->savedhost)
|
|
||||||
fatalbox("Out of memory");
|
|
||||||
strcpy(ssh->savedhost, host);
|
strcpy(ssh->savedhost, host);
|
||||||
|
|
||||||
if (port < 0)
|
if (port < 0)
|
||||||
@ -3011,8 +3007,6 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
|
|||||||
s->len = (hostkey.bytes > servkey.bytes ? hostkey.bytes : servkey.bytes);
|
s->len = (hostkey.bytes > servkey.bytes ? hostkey.bytes : servkey.bytes);
|
||||||
|
|
||||||
s->rsabuf = snewn(s->len, unsigned char);
|
s->rsabuf = snewn(s->len, unsigned char);
|
||||||
if (!s->rsabuf)
|
|
||||||
fatalbox("Out of memory");
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Verify the host key.
|
* Verify the host key.
|
||||||
@ -3024,8 +3018,6 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
|
|||||||
int len = rsastr_len(&hostkey);
|
int len = rsastr_len(&hostkey);
|
||||||
char fingerprint[100];
|
char fingerprint[100];
|
||||||
char *keystr = snewn(len, char);
|
char *keystr = snewn(len, char);
|
||||||
if (!keystr)
|
|
||||||
fatalbox("Out of memory");
|
|
||||||
rsastr_fmt(keystr, &hostkey);
|
rsastr_fmt(keystr, &hostkey);
|
||||||
rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey);
|
rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user