Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid binding reference to NULL pointer when wxUSE_VALIDATORS==0

Browse Source 
Undefined behavior sanitizer complains about it
This commit is contained in:
Paul Cornett
2019-04-04 10:56:14 -07:00
parent 90ce6a4334
commit 25e9be6873
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/validate.h
View File

@@ -97,8 +97,6 @@ private:
wxDECLARE_NO_ASSIGN_CLASS(wxValidator); wxDECLARE_NO_ASSIGN_CLASS(wxValidator);
}; };
extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
#define wxVALIDATOR_PARAM(val) val #define wxVALIDATOR_PARAM(val) val
#else // !wxUSE_VALIDATORS #else // !wxUSE_VALIDATORS
@@ -107,13 +105,13 @@ extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS" // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere // everywhere
class WXDLLIMPEXP_FWD_CORE wxValidator; class WXDLLIMPEXP_FWD_CORE wxValidator;
static const wxValidator* const wxDefaultValidatorPtr = NULL;
#define wxDefaultValidator (*wxDefaultValidatorPtr)
// this macro allows to avoid warnings about unused parameters when // this macro allows to avoid warnings about unused parameters when
// wxUSE_VALIDATORS == 0 // wxUSE_VALIDATORS == 0
#define wxVALIDATOR_PARAM(val) #define wxVALIDATOR_PARAM(val)
#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
#endif // _WX_VALIDATE_H_ #endif // _WX_VALIDATE_H_

10
src/common/validate.cpp
View File

@@ -23,8 +23,6 @@
#include "wx/window.h" #include "wx/window.h"
#endif #endif
const wxValidator wxDefaultValidator;
wxIMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler); wxIMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler);
// VZ: personally, I think true would be more appropriate - these bells are // VZ: personally, I think true would be more appropriate - these bells are
@@ -39,6 +37,10 @@ wxValidator::wxValidator()
wxValidator::~wxValidator() wxValidator::~wxValidator()
{ {
} }
#else
#endif class WXDLLIMPEXP_CORE wxValidator { };
// wxUSE_VALIDATORS
#endif // wxUSE_VALIDATORS
const wxValidator wxDefaultValidator;