Skip to content
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.

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

Fix webtorrent related crash in the network stack (0.69.x) #3614

Merged
merged 1 commit into from
Oct 8, 2019

Conversation

iefremov
Copy link
Contributor

@iefremov iefremov commented Oct 7, 2019

Fixes brave/brave-browser#6320

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@iefremov iefremov changed the base branch from master to 0.68.x October 7, 2019 09:35
@iefremov iefremov changed the title Ie torrent crash Fix webtorrent related crash in the network stack Oct 7, 2019
@iefremov iefremov self-assigned this Oct 7, 2019
@bsclifton bsclifton changed the base branch from 0.68.x to 0.69.x October 7, 2019 20:09
@bsclifton
Copy link
Member

Updating base to be 0.69.x 👍

yrliou
yrliou previously approved these changes Oct 7, 2019
Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

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

LGTM as a temporary workaround.

@bsclifton
Copy link
Member

Has a compile error on Android:

14:11:37  ../../brave/browser/net/brave_request_handler.cc:193:3: error: use of undeclared identifier 'webtorrent'
14:11:37    webtorrent::OnHeadersReceived_TorrentRedirectWork(original_response_headers,
14:11:37    ^
14:11:37  1 error generated.

@bsclifton bsclifton added this to the 0.69.x - next release milestone Oct 7, 2019
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Failing on Android; do any other extensions use this flow? (ex: is it OK to call webtorrent::OnHeadersReceived_TorrentRedirectWork in all cases?)

Link to compile error:
https://staging.ci.brave.com/job/brave-browser-build-pr/job/ie_torrent_crash/3/execution/node/477/log/

@yrliou
Copy link
Member

yrliou commented Oct 7, 2019

Has a compile error on Android:

14:11:37  ../../brave/browser/net/brave_request_handler.cc:193:3: error: use of undeclared identifier 'webtorrent'
14:11:37    webtorrent::OnHeadersReceived_TorrentRedirectWork(original_response_headers,
14:11:37    ^
14:11:37  1 error generated.

Ah, right, webtorrent callback should be guarded with #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT)

@iefremov
Copy link
Contributor Author

iefremov commented Oct 8, 2019

Ok, fixed! Sorry for that

@yrliou
Copy link
Member

yrliou commented Oct 8, 2019

macOS failed on init, other platforms are green. I'll try retriggering macOS.

@yrliou yrliou added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS labels Oct 8, 2019
@bsclifton bsclifton changed the title Fix webtorrent related crash in the network stack Fix webtorrent related crash in the network stack (0.69.x) Oct 8, 2019
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants