39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From c7b21bfbcd41205d93492a792c973643c94d3079 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@cryptomilk.org>
|
|
Date: Wed, 3 Jun 2020 10:05:51 +0200
|
|
Subject: [PATCH 2/4] sftpserver: Add missing return check for
|
|
ssh_buffer_add_data()
|
|
|
|
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
|
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
|
|
---
|
|
src/sftpserver.c | 11 ++++++++---
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/sftpserver.c b/src/sftpserver.c
|
|
index b639a2c..9117f15 100644
|
|
--- a/src/sftpserver.c
|
|
+++ b/src/sftpserver.c
|
|
@@ -73,9 +73,14 @@ sftp_client_message sftp_get_client_message(sftp_session sftp) {
|
|
return NULL;
|
|
}
|
|
|
|
- ssh_buffer_add_data(msg->complete_message,
|
|
- ssh_buffer_get(payload),
|
|
- ssh_buffer_get_len(payload));
|
|
+ rc = ssh_buffer_add_data(msg->complete_message,
|
|
+ ssh_buffer_get(payload),
|
|
+ ssh_buffer_get_len(payload));
|
|
+ if (rc < 0) {
|
|
+ ssh_set_error_oom(session);
|
|
+ sftp_client_message_free(msg);
|
|
+ return NULL;
|
|
+ }
|
|
|
|
ssh_buffer_get_u32(payload, &msg->id);
|
|
|
|
--
|
|
2.23.0
|
|
|