Merge branch 'fix_echo_serv' into 'master'

gnutls-serv: Do not exit when a message to be echoed is received

Closes #959

See merge request gnutls/gnutls!1222

1 files changed, 2 insertions, 2 deletions

diff --git a/src/serv.c b/src/serv.c
index a4dd445da8..414cd0546b 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1071,12 +1071,12 @@ get_response(gnutls_session_t session, char *request,
 			*response_length = strlen(*response);
 			return 1;
 		} else if (ret == 0) {
+			*response = strdup(request);
 			if (*response == NULL) {
 				fprintf(stderr, "Memory error\n");
 				return 0;
 			}
-			*response = strdup(request);
-			*response_length = ((*response) ? strlen(*response) : 0);
+			*response_length = strlen(*response);
 		} else {
 			*response = NULL;
 			do {