Skip to content

Fix crash on startup when no configuration exists yet #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefan-siebert wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash on startup when no configuration exists yet #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/shiconov.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,14 @@ void InitShellIconOverlays()
ShellOverlayDiag.Header.IconSizes[2] = IconSizes[ICONSIZE_48];
ShellOverlayDiag.Header.SystemDpi = (UINT)SystemDPI;
ShellOverlayDiag.Header.EnableCustomIconOverlays = Configuration.EnableCustomIconOverlays != FALSE;
lstrcpynA(ShellOverlayDiag.Header.ConfigRoot, SALAMANDER_ROOT_REG,
// SALAMANDER_ROOT_REG is still NULL here whenever no configuration was found:
// FindLatestConfiguration() clears it up front and only assigns a root when a key with
// a "Configuration" subkey exists, and the fallback to SalamanderConfigurationRoots[0]
// happens later in the startup sequence than this call. Sally's lstrcpyn is the
// deliberately crashing variant from lstrfix.h, so NULL is an access violation here,
// not a truncated string. Every other reader of SALAMANDER_ROOT_REG guards for NULL.
lstrcpynA(ShellOverlayDiag.Header.ConfigRoot,
SALAMANDER_ROOT_REG != NULL ? SALAMANDER_ROOT_REG : "",
(int)sizeof(ShellOverlayDiag.Header.ConfigRoot));
if (Configuration.DisabledCustomIconOverlays != NULL)
{
Expand Down
Loading