From 189e4c50242e937f3029a6a320dc7ea818bb7ae5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 13 May 2016 15:40:22 +0200
Subject: [PATCH] Null-terminate arrays returned from wxCmdLineArgsArray

This is required for compatibility with the real argv array that this class is
supposed to emulate.

Closes #17531.
---
 include/wx/cmdargs.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/wx/cmdargs.h b/include/wx/cmdargs.h
index e34ba52a98..257b091b18 100644
--- a/include/wx/cmdargs.h
+++ b/include/wx/cmdargs.h
@@ -51,9 +51,11 @@ public:
         if ( !m_argsA )
         {
             const size_t count = m_args.size();
-            m_argsA = new char *[count];
+            m_argsA = new char *[count + 1];
             for ( size_t n = 0; n < count; n++ )
                 m_argsA[n] = wxStrdup(m_args[n].ToAscii());
+
+            m_argsA[count] = NULL;
         }
 
         return m_argsA;
@@ -64,9 +66,11 @@ public:
         if ( !m_argsW )
         {
             const size_t count = m_args.size();
-            m_argsW = new wchar_t *[count];
+            m_argsW = new wchar_t *[count + 1];
             for ( size_t n = 0; n < count; n++ )
                 m_argsW[n] = wxStrdup(m_args[n].wc_str());
+
+            m_argsW[count] = NULL;
         }
 
         return m_argsW;