| commit | 621c3bed01cd52d371580de545983a19aae695fa | [log] [tgz] |
|---|---|---|
| author | Robert Sesek <[email protected]> | Thu May 31 18:25:53 2018 |
| committer | Commit Bot <[email protected]> | Thu May 31 18:25:53 2018 |
| tree | 00d6ecaf8638b4b05588b0d5a3cb0d78f8b3a8d9 | |
| parent | 5e7123e8b4cfdb05b16b8b0498ac49286716b709 [diff] [blame] |
[Mac] Fix suspicious lifetime issue in KeystoneGlue. The |brandFile_| ivar is stored and referenced in different methods, but no memory management is applied. This object is likely resulting in zombie crashes. Bug: 847755 Change-Id: If0ae22356422b59b6537a09924f4d1a73b230d3e Reviewed-on: https://chromium-review.googlesource.com/1081008 Reviewed-by: Elly Fong-Jones <[email protected]> Commit-Queue: Robert Sesek <[email protected]> Cr-Commit-Position: refs/heads/master@{#563325}
diff --git a/chrome/browser/mac/keystone_glue.h b/chrome/browser/mac/keystone_glue.h index 830037c..c54b7dd 100644 --- a/chrome/browser/mac/keystone_glue.h +++ b/chrome/browser/mac/keystone_glue.h
@@ -74,7 +74,8 @@ NSString* url_; NSString* version_; std::string channel_; // Logically: dev, beta, or stable. - NSString* brandFile_; // Cached location of the brand file. + // Cached location of the brand file. + base::scoped_nsobject<NSString> brandFile_; // And the Keystone registration itself, with the active timer KSRegistration* registration_; // strong