Skip to content

Canary: enable STL hardening and destructor tombstoning in all builds #20544

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

Merged
Dustin L. Howett (DHowett) merged 5 commits into from
Aug 12, 2026
+14 −0
Merged

Canary: enable STL hardening and destructor tombstoning in all builds #20544

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff66d0e
Canary: enable STL hardening and destructor tombstoning in all builds
DHowett Aug 12, 2026
3d1759a
Tidier
DHowett Aug 12, 2026
a2d0df6
and speel it right
DHowett Aug 12, 2026
b3bd7f6
kindly fuck off spellbot
DHowett Aug 12, 2026
d60ddec
Apply suggestion from @DHowett
DHowett Aug 12, 2026
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
3 changes: 3 additions & 0 deletions .github/actions/spelling/expect/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,6 +1692,9 @@
TMPF
tmultiple
tofrom
tombstoning
Tombstoning
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed

@lhecker Leonard Hecker (lhecker) Aug 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding only the lowercase variant makes it work for the capitalized one too!

@DHowett Dustin L. Howett (DHowett) Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leonard Hecker (@lhecker) you say that, and it is what I thought too, but the spell checker did not agree (or I have subtly spelled it wrong in an undetectable way)

@jsoref Josh Soref (jsoref) Aug 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete the lowercase and all caps flavors -- that should fix it. it says that it can't find the lowercase flavor anymore.

I'm more worried about the ⚠️ Dictionary not found, that usually means something's gone fairly wrong...

Indeed, this doesn't work:

"cspell":"https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20241114/dictionaries/"
cspell:django/dict/django.txt

maps to:
https://raw.githubusercontent.com/check-spelling/cspell-dicts/v20241114/dictionaries/django/dict/django.txt

I'll have to look later to see what's causing the config to be confused.

@DHowett Dustin L. Howett (DHowett) Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh fascinating, it's the title-case one that counts for both and not the lowercase one. thank you

that dictionary error, yeah, honestly I've been ignoring it forever :)

@jsoref Josh Soref (jsoref) Aug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TOMBSTONING
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
Comment thread
DHowett marked this conversation as resolved.
Outdated
toolbars
TOOLINFO
TOOLWINDOW
Expand Down
13 changes: 13 additions & 0 deletions src/common.build.post.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,19 @@
</ClCompile>
</ItemDefinitionGroup>

<!--
Enable the new STL hardening and destructor tombstones (for Canary/Dev only, for now).
We do this here rather than in pre.props so that we read the computed branding.

Hardening prevents the misuse of containers more strictly than Container Debug and Iterator Debug.
Tombstoning prevents use-after-free by filling deleted pointers with a sentinel value.
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
-->
<ItemDefinitionGroup Condition="'$(WindowsTerminalBranding)'=='Canary' or '$(WindowsTerminalBranding)'=='Dev' or '$(WindowsTerminalBranding)'==''">
<ClCompile>
<PreprocessorDefinitions>_MSVC_STL_HARDENING=1;_MSVC_STL_DESTRUCTOR_TOMBSTONES=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>

<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

<!-- Exclude our dependencies from static analysis. CAExcludePath can only be
Expand Down
Loading