Skip to content
Snippets Groups Projects
Commit 1279eca8 authored by Seung Jae Lim's avatar Seung Jae Lim Committed by Krishna Govind
Browse files

[Canary] Revert "Reset the extractors when receiving a failure callback from any of them"

This reverts commit 2321267a.

Reason for revert: There are crash reports at 375155974 and 375140281. 
Analysis is needed for a better solution to the dangling pointers. In 
the meantime, revert the change

Original change's description:
> Reset the extractors when receiving a failure callback from any of them
>
> Bug: 373555078
>
> Change-Id: I2b2bdeea59adf4827de82c9cb2a38488a242c09f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5953744


> Commit-Queue: Seung Jae Lim <andysjlim@chromium.org>
> Reviewed-by: default avatarDaniel Rubery <drubery@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1372211}

(cherry picked from commit c7571056)

Bug: 373555078
Change-Id: I8a1c1febc8c71520d04f8cb5bf882f329beea975
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5953034


Reviewed-by: default avatarSrinivas Sista <srinivassista@chromium.org>
Commit-Queue: Srinivas Sista <srinivassista@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Original-Commit-Position: refs/heads/main@{#1372755}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5957970


Reviewed-by: default avatarKrishna Govind <govind@chromium.org>
Owners-Override: Krishna Govind <govind@chromium.org>
Cr-Commit-Position: refs/branch-heads/6794@{#5}
Cr-Branched-From: bb85fca9-refs/heads/main@{#1372552}
parent a25c55e3
No related branches found
No related merge requests found
......@@ -270,15 +270,6 @@ void PhishingClassifier::RunCallback(const ClientPhishingRequest& verdict,
}
void PhishingClassifier::RunFailureCallback(Result failure_event) {
// Note that cancelling the feature extractors is simply a no-op if they
// were not running. We reset the extractors at failure callback because the
// raw_ptr objects held by these extractors such as bitmap, features, and
// shingle_hashes can be dangling.
dom_extractor_.reset();
term_extractor_.reset();
visual_extractor_.reset();
weak_factory_.InvalidateWeakPtrs();
ClientPhishingRequest verdict;
// In this case we're not guaranteed to have a valid URL. Just set it
// to the empty string to make sure we have a valid protocol buffer.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment