mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: avoid crash while notification removal (#43061)

Browse source 
* avoid crash of operation on an invalid entry while erase set iterator.

Co-authored-by: bill.shen <shenyb32768@gmail.com>

* fix notification removal crash due to the nullptr presenter

Co-authored-by: bill.shen <shenyb32768@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: bill.shen <shenyb32768@gmail.com>
This commit is contained in:
trop[bot] 2024-07-26 16:32:43 -04:00 committed by GitHub
parent 871136bf91
commit b6e19c5a45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/notifications/notification.cc
View file

@ -46,7 +46,9 @@ void Notification::NotificationFailed(const std::string& error) {
void Notification::Remove() {} void Notification::Remove() {}
void Notification::Destroy() { void Notification::Destroy() {
presenter()->RemoveNotification(this); if (presenter()) {
presenter()->RemoveNotification(this);
}
} }
} // namespace electron } // namespace electron

5
shell/browser/notifications/notification_presenter.cc
View file

@ -27,6 +27,11 @@ base::WeakPtr<Notification> NotificationPresenter::CreateNotification(
} }
void NotificationPresenter::RemoveNotification(Notification* notification) { void NotificationPresenter::RemoveNotification(Notification* notification) {
auto it = notifications_.find(notification);
if (it == notifications_.end()) {
return;
}
notifications_.erase(notification); notifications_.erase(notification);
delete notification; delete notification;
} }