fix memory leak (coverity checker CID 53)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 8c2ddad03e862c56b88bd96a7daed2ab09641a9b..3b3cb106d99aef2f5004a13d4cd1eb9a10d8b24a 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -1493,19 +1493,26 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index)
     wxArrayString strExtensions;
     wxString strDesc;
 
     wxArrayString strExtensions;
     wxString strDesc;
 

-    wxMimeTypeCommands *entry = new wxMimeTypeCommands();
-

     wxArrayString strTypes;
     GetMimeTypes(strTypes);
     wxArrayString strTypes;
     GetMimeTypes(strTypes);

-    if (strTypes.GetCount() < 1)
+    if ( strTypes.IsEmpty() )

         return false;
 
         return false;
 

-    size_t i;
+    wxMimeTypeCommands *entry = new wxMimeTypeCommands();

     bool ok = true;
     bool ok = true;

-    for (i = 0; i < strTypes.GetCount(); i++)
+    for ( size_t i = 0; i < strTypes.GetCount(); i++ )

     {
     {

-        if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc))
+        if ( !m_manager->DoAssociation
+                         (
+                            strTypes[i],
+                            strIcon,
+                            entry,
+                            strExtensions,
+                            strDesc
+                         ) )
+        {

             ok = false;
             ok = false;

+        }

     }
 
     return ok;
     }
 
     return ok;