From 43644931cb9cb5cc92391f6f5431535b9b7a3f24 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 7 Jul 2017 11:23:48 +0100 Subject: Make sure string is never NULL `error_message` is passed in to strncpy() without any check, which doesn't handle NULL itself, so let's make it a valid empty string in cases where it was NULL. Signed-off-by: Eric Engestrom Acked-by: Walter Harms Reviewed-by: Emil Velikov --- src/process.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/process.c b/src/process.c index 9cd744b..5e00be3 100644 --- a/src/process.c +++ b/src/process.c @@ -704,6 +704,11 @@ ProcessError ( invokeHandler = 1; } + if (!errorStr) + { + errorStr = strdup(""); + } + errorReply->type = ICE_CONNECTION_ERROR; errorReply->error_message = errorStr; } @@ -794,6 +799,11 @@ ProcessError ( invokeHandler = 1; } + if (!errorStr) + { + errorStr = strdup(""); + } + errorReply->type = ICE_PROTOCOL_ERROR; errorReply->error_message = errorStr; } @@ -1270,7 +1280,7 @@ ProcessAuthRequired ( } if (asprintf (&returnErrorString, "%s%s", prefix, errorString) == -1) - returnErrorString = NULL; + returnErrorString = strdup(""); free (errorString); if (iceConn->connect_to_you) @@ -1697,7 +1707,7 @@ ProcessAuthNextPhase ( } if (asprintf (&returnErrorString, "%s%s", prefix, errorString) == -1) - returnErrorString = NULL; + returnErrorString = strdup(""); free (errorString); if (iceConn->connect_to_you) -- cgit v1.2.3