Merge lp:~abreu-alexandre/oxide/fix-sendMessageNoReply-crash-1.5 into lp:oxide/1.5

Proposed by Alexandre Abreu
Status: Merged
Merged at revision: 961
Proposed branch: lp:~abreu-alexandre/oxide/fix-sendMessageNoReply-crash-1.5
Merge into: lp:oxide/1.5
Diff against target: 15 lines (+4/-1)
1 file modified
shared/browser/oxide_web_frame.cc (+4/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/oxide/fix-sendMessageNoReply-crash-1.5
Reviewer Review Type Date Requested Status
Oxide Developers Pending
Review via email: mp+251647@code.launchpad.net

Description of the change

Fix sendMessageNoReply crash

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shared/browser/oxide_web_frame.cc'
2--- shared/browser/oxide_web_frame.cc 2015-01-16 22:46:17 +0000
3+++ shared/browser/oxide_web_frame.cc 2015-03-03 20:04:18 +0000
4@@ -218,7 +218,10 @@
5 std::find(current_script_message_requests_.begin(),
6 current_script_message_requests_.end(),
7 req);
8- DCHECK(it != current_script_message_requests_.end());
9+ if (it == current_script_message_requests_.end()) {
10+ // can happen for non lasting requests e.g. SendMessageNoReply
11+ return;
12+ }
13
14 if (!destroyed_) {
15 current_script_message_requests_.erase(it);

Subscribers

People subscribed via source and target branches