Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation

10 years ago · ebac739a35
parent 4bb496409c f8c454733b
commit ebac739a35
1 changed files with 2 additions and 6 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@ -549,13 +549,9 @@ String tempfile( const char* suffix )
 #if defined WIN32 || defined _WIN32
 #ifdef WINRT
    RoInitialize(RO_INIT_MULTITHREADED);
-    std::wstring temp_dir = L"";
-    const wchar_t* opencv_temp_dir = GetTempPathWinRT().c_str();
-    if (opencv_temp_dir)
-        temp_dir = std::wstring(opencv_temp_dir);
+    std::wstring temp_dir = GetTempPathWinRT();

-    std::wstring temp_file;
-    temp_file = GetTempFileNameWinRT(L"ocv");
+    std::wstring temp_file = GetTempFileNameWinRT(L"ocv");
    if (temp_file.empty())
        return String();