libssh2/backport-Skip-leading-r-and-n-characters-in-banner_receive-76.patch
renmingshuai 094d32ebc3 backport some upstream patches
(cherry picked from commit 495b3e6ae9e25b1e305daed917b41dd1578d6002)
2023-03-30 10:08:09 +08:00

34 lines
925 B
Diff

From 821d50dad313b53fb2782f26aec1f52f1be34fc0 Mon Sep 17 00:00:00 2001
From: Michael Buckley <michael@buckleyisms.com>
Date: Wed, 9 Nov 2022 15:56:22 -0800
Subject: [PATCH] Skip leading \r and \n characters in banner_receive() (#769)
Fixes #768
Credit:
Michael Buckley
Conflict:NA
Reference:https://github.com/libssh2/commit/821d50dad313b53fb2782f26aec1f52f1be34fc0
---
src/session.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/session.c b/src/session.c
index 3549152..235ab95 100644
--- a/src/session.c
+++ b/src/session.c
@@ -147,6 +147,10 @@ banner_receive(LIBSSH2_SESSION * session)
return LIBSSH2_ERROR_SOCKET_DISCONNECT;
}
+ if((c == '\r' || c == '\n') && banner_len == 0) {
+ continue;
+ }
+
if(c == '\0') {
/* NULLs are not allowed in SSH banners */
session->banner_TxRx_state = libssh2_NB_state_idle;
--
2.23.0