セキュリティ関連の危険性を示すuDangerをTPI_FILEINFOに追加。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@15 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp
index f426073..4ee34ad 100644 (file)
--- a/src/common/handle/TPIHandle.cpp
+++ b/src/common/handle/TPIHandle.cpp
@@ -163,6 +163,7 @@ int TPIHandle::GetFileInformation(void * _hArchive, TPI_FILEINFO * _fiInfo, bool
        _fiInfo->tmAccess       = 0;\r
        _fiInfo->tmCreate       = 0;\r
        _fiInfo->tmModified     = 0;\r
+       _fiInfo->uDanger        = 0;\r
        _fiInfo->uOSType        = 0;\r
        _fiInfo->llPackedSize   = 0;\r
        _fiInfo->llUnpackedSize = 0;\r

diff --git a/src/common/header/plugin.h b/src/common/header/plugin.h
index 01c1ccd..e4c3e41 100644 (file)
--- a/src/common/header/plugin.h
+++ b/src/common/header/plugin.h
@@ -239,6 +239,7 @@ typedef struct _TPI_tagFILEINFO
        wxDateTime      tmAccess;       /**< 最終参照日時 */\r
        wxDateTime      tmCreate;       /**< 作成日時 */\r
        wxDateTime      tmModified;     /**< 最終更新日時 */\r
+       unsigned int    uDanger;        /**< セキュリティ警告 */\r
        unsigned int    uOSType;        /**< 作成元OS */\r
        wxULongLong     llPackedSize;   /**< 格納後のサイズ */\r
        wxULongLong     llUnpackedSize; /**< 格納前のサイズ */\r

diff --git a/src/frontend/cls_listctrl.cpp b/src/frontend/cls_listctrl.cpp
index 3c3d84f..66fb953 100644 (file)
--- a/src/frontend/cls_listctrl.cpp
+++ b/src/frontend/cls_listctrl.cpp
@@ -98,7 +98,7 @@ int myListCtrl::OnGetItemImage(long i) const
 \r
 wxListItemAttr * myListCtrl::OnGetItemAttr(long i) const\r
 {\r
-       return (wxListItemAttr *) this->showFileInfo[i].pCustomInfo;\r
+       return this->showFileInfo[i].uDanger ? (wxListItemAttr *) & this->atDangerItem : NULL;\r
 }\r
 \r
 void myListCtrl::OnColClick(wxListEvent& e)\r

diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp
index 7038b51..161f00c 100644 (file)
--- a/src/frontend/frm_main.cpp
+++ b/src/frontend/frm_main.cpp
@@ -743,13 +743,13 @@ void MainFrame::LoadArc(wxString szFileName)
                        // DTV\8c\9f\8d¸\81B
                        if (piInfo.fiInfo.fnFileName.GetPathWithSep().Find(wxT("..")) != wxNOT_FOUND)
                        {
-                               piInfo.fiInfo.pCustomInfo = & this->list_ctrl->atDangerItem;
+                               piInfo.fiInfo.uDanger = TRUE;
                                ::wxMessageBox(wxT("This archive may have Directory Traversal Vulnerability(DTV) problem, and some danger files may be extracted to the unexpected system directory! You should use the \"Ignore file pathes\" option when extracting this archive.\nDanger file is:\n" + piInfo.fiInfo.szStoredName), wxMessageBoxCaptionStr, wxICON_EXCLAMATION);
                        }
                        // \8bó\94\92\82Ì\98A\91±\82É\82æ\82é\8ag\92£\8eq\8bU\91\95\82ð\8c\9f\8d¸\81B
                        if (piInfo.fiInfo.fnFileName.GetFullName().Find(wxT("        ")) != wxNOT_FOUND)
                        {
-                               piInfo.fiInfo.pCustomInfo = & this->list_ctrl->atDangerItem;
+                               piInfo.fiInfo.uDanger = TRUE;
                                ::wxMessageBox(wxT("This archive may contain extension-disguised files whose real extension is hidden by using many blank charactor and you may mistake that it is a \"safe\" file. Don\'t execute these files carelessly.\nDanger file is:\n" + piInfo.fiInfo.szStoredName), wxMessageBoxCaptionStr, wxICON_EXCLAMATION);
                        }
                        // Unicode\90§\8cä\95¶\8e\9a\82ð\8c\9f\8d¸\81B
@@ -757,7 +757,7 @@ void MainFrame::LoadArc(wxString szFileName)
                        {
                                if (piInfo.fiInfo.fnFileName.GetFullName().Find(c) != wxNOT_FOUND)
                                {
-                                       piInfo.fiInfo.pCustomInfo = & this->list_ctrl->atDangerItem;
+                                       piInfo.fiInfo.uDanger = TRUE;
                                        ::wxMessageBox(wxT("This archive may contain extension-disguised files whose real extension is hidden by using Unicode control character and you may mistake that it is a \"safe\" file. Don\'t execute these files carelessly.\nDanger file is:\n" + piInfo.fiInfo.szStoredName), wxMessageBoxCaptionStr, wxICON_EXCLAMATION);
                                }
                                switch (c)