mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-12 20:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix for sslecho in demos echoing garbage #18165

Browse Source 
- getline does set &txbufp content at return, make sure it can be done.
  - fixes warning 'passing argument 1 of ‘getline’ from incompatible pointer type'
- remove OPENSSL_free on non allocated fixed size array
  - fixes 'free(): invalid pointer'

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18177)
This commit is contained in:
philippe lhardy 2022-04-25 19:42:16 +02:00 committed by Pauli
parent 50d1d92de9
commit 3c0e8bc4a7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/sslecho/main.c
View File

@ -137,8 +137,9 @@ int main(int argc, char **argv)
int server_skt = -1;
int client_skt = -1;
char txbuf[128];
size_t txcap = sizeof(txbuf);
/* used by getline relying on realloc, can't be statically allocated */
char *txbuf = NULL;
size_t txcap = 0;
int txlen;
char rxbuf[128];
@ -286,11 +287,14 @@ int main(int argc, char **argv)
while (true) {
/* Get a line of input */
txlen = getline(&txbuf, &txcap, stdin);
/* Exit loop on error */
if (txlen < 0 || txbuf == NULL) {
break;
}
/* Exit loop if just a carriage return */
if (txbuf[0] == '\n') {
break;
}
/* Send it to the server */
if ((result = SSL_write(ssl, txbuf, txlen)) <= 0) {
printf("Server closed connection\n");
@ -331,8 +335,8 @@ int main(int argc, char **argv)
if (server_skt != -1)
close(server_skt);
OPENSSL_free(txbuf);
OPENSSL_free(rxbuf);
if (txbuf != NULL && txcap > 0)
free(txbuf);
printf("sslecho exiting\n");