From 30f2a1119a9eb838e055730db9e6853eda71c9a8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 12 Aug 2000 11:24:06 +0000 Subject: [PATCH] fixed crash in wxStrtok git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wxchar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index f9e73aed8a..fc5860b69c 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -171,6 +171,10 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) #ifndef wxStrtok WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) { + if (!(save_ptr && *save_ptr)) { + return (wxChar *) NULL; + } + if (!psz) psz = *save_ptr; psz += wxStrspn(psz, delim); if (!*psz) {