From 91a796b24d74498515c4d5ecca82580d20bf69d2 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 19 Jun 2014 11:40:01 -0400 Subject: [PATCH] Fix FindStringIndex native not returning INVALID_STRING_INDEX when string not found (bug 6144). --- extensions/sdktools/vstringtable.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/extensions/sdktools/vstringtable.cpp b/extensions/sdktools/vstringtable.cpp index 3a1d068f..0a576990 100644 --- a/extensions/sdktools/vstringtable.cpp +++ b/extensions/sdktools/vstringtable.cpp @@ -113,7 +113,15 @@ static cell_t FindStringIndex(IPluginContext *pContext, const cell_t *params) pContext->LocalToString(params[2], &str); - return pTable->FindStringIndex(str); + int strindex = pTable->FindStringIndex(str); + + // INVALID_STRING_INDEX is 65535 at time of writing, but already defined in sp inc files as -1 + if (strindex == INVALID_STRING_INDEX) + { + return -1; + } + + return strindex; } static cell_t ReadStringTable(IPluginContext *pContext, const cell_t *params)