WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #222 from ejohnstown/maintenance-rxtx 

Maintenance: RX/TX
pull/230/head
JacobBarthelmeh 2019-12-05 15:03:15 -07:00 committed by GitHub
parent 185acf388d b9ca9824b2
commit bbb778002a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal.c
View File

@ -1448,6 +1448,10 @@ int wolfSSH_SendPacket(WOLFSSH* ssh)
case WS_CBIO_ERR_CONN_CLOSE: /* peer closed connection */ case WS_CBIO_ERR_CONN_CLOSE: /* peer closed connection */
ssh->isClosed = 1; ssh->isClosed = 1;
break; break;
case WS_CBIO_ERR_GENERAL:
ShrinkBuffer(&ssh->outputBuffer, 1);
FALL_THROUGH
} }
return WS_SOCKET_ERROR_E; return WS_SOCKET_ERROR_E;
} }
@ -5302,6 +5306,9 @@ static int PreparePacket(WOLFSSH* ssh, word32 payloadSz)
if (ssh == NULL) if (ssh == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
if (ssh->outputBuffer.length < ssh->outputBuffer.idx)
ret = WS_OVERFLOW_E;
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
word32 packetSz, usedSz, outputSz; word32 packetSz, usedSz, outputSz;
byte paddingSz; byte paddingSz;