diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-none.c | 4 | ||||
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | sftp-client.c | 4 |
4 files changed, 10 insertions, 7 deletions
@@ -9,6 +9,9 @@ | |||
9 | - deraadt@cvs.openbsd.org 2002/06/27 09:08:00 | 9 | - deraadt@cvs.openbsd.org 2002/06/27 09:08:00 |
10 | [monitor.c] | 10 | [monitor.c] |
11 | improve mm_zalloc check; markus ok | 11 | improve mm_zalloc check; markus ok |
12 | - deraadt@cvs.openbsd.org 2002/06/27 10:35:47 | ||
13 | [auth2-none.c monitor.c sftp-client.c] | ||
14 | use xfree() | ||
12 | 15 | ||
13 | 20020702 | 16 | 20020702 |
14 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & | 17 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & |
@@ -1217,4 +1220,4 @@ | |||
1217 | - (stevesk) entropy.c: typo in debug message | 1220 | - (stevesk) entropy.c: typo in debug message |
1218 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1221 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1219 | 1222 | ||
1220 | $Id: ChangeLog,v 1.2317 2002/07/04 00:05:06 mouring Exp $ | 1223 | $Id: ChangeLog,v 1.2318 2002/07/04 00:06:15 mouring Exp $ |
diff --git a/auth2-none.c b/auth2-none.c index 720d3c10f..c07b2dd81 100644 --- a/auth2-none.c +++ b/auth2-none.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-none.c,v 1.3 2002/06/19 00:27:55 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $"); |
27 | 27 | ||
28 | #include "auth.h" | 28 | #include "auth.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -61,7 +61,7 @@ auth2_read_banner(void) | |||
61 | close(fd); | 61 | close(fd); |
62 | 62 | ||
63 | if (n != len) { | 63 | if (n != len) { |
64 | free(banner); | 64 | xfree(banner); |
65 | return (NULL); | 65 | return (NULL); |
66 | } | 66 | } |
67 | banner[n] = '\0'; | 67 | banner[n] = '\0'; |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.20 2002/06/27 09:08:00 deraadt Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.21 2002/06/27 10:35:47 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -559,7 +559,7 @@ int mm_answer_auth2_read_banner(int socket, Buffer *m) | |||
559 | mm_request_send(socket, MONITOR_ANS_AUTH2_READ_BANNER, m); | 559 | mm_request_send(socket, MONITOR_ANS_AUTH2_READ_BANNER, m); |
560 | 560 | ||
561 | if (banner != NULL) | 561 | if (banner != NULL) |
562 | free(banner); | 562 | xfree(banner); |
563 | 563 | ||
564 | return (0); | 564 | return (0); |
565 | } | 565 | } |
diff --git a/sftp-client.c b/sftp-client.c index 10b7992d0..c797482a8 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -28,7 +28,7 @@ | |||
28 | /* XXX: copy between two remote sites */ | 28 | /* XXX: copy between two remote sites */ |
29 | 29 | ||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$OpenBSD: sftp-client.c,v 1.33 2002/06/23 09:30:14 deraadt Exp $"); | 31 | RCSID("$OpenBSD: sftp-client.c,v 1.34 2002/06/27 10:35:47 deraadt Exp $"); |
32 | 32 | ||
33 | #include "openbsd-compat/fake-queue.h" | 33 | #include "openbsd-compat/fake-queue.h" |
34 | 34 | ||
@@ -1095,7 +1095,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1095 | debug3("In write loop, ack for %u %u bytes at %llu", | 1095 | debug3("In write loop, ack for %u %u bytes at %llu", |
1096 | ack->id, ack->len, (unsigned long long)ack->offset); | 1096 | ack->id, ack->len, (unsigned long long)ack->offset); |
1097 | ++ackid; | 1097 | ++ackid; |
1098 | free(ack); | 1098 | xfree(ack); |
1099 | } | 1099 | } |
1100 | offset += len; | 1100 | offset += len; |
1101 | } | 1101 | } |