Skip to content

Commit 8913403

Browse files
authored
Merge commit from fork
fix(security): ViewDiffInfo / TagsMake の auto_sprintf → auto_sprintf_s でスタックバッファオーバーフローを修正 (GHSA-jpr9-7379-v6m7)
2 parents b375ab9 + c6b8b29 commit 8913403

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

sakura_core/cmd/CViewCommander_TagJump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ bool CViewCommander::Command_TagsMake( void )
592592
WCHAR szCmdDir[_MAX_PATH];
593593
::GetSystemDirectory(szCmdDir, int(std::size(szCmdDir)));
594594
// 2006.08.04 genta add /D to disable autorun
595-
auto_sprintf( cmdline, L"\"%s\\cmd.exe\" /D /C \"\"%s\\%s\" %s\"",
595+
auto_sprintf_s( cmdline, std::size(cmdline), L"\"%s\\cmd.exe\" /D /C \"\"%s\\%s\" %s\"",
596596
szCmdDir,
597597
szExeFolder, //sakura.exeパス
598598
CTAGS_COMMAND, //ctags.exe

sakura_core/view/CEditView_Diff.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ void CEditView::ViewDiffInfo(
148148

149149
{
150150
//コマンドライン文字列作成(MAX:1024)
151-
auto_sprintf(
152-
cmdline,
151+
auto_sprintf_s(
152+
cmdline, std::size(cmdline),
153153
L"\"%s\\%s\" %s \"%s\" \"%s\"",
154154
szExeFolder, //sakura.exeパス
155155
L"diff.exe", //diff.exe

0 commit comments

Comments
 (0)