starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #5654] [MERGED] Grab the write lock before updating the font #26407

New Issue
Open
opened 2026-01-31 09:15:53 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:15:53 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/5654
Author: @leonMSFT
Created: 4/29/2020
Status: ✅ Merged
Merged: 4/30/2020
Merged by: @undefined

Base: master ← Head: dev/lelian/scrollfontsizeded

📝 Commits (3)

  • b1eea0f take the lock out of RefreshSize, put it in its callers since they all seem to TriggerFontChange
  • 815716b small comment update
  • ae818c0 rename

📊 Changes

2 files changed (+19 additions, -13 deletions)

View changed files

📝 src/cascadia/TerminalControl/TermControl.cpp (+17 -11)
📝 src/cascadia/TerminalControl/TermControl.h (+2 -2)

📄 Description

Summary of the Pull Request

Based on the discussion in #5479, it seems that the crash is caused by a race condition due to not obtaining the write lock before calling TriggerFontChange.

I'm not totally sure if my approach is the right one, but I've taken the lock out of _RefreshSize since it seems like all calls of _RefreshSize come after a TriggerFontChange/UpdateFont. Then I just
made sure all calls of TriggerFontChange/UpdateFont are preceded with a LockForWriting.

PR Checklist

Validation Steps Performed

Scrolling to change my font size does not kill the Terminal anymore! 🙌

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/5654 **Author:** [@leonMSFT](https://github.com/leonMSFT) **Created:** 4/29/2020 **Status:** ✅ Merged **Merged:** 4/30/2020 **Merged by:** [@undefined](undefined) **Base:** `master` ← **Head:** `dev/lelian/scrollfontsizeded` --- ### 📝 Commits (3) - [`b1eea0f`](https://github.com/microsoft/terminal/commit/b1eea0f1dcadecf7fd738600a5c9daea8072dd37) take the lock out of RefreshSize, put it in its callers since they all seem to TriggerFontChange - [`815716b`](https://github.com/microsoft/terminal/commit/815716b02c4c67c04724c4353d9b34db01a47f0b) small comment update - [`ae818c0`](https://github.com/microsoft/terminal/commit/ae818c0dbaa728b499075a9335ec40ac0877b482) rename ### 📊 Changes **2 files changed** (+19 additions, -13 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalControl/TermControl.cpp` (+17 -11) 📝 `src/cascadia/TerminalControl/TermControl.h` (+2 -2) </details> ### 📄 Description ## Summary of the Pull Request Based on the discussion in #5479, it seems that the crash is caused by a race condition due to not obtaining the write lock before calling `TriggerFontChange`. I'm not totally sure if my approach is the right one, but I've taken the lock out of `_RefreshSize` since it seems like all calls of `_RefreshSize` come after a `TriggerFontChange`/`UpdateFont`. Then I just made sure all calls of `TriggerFontChange`/`UpdateFont` are preceded with a `LockForWriting`. ## PR Checklist * [x] Closes #5479 * [x] CLA signed. * [x] Tests added/passed ## Validation Steps Performed Scrolling to change my font size does not kill the Terminal anymore! 🙌 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:15:53 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#26407
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?