diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:19:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:19:55 +1100 |
commit | 6c81fee693038de7d4a5559043350391db2a2761 (patch) | |
tree | e09e17a18e8556e3b2276b280fa2cd2f2c465f90 /sftp-client.c | |
parent | 690d989008e18af3603a5e03f1276c9bad090370 (diff) |
- djm@cvs.openbsd.org 2013/11/08 00:39:15
[auth-options.c auth2-chall.c authfd.c channels.c cipher-3des1.c]
[clientloop.c gss-genr.c monitor_mm.c packet.c schnorr.c umac.c]
[sftp-client.c sftp-glob.c]
use calloc for all structure allocations; from markus@
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sftp-client.c b/sftp-client.c index 91955262c..542af8b18 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.107 2013/10/17 00:30:13 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.108 2013/11/08 00:39:15 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -477,7 +477,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int print_flag, | |||
477 | 477 | ||
478 | if (dir) { | 478 | if (dir) { |
479 | ents = 0; | 479 | ents = 0; |
480 | *dir = xmalloc(sizeof(**dir)); | 480 | *dir = xcalloc(1, sizeof(**dir)); |
481 | (*dir)[0] = NULL; | 481 | (*dir)[0] = NULL; |
482 | } | 482 | } |
483 | 483 | ||
@@ -551,7 +551,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int print_flag, | |||
551 | 551 | ||
552 | if (dir) { | 552 | if (dir) { |
553 | *dir = xrealloc(*dir, ents + 2, sizeof(**dir)); | 553 | *dir = xrealloc(*dir, ents + 2, sizeof(**dir)); |
554 | (*dir)[ents] = xmalloc(sizeof(***dir)); | 554 | (*dir)[ents] = xcalloc(1, sizeof(***dir)); |
555 | (*dir)[ents]->filename = xstrdup(filename); | 555 | (*dir)[ents]->filename = xstrdup(filename); |
556 | (*dir)[ents]->longname = xstrdup(longname); | 556 | (*dir)[ents]->longname = xstrdup(longname); |
557 | memcpy(&(*dir)[ents]->a, a, sizeof(*a)); | 557 | memcpy(&(*dir)[ents]->a, a, sizeof(*a)); |
@@ -570,7 +570,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int print_flag, | |||
570 | /* Don't return partial matches on interrupt */ | 570 | /* Don't return partial matches on interrupt */ |
571 | if (interrupted && dir != NULL && *dir != NULL) { | 571 | if (interrupted && dir != NULL && *dir != NULL) { |
572 | free_sftp_dirents(*dir); | 572 | free_sftp_dirents(*dir); |
573 | *dir = xmalloc(sizeof(**dir)); | 573 | *dir = xcalloc(1, sizeof(**dir)); |
574 | **dir = NULL; | 574 | **dir = NULL; |
575 | } | 575 | } |
576 | 576 | ||
@@ -1143,7 +1143,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, | |||
1143 | (unsigned long long)offset, | 1143 | (unsigned long long)offset, |
1144 | (unsigned long long)offset + buflen - 1, | 1144 | (unsigned long long)offset + buflen - 1, |
1145 | num_req, max_req); | 1145 | num_req, max_req); |
1146 | req = xmalloc(sizeof(*req)); | 1146 | req = xcalloc(1, sizeof(*req)); |
1147 | req->id = conn->msg_id++; | 1147 | req->id = conn->msg_id++; |
1148 | req->len = buflen; | 1148 | req->len = buflen; |
1149 | req->offset = offset; | 1149 | req->offset = offset; |
@@ -1512,7 +1512,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1512 | strerror(errno)); | 1512 | strerror(errno)); |
1513 | 1513 | ||
1514 | if (len != 0) { | 1514 | if (len != 0) { |
1515 | ack = xmalloc(sizeof(*ack)); | 1515 | ack = xcalloc(1, sizeof(*ack)); |
1516 | ack->id = ++id; | 1516 | ack->id = ++id; |
1517 | ack->offset = offset; | 1517 | ack->offset = offset; |
1518 | ack->len = len; | 1518 | ack->len = len; |