Merge pull request xbmc#13355 from Rechi/fix/coverity

[fix] coverity issues
Proxmiff · Jan 13, 2018 · 9d12303 · 9d12303
2 parents acedd16 + 7599d0e
commit 9d12303
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/xbmc/cores/DllLoader/dll_util.cpp b/xbmc/cores/DllLoader/dll_util.cpp
@@ -118,6 +118,8 @@ uintptr_t get_win_function_address(const char* strDllName, const char* strFuncti
     auto pGNSI = reinterpret_cast<uintptr_t>(GetProcAddress(handle, strFunctionName));
     if(pGNSI != NULL)
       return pGNSI;
+
+    FreeLibrary(handle);
   }
 #endif
   return 0;

diff --git a/xbmc/platform/posix/Filesystem.cpp b/xbmc/platform/posix/Filesystem.cpp
@@ -87,7 +87,8 @@ std::string create_temp_directory(std::error_code &ec)
 
   auto path = temp_directory_path(ec);
 
-  strcpy(buf, (path + "xbmctempXXXXXX").c_str());
+  strncpy(buf, (path + "xbmctempXXXXXX").c_str(), sizeof(buf) - 1);
+  buf[sizeof(buf) - 1] = '\0';
 
   auto tmp = mkdtemp(buf);
   if (!tmp)
@@ -115,7 +116,8 @@ std::string temp_file_path(std::string suffix, std::error_code &ec)
     return std::string();
   }
 
-  strcpy(tmp, tempPath.c_str());
+  strncpy(tmp, tempPath.c_str(), sizeof(tmp) - 1);
+  tmp[sizeof(tmp) - 1] = '\0';
 
   auto fd = mkstemps(tmp, suffix.length());
   if (fd < 0)

diff --git a/xbmc/platform/win32/WinMain.cpp b/xbmc/platform/win32/WinMain.cpp
@@ -82,12 +82,14 @@ INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT)
       ShowWindow(hwnd, SW_RESTORE);
       SetForegroundWindow(hwnd);
     }
+    ReleaseMutex(appRunningMutex);
     return 0;
   }
 
   if ((g_cpuInfo.GetCPUFeatures() & CPU_FEATURE_SSE2) == 0)
   {
     MessageBox(NULL, L"No SSE2 support detected", ToW(appName + ": Fatal Error").c_str(), MB_OK | MB_ICONERROR);
+    ReleaseMutex(appRunningMutex);
     return 0;
   }