Add new string natives/stocks, make some UTF-8 safe (bug 6110, r=ds)

2014-04-30 09:33:03 +02:00
parent c99a518ba4
commit a86ca1491f
12 changed files with 1560 additions and 161 deletions
--- a/amxmodx/trie_natives.h
+++ b/amxmodx/trie_natives.h
@@ -112,7 +112,16 @@ public:
 	{
 		if (m_type == TRIE_DATA_STRING && max >= 0)
 		{
-			memcpy(out, m_data, (max > m_cellcount ? m_cellcount : max) * sizeof(cell));
+			int len = (max > m_cellcount) ? m_cellcount : max;
+			memcpy(out, m_data, len * sizeof(cell));
+			
+			/* Don't truncate a multi-byte character */
+			if (m_data[len - 1] & 1 << 7)
+			{
+				len -= UTIL_CheckValidChar(m_data + len - 1);
+				out[len] = '\0';
+			}
+
 			return true;
 		}
 		return false;