From 8e7d41ec02fbb2a1381829ada55111a3c399cd99 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Tue, 27 Oct 2020 18:51:12 -0400 Subject: [PATCH] Add NULL check to GetEntPropString return. (#1376) This can be NULL for non-interned strings that don't have a value set. --- core/smn_entities.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp index 5276674d4..a8c840d04 100644 --- a/core/smn_entities.cpp +++ b/core/smn_entities.cpp @@ -2201,9 +2201,15 @@ static cell_t GetEntPropString(IPluginContext *pContext, const cell_t *params) } } - size_t len; - pContext->StringToLocalUTF8(params[4], params[5], src, &len); - return len; + if (src) + { + size_t len; + pContext->StringToLocalUTF8(params[4], params[5], src, &len); + return len; + } + + pContext->StringToLocal(params[4], params[5], ""); + return 0; } static cell_t SetEntPropString(IPluginContext *pContext, const cell_t *params)