diff --git a/PowerEditor/src/MISC/FileNameStringSplitter.h b/PowerEditor/src/MISC/FileNameStringSplitter.h
index 42263dcf4..6694e924d 100644
--- a/PowerEditor/src/MISC/FileNameStringSplitter.h
+++ b/PowerEditor/src/MISC/FileNameStringSplitter.h
@@ -38,11 +38,16 @@ public :
 		//if (!fileNameStr) return;
 		TCHAR *pStr = NULL;
 		bool isInsideQuotes = false;
-		TCHAR str[MAX_PATH];
+		const int filePathLength = MAX_PATH;
+
+		TCHAR str[filePathLength];
 		int i = 0;
         bool fini = false;
 		for (pStr = (TCHAR *)fileNameStr ; !fini ; )
 		{
+			if (i >= filePathLength)
+				break;
+
 			switch (*pStr)
 			{
 				case '"' :