Fix off by one bugs

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 6e628df8fe12ed780b3c351acd10fb7c17f3c1d4..65e957651db779802df99bb50bf85f6d470ea256 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -1278,17 +1278,17 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
          * UTF-8 but also Windows-1252(!) and ISO-8859-15(!) or any
          * non-western encoding, it obviously fails.
          */
-        unsigned len = 1;
         const wxChar *stupid = filenames[i];
 
-        for (const wxChar *braindead = stupid; *braindead; braindead++)
-            len++;
-        char *psz_local = (char *)malloc (len);
+        for (const wxChar *braindead = stupid; *braindead; braindead++);
+
+        size_t i = (braindead - stupid);
+        char *psz_local = (char *)malloc( i + 1 );
         do
-            psz_local[len] = (char)stupid[len];
-        while (len--);
+            psz_local[i] = (char)stupid[i];
+        while (i--);
 
-        char *psz_utf8 = FromLocale( psz_local );
+        const char *psz_utf8 = FromLocale( psz_local );
 #else
         char *psz_utf8 = wxFromLocale( filenames[i] );
 #endif