Check if there aren't too many variadic arguments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/strvararg.cpp b/src/common/strvararg.cpp
index 0e1b1592af6bb8874bf83f7c5b468277d8c0f272..f70593c0c5183065394b37c189eb5a3c6f6375d0 100644 (file)
--- a/src/common/strvararg.cpp
+++ b/src/common/strvararg.cpp
@@ -642,6 +642,9 @@ wxFormatString::ArgumentType DoGetArgumentType(const CharType *format,
 
     wxPrintfConvSpecParser<CharType> parser(format);
 
 
     wxPrintfConvSpecParser<CharType> parser(format);
 

+    wxCHECK_MSG( n <= parser.nargs, wxFormatString::Arg_Unknown,
+                 "more arguments than format string specifiers?" );
+

     wxCHECK_MSG( parser.pspec[n-1] != NULL, wxFormatString::Arg_Unknown,
                  "requested argument not found - invalid format string?" );
 
     wxCHECK_MSG( parser.pspec[n-1] != NULL, wxFormatString::Arg_Unknown,
                  "requested argument not found - invalid format string?" );