Crash fix under VC++

[wxWidgets.git] / src / html / helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 5f9d39ea19a55a286e4613b1d763938d36d385eb..9d5e70638d25f088ad42b2cc55609d58069969f6 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -78,6 +78,11 @@ wxHtmlHelpIndexCompareFunc(wxHtmlHelpDataItem **a, wxHtmlHelpDataItem **b)
     wxHtmlHelpDataItem *ia = *a;
     wxHtmlHelpDataItem *ib = *b;
 
     wxHtmlHelpDataItem *ia = *a;
     wxHtmlHelpDataItem *ib = *b;
 

+    if (ia == NULL)
+        return -1;
+    if (ib == NULL)
+        return 1;
+

     if (ia->parent == ib->parent)
     {
         return ia->name.CmpNoCase(ib->name);
     if (ia->parent == ib->parent)
     {
         return ia->name.CmpNoCase(ib->name);


@@ -681,7 +686,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
         lineptr = ReadLine(lineptr, linebuf, 300);
 
         for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)
         lineptr = ReadLine(lineptr, linebuf, 300);
 
         for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)

-           *ch = tolower(*ch);
+           *ch = (wxChar)wxTolower(*ch);

 
         if (wxStrstr(linebuf, _T("title=")) == linebuf)
             title = linebuf + wxStrlen(_T("title="));
 
         if (wxStrstr(linebuf, _T("title=")) == linebuf)
             title = linebuf + wxStrlen(_T("title="));