From cfb65e31c726662536b05d360b2fe9cd0f7a15bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=95=EC=A3=BC/Common=20Platform=20Lab=28SR?= =?UTF-8?q?=29/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 15 Sep 2022 13:54:47 +0900 Subject: Fix dll filter in doAOTList (#433) --- NativeLauncher/tool/ni_common.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc index cecda2a..666ea2d 100644 --- a/NativeLauncher/tool/ni_common.cc +++ b/NativeLauncher/tool/ni_common.cc @@ -189,7 +189,7 @@ static bool isTPADll(const std::string& dllPath) /** * @brief create the directory including parents directory, and - * copy ownership and smack labels to the created directory. + * copy ownership and smack labels to the created directory. * @param[in] target directory path * @param[in] source directory path to get ownership and smack label * @return if directory created successfully, return true otherwise false @@ -683,24 +683,21 @@ static ni_error_e doAOTList(std::vector& dllList, const std::string std::string coreLib = concatPath(__pm->getRuntimePath(), "System.Private.CoreLib.dll"); bool hasSPC = false; - std::vector niList; for (auto it = dllList.begin(); it != dllList.end(); it++) { std::string f = *it; if (!isFile(f)) { _SERR("dll file is not exist : %s", f.c_str()); - dllList.erase(it--); + dllList.erase(it); } - if (!isManagedAssembly(f)) { + else if (!isManagedAssembly(f)) { _SERR("Input file is not a dll file : %s", f.c_str()); - dllList.erase(it--); + dllList.erase(it); } // handle System.Private.CoreLib.dll separately. // dllList and path manager contain absolute path. So, there is no need to change path to absolute path - if (f == coreLib) { + else if (f == coreLib) { hasSPC = true; - dllList.erase(it--); - } else { - niList.push_back(changeExtension(f, ".dll", ".ni.dll")); + dllList.erase(it); } } -- cgit v1.2.3