X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53bd3a54cb090c29121cd28734cbec16c3b917f6..1c0338c5615c351371f704b326634f58d0bf7da9:/src/unix/dlunix.cpp?ds=sidebyside

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index f019fed98d..2c9fec3b3c 100644
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -65,11 +65,11 @@
 
 // standard shared libraries extensions for different Unix versions
 #if defined(__HPUX__)
-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    const wxString wxDynamicLibrary::ms_dllext(".sl");
 #elif defined(__DARWIN__)
-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
+    const wxString wxDynamicLibrary::ms_dllext(".bundle");
 #else
-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+    const wxString wxDynamicLibrary::ms_dllext(".so");
 #endif
 
 // ============================================================================
@@ -271,14 +271,12 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 /* static */
 void wxDynamicLibrary::Error()
 {
-#if wxUSE_UNICODE
-    wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
-    const wxChar *err = buffer;
-#else
-    const wxChar *err = dlerror();
-#endif
+    wxString err(dlerror());
 
-    wxLogError(wxT("%s"), err ? err : _("Unknown dynamic library error"));
+    if ( err.empty() )
+        err = _("Unknown dynamic library error");
+
+    wxLogError(wxT("%s"), err);
 }
 
 #endif // wxHAVE_DYNLIB_ERROR
@@ -294,13 +292,13 @@ class wxDynamicLibraryDetailsCreator
 public:
     // create a new wxDynamicLibraryDetails from the given data
     static wxDynamicLibraryDetails *
-    New(unsigned long start, unsigned long end, const wxString& path)
+    New(void *start, void *end, const wxString& path)
     {
         wxDynamicLibraryDetails *details = new wxDynamicLibraryDetails;
         details->m_path = path;
         details->m_name = path.AfterLast(_T('/'));
-        details->m_address = wxUIntToPtr(start);
-        details->m_length = end - start;
+        details->m_address = start;
+        details->m_length = (char *)end - (char *)start;
 
         // try to extract the library version from its name
         const size_t posExt = path.rfind(_T(".so"));
@@ -339,16 +337,17 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
     {
         // details of the module currently being parsed
         wxString pathCur;
-        unsigned long startCur = 0,
-                      endCur = 0;
+        void *startCur = NULL,
+             *endCur = NULL;
 
         char path[1024];
         char buf[1024];
         while ( fgets(buf, WXSIZEOF(buf), file.fp()) )
         {
-            // format is: start-end perm something? maj:min inode path
-            unsigned long start, end;
-            switch ( sscanf(buf, "%08lx-%08lx %*4s %*08x %*02x:%*02x %*d %1024s\n",
+            // format is: "start-end perm offset maj:min inode path", see proc(5)
+            void *start,
+                 *end;
+            switch ( sscanf(buf, "%p-%p %*4s %*p %*02x:%*02x %*d %1024s\n",
                             &start, &end, path) )
             {
                 case 2:
@@ -368,6 +367,9 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
                     continue;
             }
 
+            wxASSERT_MSG( start >= endCur,
+                          _T("overlapping regions in /proc/self/maps?") );
+
             wxString pathNew = wxString::FromAscii(path);
             if ( pathCur.empty() )
             {
@@ -376,10 +378,9 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
                 startCur = start;
                 endCur = end;
             }
-            else if ( pathCur == pathNew )
+            else if ( pathCur == pathNew && endCur == end )
             {
-                // continuation of the same module
-                wxASSERT_MSG( start == endCur, _T("hole in /proc/self/maps?") );
+                // continuation of the same module in the address space
                 endCur = end;
             }
             else // end of the current module