Skip to content

Fix DoRequestSuccess and DoRequestFailure, Add regress test #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ejohnstown merged 1 commit into from
Apr 23, 2026
+28 −13
Merged

Fix DoRequestSuccess and DoRequestFailure, Add regress test #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6578,16 +6578,11 @@ static int DoIgnore(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)

static int DoRequestSuccess(WOLFSSH *ssh, byte *buf, word32 len, word32 *idx)
{
word32 dataSz;
word32 begin = *idx;
int ret=WS_SUCCESS;

WOLFSSH_UNUSED(ssh);
WOLFSSH_UNUSED(len);

WLOG(WS_LOG_DEBUG, "DoRequestSuccess, *idx=%d, len=%d", *idx, len);
ato32(buf + begin, &dataSz);
begin += LENGTH_SZ + dataSz;
begin += len;

if (ssh->ctx->reqSuccessCb != NULL)
ret = ssh->ctx->reqSuccessCb(ssh, &(buf[*idx]), len, ssh->reqSuccessCtx);
Expand All @@ -6599,16 +6594,11 @@ static int DoRequestSuccess(WOLFSSH *ssh, byte *buf, word32 len, word32 *idx)

static int DoRequestFailure(WOLFSSH *ssh, byte *buf, word32 len, word32 *idx)
{
word32 dataSz;
word32 begin = *idx;
int ret = WS_SUCCESS;

WOLFSSH_UNUSED(ssh);
WOLFSSH_UNUSED(len);

WLOG(WS_LOG_DEBUG, "DoRequestFalure, *idx=%d, len=%d", *idx, len);
ato32(buf + begin, &dataSz);
begin += LENGTH_SZ + dataSz;
WLOG(WS_LOG_DEBUG, "DoRequestFailure, *idx=%d, len=%d", *idx, len);
begin += len;

if (ssh->ctx->reqFailureCb != NULL)
ret = ssh->ctx->reqFailureCb(ssh, &(buf[*idx]), len, ssh->reqFailureCtx);
Expand Down
25 changes: 25 additions & 0 deletions tests/regress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,6 +1489,30 @@ static void TestGlobalRequestFwdCancelWithCbSendsSuccess(void)

FreeChannelOpenHarness(&harness);
}

/* Verify DoRequestSuccess correctly consumes a uint32 port payload (RFC 4254
* §4) without treating it as a length prefix, which would overrun the buffer
* and produce WS_BUFFER_E. */
static void TestRequestSuccessWithPortParsesCorrectly(void)
{
ChannelOpenHarness harness;
byte payload[UINT32_SZ];
byte in[64];
word32 inSz;
word32 idx = 0;
int ret;

idx = AppendUint32(payload, sizeof(payload), idx, 2222);
inSz = WrapPacket(MSGID_REQUEST_SUCCESS, payload, idx, in, sizeof(in));

InitChannelOpenHarness(&harness, in, inSz);

ret = DoReceive(harness.ssh);

AssertIntEQ(ret, WS_SUCCESS);

FreeChannelOpenHarness(&harness);
}
#endif

#ifdef WOLFSSH_AGENT
Expand Down Expand Up @@ -2121,6 +2145,7 @@ int main(int argc, char** argv)
TestGlobalRequestFwdWithCbSendsSuccess();
TestGlobalRequestFwdCancelNoCbSendsFailure();
TestGlobalRequestFwdCancelWithCbSendsSuccess();
TestRequestSuccessWithPortParsesCorrectly();
#endif
#ifdef WOLFSSH_AGENT
TestAgentChannelNullAgentSendsOpenFail();
Expand Down
Loading