Merge pull request #40 from alliedmodders/fix-invalid-string-index

Fix FindStringIndex native not returning INVALID_STRING_INDEX when string not found (bug 6144, r=DS).
alliedmodders · Jun 19, 2014 · 58158ce · 58158ce
2 parents 0f39825 + 291ef6f
commit 58158ce
Showing 1 changed file with 9 additions and 1 deletion.
diff --git 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)