146538 2015-07-01 19:12:16 -0700 Memory leak for a protected element having pending events in ImageLoader 2015-07-03 14:56:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kyounga.ra webkit-unassigned beidson cdumez commit-queue japhet oldest_to_newest 1106283 0 kyounga.ra 2015-07-01 19:12:16 -0700 We found a memory leak possibility in ImageLoader. See the code below ==== ImageLoader::~ImageLoader() { .. if (m_elementIsProtected) element().deref(); } void ImageLoader::updatedHasPendingEvent() { bool wasProtected = m_elementIsProtected; m_elementIsProtected = m_hasPendingLoadEvent || m_hasPendingErrorEvent; if (wasProtected == m_elementIsProtected) return; if (m_elementIsProtected) { if (m_derefElementTimer.isActive()) m_derefElementTimer.stop(); else element().ref(); } else { ASSERT(!m_derefElementTimer.isActive()); m_derefElementTimer.startOneShot(0); } } void ImageLoader::timerFired() { element().deref(); } ==== Let's supposed that an protected element is to be "unprotected". The "m_elementIsProtected" flag is false immediately, but deref() is called later using Timer. If ImageLoader is destroyed before the timer is fired, the element's refCount never be zero. I didn't create a test case but there is logically 100% memory leak in this case. 1106287 1 255984 kyounga.ra 2015-07-01 19:26:32 -0700 Created attachment 255984 Use RefPtr not calling ref/deref() directly 1106316 2 255984 beidson 2015-07-01 22:19:06 -0700 Comment on attachment 255984 Use RefPtr not calling ref/deref() directly View in context: https://bugs.webkit.org/attachment.cgi?id=255984&action=review > Source/WebCore/loader/ImageLoader.cpp:363 > + m_protectedElement= &element(); Type: Missing a space before the =. (Really bummed that check-webkit-style didn't get this) > Source/WebCore/loader/ImageLoader.cpp:372 > + m_protectedElement.clear(); This should be: m_protectedElement = nullptr; 1106323 3 kyounga.ra 2015-07-01 23:26:08 -0700 (In reply to comment #2) > Comment on attachment 255984 [details] > Use RefPtr not calling ref/deref() directly > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255984&action=review > > > Source/WebCore/loader/ImageLoader.cpp:363 > > + m_protectedElement= &element(); > > Type: Missing a space before the =. > > (Really bummed that check-webkit-style didn't get this) > > > Source/WebCore/loader/ImageLoader.cpp:372 > > + m_protectedElement.clear(); > > This should be: > m_protectedElement = nullptr; m_protectedElement is RefPtr. clear() will clear the internal pointer to nullptr. I will change the typo. 1106324 4 255993 kyounga.ra 2015-07-01 23:30:28 -0700 Created attachment 255993 Use RefPtr not calling ref/deref() directly 1106389 5 beidson 2015-07-02 08:43:45 -0700 (In reply to comment #3) > (In reply to comment #2) > > Comment on attachment 255984 [details] > > Use RefPtr not calling ref/deref() directly > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=255984&action=review > > > > > Source/WebCore/loader/ImageLoader.cpp:363 > > > + m_protectedElement= &element(); > > > > Type: Missing a space before the =. > > > > (Really bummed that check-webkit-style didn't get this) > > > > > Source/WebCore/loader/ImageLoader.cpp:372 > > > + m_protectedElement.clear(); > > > > This should be: > > m_protectedElement = nullptr; > > > m_protectedElement is RefPtr. > clear() will clear the internal pointer to nullptr. I know. Assigning a nullptr to a RefPtr is functionally the same as calling clear() on it. But when somebody not familiar with the code is reading it, and they come across a call to ".clear()", they don't necessarily know you're null'ing out a RefPtr. They might think you're calling "clear()" on some object that has a whole bunch of behavior inside of its ::clear() method. But by assigning nullptr, it's obvious to anybody reading the code "This is a pointer - it might be a raw pointer or one of our various types of smart pointers, but I know it's a pointer and this code is null'ing it out" This request is about readability by people not familiar with the code. 1106390 6 255993 beidson 2015-07-02 08:45:05 -0700 Comment on attachment 255993 Use RefPtr not calling ref/deref() directly View in context: https://bugs.webkit.org/attachment.cgi?id=255993&action=review > Source/WebCore/loader/ImageLoader.cpp:372 > - element().deref(); > + m_protectedElement.clear(); Change this to: m_protectedElement = nullptr; With this code, people have to ask themselves "what kind of object is this, and what does clear do?" With nullptr assignment, anybody not familiar with the code knows it is a pointer being null'ed out. 1106556 7 256057 kyounga.ra 2015-07-02 17:46:18 -0700 Created attachment 256057 Use RefPtr not calling ref/deref() directly 1106560 8 kyounga.ra 2015-07-02 17:48:55 -0700 (In reply to comment #6) > Comment on attachment 255993 [details] > Use RefPtr not calling ref/deref() directly > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255993&action=review > > > Source/WebCore/loader/ImageLoader.cpp:372 > > - element().deref(); > > + m_protectedElement.clear(); > > Change this to: > m_protectedElement = nullptr; > > With this code, people have to ask themselves "what kind of object is this, > and what does clear do?" > With nullptr assignment, anybody not familiar with the code knows it is a > pointer being null'ed out. I thought calling clear() is more explicit. Also, I understand your thought. I attached a changed patch. Thanks for your comment. 1106601 9 beidson 2015-07-02 19:55:15 -0700 (In reply to comment #8) > (In reply to comment #6) > > Comment on attachment 255993 [details] > > Use RefPtr not calling ref/deref() directly > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=255993&action=review > > > > > Source/WebCore/loader/ImageLoader.cpp:372 > > > - element().deref(); > > > + m_protectedElement.clear(); > > > > Change this to: > > m_protectedElement = nullptr; > > > > With this code, people have to ask themselves "what kind of object is this, > > and what does clear do?" > > With nullptr assignment, anybody not familiar with the code knows it is a > > pointer being null'ed out. > > I thought calling clear() is more explicit. Also, I understand your thought. > I attached a changed patch. > Thanks for your comment. FWIW, this discussion spawned https://bugs.webkit.org/show_bug.cgi?id=146556 in which we intend to remove RefPtr::clear altogether :) 1106784 10 256057 commit-queue 2015-07-03 14:56:37 -0700 Comment on attachment 256057 Use RefPtr not calling ref/deref() directly Clearing flags on attachment: 256057 Committed r186267: <http://trac.webkit.org/changeset/186267> 1106785 11 commit-queue 2015-07-03 14:56:40 -0700 All reviewed patches have been landed. Closing bug. 255984 2015-07-01 19:26:32 -0700 2015-07-01 23:30:28 -0700 Use RefPtr not calling ref/deref() directly 146538.patch text/plain 3745 kyounga.ra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjIxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTAxICBLeW91bmdh IFJhICA8a3lvdW5nYUBhbHRpY2FzdC5jb20+CisKKyAgICAgICAgTWVtb3J5IGxlYWsgZm9yIGEg cHJvdGVjdGVkIEVsZW1lbnQgaGF2aW5nIHBlbmRpbmcgZXZlbnRzIGluIEltYWdlTG9hZGVyLiAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjUzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIEltYWdl TG9hZGVyIGlzIGRlc3Ryb3llZCBiZWZvcmUgYW4gYWN0aXZlIGRlcmVmRWxlbWVudFRpbWVyIGlz IGZpcmVkLCBwcm90ZWN0ZWQgZWxlbWVudCdzIHJlZkNvdW50IG5ldmVyIGJlIHplcm8uLgorCisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl TG9hZGVyOjp+SW1hZ2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVw ZGF0ZUZyb21FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRhdGVS ZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRp bmdFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dGltZXJGaXJlZCk6Cisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmg6CisKIDIwMTUtMDctMDEgIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbl0gUkVHUkVTU0lPTiAocjE4 NTEyNCkgQ0FDRkxheWVyIGhhbmRsaW5nIGJyb2tlbgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv SW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxODYyMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsMTEgKzExNiw2IEBAIElt YWdlTG9hZGVyOjp+SW1hZ2VMb2FkZXIoKQogICAgIEFTU0VSVChtX2hhc1BlbmRpbmdFcnJvckV2 ZW50IHx8ICFlcnJvckV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cygqdGhpcykpOwogICAg IGlmIChtX2hhc1BlbmRpbmdFcnJvckV2ZW50KQogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCku Y2FuY2VsRXZlbnQoKnRoaXMpOwotCi0gICAgLy8gSWYgdGhlIEltYWdlTG9hZGVyIGlzIGJlaW5n IGRlc3Ryb3llZCBidXQgaXQgaXMgc3RpbGwgcHJvdGVjdGluZyBpdHMgaW1hZ2UtbG9hZGluZyBF bGVtZW50LAotICAgIC8vIHJlbW92ZSB0aGF0IHByb3RlY3Rpb24gaGVyZS4KLSAgICBpZiAobV9l bGVtZW50SXNQcm90ZWN0ZWQpCi0gICAgICAgIGVsZW1lbnQoKS5kZXJlZigpOwogfQogCiB2b2lk IEltYWdlTG9hZGVyOjpjbGVhckltYWdlKCkKQEAgLTE2MSw3ICsxNTYsNyBAQCB2b2lkIEltYWdl TG9hZGVyOjpjbGVhckltYWdlV2l0aG91dENvbnNpCiAKIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0 ZUZyb21FbGVtZW50KCkKIHsKLSAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBm b3IgdGhlIHBhZ2UsIHRoZW4gZG9uJ3QgbG9hZCBpbWFnZXMuICBXZSBkb24ndCB3YW50IHRvIHNs b3cKKyAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBmb3IgdGhlIHBhZ2UsIHRo ZW4gZG9uJ3QgbG9hZCBpbWFnZXMuIFdlIGRvbid0IHdhbnQgdG8gc2xvdwogICAgIC8vIGRvd24g dGhlIHJhdyBIVE1MIHBhcnNpbmcgY2FzZSBieSBsb2FkaW5nIGltYWdlcyB3ZSBkb24ndCBpbnRl bmQgdG8gZGlzcGxheS4KICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBlbGVtZW50KCkuZG9jdW1l bnQoKTsKICAgICBpZiAoIWRvY3VtZW50Lmhhc0xpdmluZ1JlbmRlclRyZWUoKSkKQEAgLTM0Myw3 ICszMzgsNyBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVSZW5kZXJlcigpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIE9ubHkgdXBkYXRlIHRoZSByZW5kZXJlciBpZiBpdCBkb2Vzbid0IGhh dmUgYW4gaW1hZ2Ugb3IgaWYgd2hhdCB3ZSBoYXZlCi0gICAgLy8gaXMgYSBjb21wbGV0ZSBpbWFn ZS4gIFRoaXMgcHJldmVudHMgZmxpY2tlcmluZyBpbiB0aGUgY2FzZSB3aGVyZSBhIGR5bmFtaWMK KyAgICAvLyBpcyBhIGNvbXBsZXRlIGltYWdlLiBUaGlzIHByZXZlbnRzIGZsaWNrZXJpbmcgaW4g dGhlIGNhc2Ugd2hlcmUgYSBkeW5hbWljCiAgICAgLy8gY2hhbmdlIGlzIGhhcHBlbmluZyBiZXR3 ZWVuIHR3byBpbWFnZXMuCiAgICAgQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2VSZXNv dXJjZS0+Y2FjaGVkSW1hZ2UoKTsKICAgICBpZiAobV9pbWFnZSAhPSBjYWNoZWRJbWFnZSAmJiAo bV9pbWFnZUNvbXBsZXRlIHx8ICFjYWNoZWRJbWFnZSkpCkBAIC0zNjUsNyArMzYwLDcgQEAgdm9p ZCBJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRpbmdFdmVudAogICAgICAgICBpZiAobV9kZXJl ZkVsZW1lbnRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgbV9kZXJlZkVsZW1lbnRUaW1l ci5zdG9wKCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGVsZW1lbnQoKS5yZWYoKTsKKyAg ICAgICAgICAgIG1fcHJvdGVjdGVkRWxlbWVudD0gJmVsZW1lbnQoKTsKICAgICB9IGVsc2Ugewog ICAgICAgICBBU1NFUlQoIW1fZGVyZWZFbGVtZW50VGltZXIuaXNBY3RpdmUoKSk7CiAgICAgICAg IG1fZGVyZWZFbGVtZW50VGltZXIuc3RhcnRPbmVTaG90KDApOwpAQCAtMzc0LDcgKzM2OSw3IEBA IHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZWRIYXNQZW5kaW5nRXZlbnQKIAogdm9pZCBJbWFnZUxv YWRlcjo6dGltZXJGaXJlZCgpCiB7Ci0gICAgZWxlbWVudCgpLmRlcmVmKCk7CisgICAgbV9wcm90 ZWN0ZWRFbGVtZW50LmNsZWFyKCk7CiB9CiAKIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVu ZGluZ0V2ZW50KEltYWdlRXZlbnRTZW5kZXIqIGV2ZW50U2VuZGVyKQpJbmRleDogU291cmNlL1dl YkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv bG9hZGVyL0ltYWdlTG9hZGVyLmgJKHJldmlzaW9uIDE4NjIxNCkKKysrIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9JbWFnZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBAIHBy aXZhdGU6CiAgICAgRWxlbWVudCYgbV9lbGVtZW50OwogICAgIENhY2hlZFJlc291cmNlSGFuZGxl PENhY2hlZEltYWdlPiBtX2ltYWdlOwogICAgIFRpbWVyIG1fZGVyZWZFbGVtZW50VGltZXI7Cisg ICAgUmVmUHRyPEVsZW1lbnQ+IG1fcHJvdGVjdGVkRWxlbWVudDsKICAgICBBdG9taWNTdHJpbmcg bV9mYWlsZWRMb2FkVVJMOwogICAgIGJvb2wgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50IDog MTsKICAgICBib29sIG1faGFzUGVuZGluZ0xvYWRFdmVudCA6IDE7Cg== 255993 2015-07-01 23:30:28 -0700 2015-07-02 17:46:18 -0700 Use RefPtr not calling ref/deref() directly 146538.patch text/plain 3746 kyounga.ra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjIxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTAxICBLeW91bmdh IFJhICA8a3lvdW5nYUBhbHRpY2FzdC5jb20+CisKKyAgICAgICAgTWVtb3J5IGxlYWsgZm9yIGEg cHJvdGVjdGVkIEVsZW1lbnQgaGF2aW5nIHBlbmRpbmcgZXZlbnRzIGluIEltYWdlTG9hZGVyLiAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjUzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIEltYWdl TG9hZGVyIGlzIGRlc3Ryb3llZCBiZWZvcmUgYW4gYWN0aXZlIGRlcmVmRWxlbWVudFRpbWVyIGlz IGZpcmVkLCBwcm90ZWN0ZWQgZWxlbWVudCdzIHJlZkNvdW50IG5ldmVyIGJlIHplcm8uLgorCisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl TG9hZGVyOjp+SW1hZ2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVw ZGF0ZUZyb21FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRhdGVS ZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRp bmdFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dGltZXJGaXJlZCk6Cisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmg6CisKIDIwMTUtMDctMDEgIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbl0gUkVHUkVTU0lPTiAocjE4 NTEyNCkgQ0FDRkxheWVyIGhhbmRsaW5nIGJyb2tlbgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv SW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxODYyMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsMTEgKzExNiw2IEBAIElt YWdlTG9hZGVyOjp+SW1hZ2VMb2FkZXIoKQogICAgIEFTU0VSVChtX2hhc1BlbmRpbmdFcnJvckV2 ZW50IHx8ICFlcnJvckV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cygqdGhpcykpOwogICAg IGlmIChtX2hhc1BlbmRpbmdFcnJvckV2ZW50KQogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCku Y2FuY2VsRXZlbnQoKnRoaXMpOwotCi0gICAgLy8gSWYgdGhlIEltYWdlTG9hZGVyIGlzIGJlaW5n IGRlc3Ryb3llZCBidXQgaXQgaXMgc3RpbGwgcHJvdGVjdGluZyBpdHMgaW1hZ2UtbG9hZGluZyBF bGVtZW50LAotICAgIC8vIHJlbW92ZSB0aGF0IHByb3RlY3Rpb24gaGVyZS4KLSAgICBpZiAobV9l bGVtZW50SXNQcm90ZWN0ZWQpCi0gICAgICAgIGVsZW1lbnQoKS5kZXJlZigpOwogfQogCiB2b2lk IEltYWdlTG9hZGVyOjpjbGVhckltYWdlKCkKQEAgLTE2MSw3ICsxNTYsNyBAQCB2b2lkIEltYWdl TG9hZGVyOjpjbGVhckltYWdlV2l0aG91dENvbnNpCiAKIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0 ZUZyb21FbGVtZW50KCkKIHsKLSAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBm b3IgdGhlIHBhZ2UsIHRoZW4gZG9uJ3QgbG9hZCBpbWFnZXMuICBXZSBkb24ndCB3YW50IHRvIHNs b3cKKyAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBmb3IgdGhlIHBhZ2UsIHRo ZW4gZG9uJ3QgbG9hZCBpbWFnZXMuIFdlIGRvbid0IHdhbnQgdG8gc2xvdwogICAgIC8vIGRvd24g dGhlIHJhdyBIVE1MIHBhcnNpbmcgY2FzZSBieSBsb2FkaW5nIGltYWdlcyB3ZSBkb24ndCBpbnRl bmQgdG8gZGlzcGxheS4KICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBlbGVtZW50KCkuZG9jdW1l bnQoKTsKICAgICBpZiAoIWRvY3VtZW50Lmhhc0xpdmluZ1JlbmRlclRyZWUoKSkKQEAgLTM0Myw3 ICszMzgsNyBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVSZW5kZXJlcigpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIE9ubHkgdXBkYXRlIHRoZSByZW5kZXJlciBpZiBpdCBkb2Vzbid0IGhh dmUgYW4gaW1hZ2Ugb3IgaWYgd2hhdCB3ZSBoYXZlCi0gICAgLy8gaXMgYSBjb21wbGV0ZSBpbWFn ZS4gIFRoaXMgcHJldmVudHMgZmxpY2tlcmluZyBpbiB0aGUgY2FzZSB3aGVyZSBhIGR5bmFtaWMK KyAgICAvLyBpcyBhIGNvbXBsZXRlIGltYWdlLiBUaGlzIHByZXZlbnRzIGZsaWNrZXJpbmcgaW4g dGhlIGNhc2Ugd2hlcmUgYSBkeW5hbWljCiAgICAgLy8gY2hhbmdlIGlzIGhhcHBlbmluZyBiZXR3 ZWVuIHR3byBpbWFnZXMuCiAgICAgQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2VSZXNv dXJjZS0+Y2FjaGVkSW1hZ2UoKTsKICAgICBpZiAobV9pbWFnZSAhPSBjYWNoZWRJbWFnZSAmJiAo bV9pbWFnZUNvbXBsZXRlIHx8ICFjYWNoZWRJbWFnZSkpCkBAIC0zNjUsNyArMzYwLDcgQEAgdm9p ZCBJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRpbmdFdmVudAogICAgICAgICBpZiAobV9kZXJl ZkVsZW1lbnRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgbV9kZXJlZkVsZW1lbnRUaW1l ci5zdG9wKCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGVsZW1lbnQoKS5yZWYoKTsKKyAg ICAgICAgICAgIG1fcHJvdGVjdGVkRWxlbWVudCA9ICZlbGVtZW50KCk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgQVNTRVJUKCFtX2RlcmVmRWxlbWVudFRpbWVyLmlzQWN0aXZlKCkpOwogICAgICAg ICBtX2RlcmVmRWxlbWVudFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKQEAgLTM3NCw3ICszNjksNyBA QCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVkSGFzUGVuZGluZ0V2ZW50CiAKIHZvaWQgSW1hZ2VM b2FkZXI6OnRpbWVyRmlyZWQoKQogewotICAgIGVsZW1lbnQoKS5kZXJlZigpOworICAgIG1fcHJv dGVjdGVkRWxlbWVudC5jbGVhcigpOwogfQogCiB2b2lkIEltYWdlTG9hZGVyOjpkaXNwYXRjaFBl bmRpbmdFdmVudChJbWFnZUV2ZW50U2VuZGVyKiBldmVudFNlbmRlcikKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9JbWFnZUxvYWRlci5oCShyZXZpc2lvbiAxODYyMTQpCisrKyBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsNyBAQCBw cml2YXRlOgogICAgIEVsZW1lbnQmIG1fZWxlbWVudDsKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRs ZTxDYWNoZWRJbWFnZT4gbV9pbWFnZTsKICAgICBUaW1lciBtX2RlcmVmRWxlbWVudFRpbWVyOwor ICAgIFJlZlB0cjxFbGVtZW50PiBtX3Byb3RlY3RlZEVsZW1lbnQ7CiAgICAgQXRvbWljU3RyaW5n IG1fZmFpbGVkTG9hZFVSTDsKICAgICBib29sIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA6 IDE7CiAgICAgYm9vbCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgOiAxOwo= 256057 2015-07-02 17:46:18 -0700 2015-07-03 14:56:37 -0700 Use RefPtr not calling ref/deref() directly 146538.patch text/plain 3748 kyounga.ra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjIxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTAxICBLeW91bmdh IFJhICA8a3lvdW5nYUBhbHRpY2FzdC5jb20+CisKKyAgICAgICAgTWVtb3J5IGxlYWsgZm9yIGEg cHJvdGVjdGVkIEVsZW1lbnQgaGF2aW5nIHBlbmRpbmcgZXZlbnRzIGluIEltYWdlTG9hZGVyLiAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjUzOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIEltYWdl TG9hZGVyIGlzIGRlc3Ryb3llZCBiZWZvcmUgYW4gYWN0aXZlIGRlcmVmRWxlbWVudFRpbWVyIGlz IGZpcmVkLCBwcm90ZWN0ZWQgZWxlbWVudCdzIHJlZkNvdW50IG5ldmVyIGJlIHplcm8uLgorCisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl TG9hZGVyOjp+SW1hZ2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVw ZGF0ZUZyb21FbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRhdGVS ZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRp bmdFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dGltZXJGaXJlZCk6Cisg ICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmg6CisKIDIwMTUtMDctMDEgIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dpbl0gUkVHUkVTU0lPTiAocjE4 NTEyNCkgQ0FDRkxheWVyIGhhbmRsaW5nIGJyb2tlbgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv SW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxODYyMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsMTEgKzExNiw2IEBAIElt YWdlTG9hZGVyOjp+SW1hZ2VMb2FkZXIoKQogICAgIEFTU0VSVChtX2hhc1BlbmRpbmdFcnJvckV2 ZW50IHx8ICFlcnJvckV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cygqdGhpcykpOwogICAg IGlmIChtX2hhc1BlbmRpbmdFcnJvckV2ZW50KQogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCku Y2FuY2VsRXZlbnQoKnRoaXMpOwotCi0gICAgLy8gSWYgdGhlIEltYWdlTG9hZGVyIGlzIGJlaW5n IGRlc3Ryb3llZCBidXQgaXQgaXMgc3RpbGwgcHJvdGVjdGluZyBpdHMgaW1hZ2UtbG9hZGluZyBF bGVtZW50LAotICAgIC8vIHJlbW92ZSB0aGF0IHByb3RlY3Rpb24gaGVyZS4KLSAgICBpZiAobV9l bGVtZW50SXNQcm90ZWN0ZWQpCi0gICAgICAgIGVsZW1lbnQoKS5kZXJlZigpOwogfQogCiB2b2lk IEltYWdlTG9hZGVyOjpjbGVhckltYWdlKCkKQEAgLTE2MSw3ICsxNTYsNyBAQCB2b2lkIEltYWdl TG9hZGVyOjpjbGVhckltYWdlV2l0aG91dENvbnNpCiAKIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0 ZUZyb21FbGVtZW50KCkKIHsKLSAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBm b3IgdGhlIHBhZ2UsIHRoZW4gZG9uJ3QgbG9hZCBpbWFnZXMuICBXZSBkb24ndCB3YW50IHRvIHNs b3cKKyAgICAvLyBJZiB3ZSdyZSBub3QgbWFraW5nIHJlbmRlcmVycyBmb3IgdGhlIHBhZ2UsIHRo ZW4gZG9uJ3QgbG9hZCBpbWFnZXMuIFdlIGRvbid0IHdhbnQgdG8gc2xvdwogICAgIC8vIGRvd24g dGhlIHJhdyBIVE1MIHBhcnNpbmcgY2FzZSBieSBsb2FkaW5nIGltYWdlcyB3ZSBkb24ndCBpbnRl bmQgdG8gZGlzcGxheS4KICAgICBEb2N1bWVudCYgZG9jdW1lbnQgPSBlbGVtZW50KCkuZG9jdW1l bnQoKTsKICAgICBpZiAoIWRvY3VtZW50Lmhhc0xpdmluZ1JlbmRlclRyZWUoKSkKQEAgLTM0Myw3 ICszMzgsNyBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVSZW5kZXJlcigpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIE9ubHkgdXBkYXRlIHRoZSByZW5kZXJlciBpZiBpdCBkb2Vzbid0IGhh dmUgYW4gaW1hZ2Ugb3IgaWYgd2hhdCB3ZSBoYXZlCi0gICAgLy8gaXMgYSBjb21wbGV0ZSBpbWFn ZS4gIFRoaXMgcHJldmVudHMgZmxpY2tlcmluZyBpbiB0aGUgY2FzZSB3aGVyZSBhIGR5bmFtaWMK KyAgICAvLyBpcyBhIGNvbXBsZXRlIGltYWdlLiBUaGlzIHByZXZlbnRzIGZsaWNrZXJpbmcgaW4g dGhlIGNhc2Ugd2hlcmUgYSBkeW5hbWljCiAgICAgLy8gY2hhbmdlIGlzIGhhcHBlbmluZyBiZXR3 ZWVuIHR3byBpbWFnZXMuCiAgICAgQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2VSZXNv dXJjZS0+Y2FjaGVkSW1hZ2UoKTsKICAgICBpZiAobV9pbWFnZSAhPSBjYWNoZWRJbWFnZSAmJiAo bV9pbWFnZUNvbXBsZXRlIHx8ICFjYWNoZWRJbWFnZSkpCkBAIC0zNjUsNyArMzYwLDcgQEAgdm9p ZCBJbWFnZUxvYWRlcjo6dXBkYXRlZEhhc1BlbmRpbmdFdmVudAogICAgICAgICBpZiAobV9kZXJl ZkVsZW1lbnRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgbV9kZXJlZkVsZW1lbnRUaW1l ci5zdG9wKCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGVsZW1lbnQoKS5yZWYoKTsKKyAg ICAgICAgICAgIG1fcHJvdGVjdGVkRWxlbWVudCA9ICZlbGVtZW50KCk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgQVNTRVJUKCFtX2RlcmVmRWxlbWVudFRpbWVyLmlzQWN0aXZlKCkpOwogICAgICAg ICBtX2RlcmVmRWxlbWVudFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKQEAgLTM3NCw3ICszNjksNyBA QCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVkSGFzUGVuZGluZ0V2ZW50CiAKIHZvaWQgSW1hZ2VM b2FkZXI6OnRpbWVyRmlyZWQoKQogewotICAgIGVsZW1lbnQoKS5kZXJlZigpOworICAgIG1fcHJv dGVjdGVkRWxlbWVudCA9IG51bGxwdHI7CiB9CiAKIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3BhdGNo UGVuZGluZ0V2ZW50KEltYWdlRXZlbnRTZW5kZXIqIGV2ZW50U2VuZGVyKQpJbmRleDogU291cmNl L1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgJKHJldmlzaW9uIDE4NjIxNCkKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBA IHByaXZhdGU6CiAgICAgRWxlbWVudCYgbV9lbGVtZW50OwogICAgIENhY2hlZFJlc291cmNlSGFu ZGxlPENhY2hlZEltYWdlPiBtX2ltYWdlOwogICAgIFRpbWVyIG1fZGVyZWZFbGVtZW50VGltZXI7 CisgICAgUmVmUHRyPEVsZW1lbnQ+IG1fcHJvdGVjdGVkRWxlbWVudDsKICAgICBBdG9taWNTdHJp bmcgbV9mYWlsZWRMb2FkVVJMOwogICAgIGJvb2wgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50 IDogMTsKICAgICBib29sIG1faGFzUGVuZGluZ0xvYWRFdmVudCA6IDE7Cg==