From ec46f55266b4fb4cbff4b99a289eb72e915bfddd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 May 2015 01:37:40 +0200
Subject: [PATCH] Validate "platform" parameter in wxEncodingConverter.

Make sure we don't use an invalid platform as an index into an array as this
would result in crashing.
---
 src/common/encconv.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index a6c24dffbf..d4c23ebb78 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -445,6 +445,18 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
 #endif
     }
 
+    switch ( platform )
+    {
+        case wxPLATFORM_UNIX:
+        case wxPLATFORM_WINDOWS:
+        case wxPLATFORM_MAC:
+            break;
+
+        default:
+            wxFAIL_MSG(wxS("Invalid platform specified"));
+            return wxFontEncodingArray();
+    }
+
     int i, clas, e ;
     const wxFontEncoding *f;
     wxFontEncodingArray arr;