fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / include / wx / cpp.h

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index e1267b03252d4858847b4ece9ea628bc4d5612f8..657b0673eb845d85e9122f25a7fadc100d7d8362 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -15,11 +15,23 @@
 
 /* wxCONCAT works like preprocessor ## operator but also works with macros */
 #define wxCONCAT_HELPER(text, line) text ## line
-#define wxCONCAT(text, line)        wxCONCAT_HELPER(text, line)
 
-#define wxCONCAT3(x1, x2, x3) wxCONCAT(wxCONCAT(x1, x2), x3)
-#define wxCONCAT4(x1, x2, x3, x4) wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
-#define wxCONCAT5(x1, x2, x3, x4, x5) wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
+#define wxCONCAT(x1, x2) \
+    wxCONCAT_HELPER(x1, x2)
+#define wxCONCAT3(x1, x2, x3) \
+    wxCONCAT(wxCONCAT(x1, x2), x3)
+#define wxCONCAT4(x1, x2, x3, x4) \
+    wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
+#define wxCONCAT5(x1, x2, x3, x4, x5) \
+    wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
+#define wxCONCAT6(x1, x2, x3, x4, x5, x6) \
+    wxCONCAT(wxCONCAT5(x1, x2, x3, x4, x5), x6)
+#define wxCONCAT7(x1, x2, x3, x4, x5, x6, x7) \
+    wxCONCAT(wxCONCAT6(x1, x2, x3, x4, x5, x6), x7)
+#define wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8) \
+    wxCONCAT(wxCONCAT7(x1, x2, x3, x4, x5, x6, x7), x8)
+#define wxCONCAT9(x1, x2, x3, x4, x5, x6, x7, x8, x9) \
+    wxCONCAT(wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8), x9)
 
 /* wxSTRINGIZE works as the preprocessor # operator but also works with macros */
 #define wxSTRINGIZE_HELPER(x)       #x
@@ -28,6 +40,16 @@
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 
+/*
+    Special workarounds for compilers with broken "##" operator. For all the
+    other ones we can just use it directly.
+ */
+#ifdef wxCOMPILER_BROKEN_CONCAT_OPER
+    #define wxPREPEND_L(x)      L ## x
+    #define wxAPPEND_i64(x)     x ## i64
+    #define wxAPPEND_ui64(x)    x ## ui64
+#endif /* wxCOMPILER_BROKEN_CONCAT_OPER */
+
 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the
@@ -79,5 +101,56 @@
     #endif
 #endif /* __WXFUNCTION__ already defined */
 
+
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
+    #define wxHAS_VARIADIC_MACROS
+#elif defined(__GNUC__) && __GNUC__ >= 3
+    #define wxHAS_VARIADIC_MACROS
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
+    #define wxHAS_VARIADIC_MACROS
+#endif
+
+#ifdef wxHAS_VARIADIC_MACROS
+/*
+   wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
+   for every remaining argument 'x', with 'pos' being its 1-based index in
+   *reverse* order (with the last argument being numbered 1).
+
+   For example, wxCALL_FOR_EACH(test, a, b, c) expands into this:
+
+       test(3, a) \
+       test(2, b) \
+       test(1, c)
+
+   Up to eight arguments are supported.
+
+   (With thanks to https://groups.google.com/d/topic/comp.std.c/d-6Mj5Lko_s/discussion
+   and http://stackoverflow.com/questions/1872220/is-it-possible-to-iterate-over-arguments-in-variadic-macros)
+*/
+#define wxCALL_FOR_EACH_NARG(...)   wxCALL_FOR_EACH_NARG_((__VA_ARGS__, wxCALL_FOR_EACH_RSEQ_N()))
+#define wxCALL_FOR_EACH_NARG_(args) wxCALL_FOR_EACH_ARG_N args
+#define wxCALL_FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N
+#define wxCALL_FOR_EACH_RSEQ_N() 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+#define wxCALL_FOR_EACH_1(what, x)        what(1, x)
+#define wxCALL_FOR_EACH_2(what, x, ...)   what(2, x)  wxCALL_FOR_EACH_1(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_3(what, x, ...)   what(3, x)  wxCALL_FOR_EACH_2(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_4(what, x, ...)   what(4, x)  wxCALL_FOR_EACH_3(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_5(what, x, ...)   what(5, x)  wxCALL_FOR_EACH_4(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_6(what, x, ...)   what(6, x)  wxCALL_FOR_EACH_5(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_7(what, x, ...)   what(7, x)  wxCALL_FOR_EACH_6(what,  __VA_ARGS__)
+#define wxCALL_FOR_EACH_8(what, x, ...)   what(8, x)  wxCALL_FOR_EACH_7(what,  __VA_ARGS__)
+
+#define wxCALL_FOR_EACH_(N, args) \
+    wxCONCAT(wxCALL_FOR_EACH_, N) args
+
+#define wxCALL_FOR_EACH(what, ...) \
+    wxCALL_FOR_EACH_(wxCALL_FOR_EACH_NARG(__VA_ARGS__), (what, __VA_ARGS__))
+
+#else
+    #define wxCALL_FOR_EACH  Error_wx_CALL_FOR_EACH_requires_variadic_macros_support
+#endif /* wxHAS_VARIADIC_MACROS */
+
 #endif /* _WX_CPP_H_ */