116680 2013-05-23 09:34:28 -0700 We need to clear main resource when detaching DocumentLoader from the frame. 2013-05-23 14:17:27 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yongjun_zhang yongjun_zhang ap beidson commit-queue ddkilzer japhet koivisto yongjun_zhang oldest_to_newest 892922 0 yongjun_zhang 2013-05-23 09:34:28 -0700 Normally, when we detach the documentLoader in DocumentLoader::detachFromFrame, main resource is also cleared in stopLoading(). There is possibility that main resource not being cleared, and this could cause crash later since docLoader could still receive resource callbacks. 892923 1 yongjun_zhang 2013-05-23 09:34:42 -0700 <rdar://problem/13924120> 892929 2 202723 yongjun_zhang 2013-05-23 09:59:16 -0700 Created attachment 202723 clear main resource in detachFromFrame. 892959 3 ap 2013-05-23 10:56:27 -0700 What if the document gets attached to a frame again (when restoring from page cache)? I suspect that it still needs its main resource then. 892965 4 yongjun_zhang 2013-05-23 11:11:13 -0700 (In reply to comment #3) > What if the document gets attached to a frame again (when restoring from page cache)? I suspect that it still needs its main resource then. Good question! that would be a problem. I think instead of clear the main resource, we should just remove DocumentLoader from its client set, that way m_mainResource would still be alive and we won't receive callbacks when it is detached. Will post another patch. 893007 5 202734 yongjun_zhang 2013-05-23 12:45:40 -0700 Created attachment 202734 don't clear the main resource, just remove docLoader from its client set to avoid getting callback after it is detached. 893010 6 commit-queue 2013-05-23 12:46:19 -0700 Attachment 202734 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/loader/DocumentLoader.cpp', u'Source/WebCore/loader/cache/CachedResource.h']" exit_code: 1 Source/WebCore/loader/DocumentLoader.cpp:1416: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 893012 7 202736 yongjun_zhang 2013-05-23 12:52:02 -0700 Created attachment 202736 fix style issue. 893017 8 ap 2013-05-23 13:03:00 -0700 Makes sense to me, but I think that Brady would be the best reviewer here. 893034 9 202736 yongjun_zhang 2013-05-23 13:55:41 -0700 Comment on attachment 202736 fix style issue. thanks Brady. 893041 10 202736 commit-queue 2013-05-23 14:17:25 -0700 Comment on attachment 202736 fix style issue. Clearing flags on attachment: 202736 Committed r150613: <http://trac.webkit.org/changeset/150613> 893042 11 commit-queue 2013-05-23 14:17:27 -0700 All reviewed patches have been landed. Closing bug. 202723 2013-05-23 09:59:16 -0700 2013-05-23 12:45:40 -0700 clear main resource in detachFromFrame. frame_settings_crash.patch text/plain 1630 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDU5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA1LTIzICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2UgbmVlZCB0byBj bGVhciBtYWluIHJlc291cmNlIHdoZW4gZGV0YWNoaW5nIERvY3VtZW50TG9hZGVyIGZyb20gdGhl IGZyYW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE2NjgwCisKKyAgICAgICAgTm9ybWFsbHksIHdoZW4gd2UgZGV0YWNoIHRoZSBkb2N1bWVudExv YWRlciBpbiBEb2N1bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lLCBtYWluIHJlc291cmNlIGlz IGFsc28gY2xlYXJlZAorICAgICAgICBpbiBzdG9wTG9hZGluZygpLiAgVGhlcmUgaXMgcG9zc2li aWxpdHkgdGhhdCBtYWluIHJlc291cmNlIG5vdCBiZWluZyBjbGVhcmVkLCBhbmQgdGhpcyBjb3Vs ZCBjYXVzZSBjcmFzaCBsYXRlcgorICAgICAgICBzaW5jZSBkb2NMb2FkZXIgY291bGQgc3RpbGwg cmVjZWl2ZSByZXNvdXJjZSBjYWxsYmFja3MuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIGRvZXNuJ3QgaGFwcGVuIG9u IE9TIFguCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmRldGFjaEZyb21GcmFtZSk6CisKIDIwMTMtMDUtMjMg IENocmlzdG9waGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNTA1ODYuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDE1MDU4NykKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5Myw2ICs4 OTMsNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpkZXRhY2hGcm9tRnJhbWUoKQogICAgIC8vIEl0 IG5ldmVyIG1ha2VzIHNlbnNlIHRvIGhhdmUgYSBkb2N1bWVudCBsb2FkZXIgdGhhdCBpcyBkZXRh Y2hlZCBmcm9tIGl0cwogICAgIC8vIGZyYW1lIGhhdmUgYW55IGxvYWRzIGFjdGl2ZSwgc28gZ28g YWhlYWQgYW5kIGtpbGwgYWxsIHRoZSBsb2Fkcy4KICAgICBzdG9wTG9hZGluZygpOworICAgIGNs ZWFyTWFpblJlc291cmNlKCk7CiAKICAgICBtX2FwcGxpY2F0aW9uQ2FjaGVIb3N0LT5zZXRET01B cHBsaWNhdGlvbkNhY2hlKDApOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bG9hZGVy RGV0YWNoZWRGcm9tRnJhbWUobV9mcmFtZSwgdGhpcyk7Cg== 202734 2013-05-23 12:45:40 -0700 2013-05-23 12:52:02 -0700 don't clear the main resource, just remove docLoader from its client set to avoid getting callback after it is detached. frame_settings_crash.patch text/plain 3517 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDYwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA1LTIzICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2UgbmVlZCB0byBj bGVhciBtYWluIHJlc291cmNlIHdoZW4gZGV0YWNoaW5nIERvY3VtZW50TG9hZGVyIGZyb20gdGhl IGZyYW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE2NjgwCisKKyAgICAgICAgTm9ybWFsbHksIHdoZW4gd2UgZGV0YWNoIHRoZSBkb2N1bWVudExv YWRlciBpbiBEb2N1bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lLCBtYWluIHJlc291cmNlIGlz IGFsc28gY2xlYXJlZAorICAgICAgICBpbiBzdG9wTG9hZGluZygpLiAgVGhlcmUgaXMgcG9zc2li aWxpdHkgdGhhdCBtYWluIHJlc291cmNlIG5vdCBiZWluZyBjbGVhcmVkLCBhbmQgdGhpcyBjb3Vs ZCBjYXVzZSBjcmFzaCBsYXRlcgorICAgICAgICBzaW5jZSBkb2NMb2FkZXIgY291bGQgc3RpbGwg cmVjZWl2ZSByZXNvdXJjZSBjYWxsYmFja3MuICBUbyBhdm9pZCB0aGF0LCB3ZSBjYW4gcmVtb3Zl IGRvY0xvYWRlciBmcm9tIG1haW4gcmVzb3VyY2UncworICAgICAgICBjbGllbnQgc2V0IGluIGRl dGFjaEZyb21GcmFtZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgZG9lc24ndCBoYXBwZW4gb24gT1MgWC4KKworICAg ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlLmg6IG1ha2UgaGFzQ2xpZW50IGFjY2Vzc2libGUgcHVibGljbHkuCisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6aGFzQ2xpZW50KToKKyAgICAgICAgKENhY2hlZFJl c291cmNlKToKKwogMjAxMy0wNS0xOCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVGhlIGVsbGlwc2lzIGluIGEgdGV4dCBvdmVyZmxvdyBzaG91bGQgbm90IGF2 b2lkIGZsb2F0cwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CShyZXZpc2lvbiAxNTA1ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OTMsNiArODkzLDggQEAgdm9pZCBEb2N1bWVudExv YWRlcjo6ZGV0YWNoRnJvbUZyYW1lKCkKICAgICAvLyBJdCBuZXZlciBtYWtlcyBzZW5zZSB0byBo YXZlIGEgZG9jdW1lbnQgbG9hZGVyIHRoYXQgaXMgZGV0YWNoZWQgZnJvbSBpdHMKICAgICAvLyBm cmFtZSBoYXZlIGFueSBsb2FkcyBhY3RpdmUsIHNvIGdvIGFoZWFkIGFuZCBraWxsIGFsbCB0aGUg bG9hZHMuCiAgICAgc3RvcExvYWRpbmcoKTsKKyAgICBpZiAobV9tYWluUmVzb3VyY2UgJiYgbV9t YWluUmVzb3VyY2UtPmhhc0NsaWVudCh0aGlzKSkKKyAgICAgICAgbV9tYWluUmVzb3VyY2UtPnJl bW92ZUNsaWVudCh0aGlzKTsKIAogICAgIG1fYXBwbGljYXRpb25DYWNoZUhvc3QtPnNldERPTUFw cGxpY2F0aW9uQ2FjaGUoMCk7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpsb2FkZXJE ZXRhY2hlZEZyb21GcmFtZShtX2ZyYW1lLCB0aGlzKTsKQEAgLTE0MTAsMTAgKzE0MTIsMTAgQEAg dm9pZCBEb2N1bWVudExvYWRlcjo6Y2FuY2VsTWFpblJlc291cmNlTAogCiB2b2lkIERvY3VtZW50 TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZSgpCiB7Ci0gICAgaWYgKG1fbWFpblJlc291cmNlKSB7 Ci0gICAgICAgIG1fbWFpblJlc291cmNlLT5yZW1vdmVDbGllbnQodGhpcyk7Ci0gICAgICAgIG1f bWFpblJlc291cmNlID0gMDsKLSAgICB9CisgICAgaWYgKG1fbWFpblJlc291cmNlICYmIG1fbWFp blJlc291cmNlLT5oYXNDbGllbnQodGhpcykpCisgICAgICAgICAgICBtX21haW5SZXNvdXJjZS0+ cmVtb3ZlQ2xpZW50KHRoaXMpOworCisgICAgbV9tYWluUmVzb3VyY2UgPSAwOwogfQogCiB2b2lk IERvY3VtZW50TG9hZGVyOjpzdWJyZXNvdXJjZUxvYWRlckZpbmlzaGVkTG9hZGluZ09uZVBhcnQo UmVzb3VyY2VMb2FkZXIqIGxvYWRlcikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZS5oCShyZXZpc2lvbiAxNTA1ODcpCisrKyBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDYg KzEyMiw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZENsaWVudChDYWNoZWRSZXNvdXJjZUNsaWVu dCopOwogICAgIHZvaWQgcmVtb3ZlQ2xpZW50KENhY2hlZFJlc291cmNlQ2xpZW50Kik7CiAgICAg Ym9vbCBoYXNDbGllbnRzKCkgY29uc3QgeyByZXR1cm4gIW1fY2xpZW50cy5pc0VtcHR5KCkgfHwg IW1fY2xpZW50c0F3YWl0aW5nQ2FsbGJhY2suaXNFbXB0eSgpOyB9CisgICAgYm9vbCBoYXNDbGll bnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQqIGNsaWVudCkgeyByZXR1cm4gbV9jbGllbnRzLmNvbnRh aW5zKGNsaWVudCkgfHwgbV9jbGllbnRzQXdhaXRpbmdDYWxsYmFjay5jb250YWlucyhjbGllbnQp OyB9CiAgICAgYm9vbCBkZWxldGVJZlBvc3NpYmxlKCk7CiAKICAgICBlbnVtIFByZWxvYWRSZXN1 bHQgewpAQCAtMjc2LDggKzI3Nyw2IEBAIHByb3RlY3RlZDoKICAgICB9OwogICAgIEhhc2hNYXA8 Q2FjaGVkUmVzb3VyY2VDbGllbnQqLCBPd25QdHI8Q2FjaGVkUmVzb3VyY2VDYWxsYmFjaz4gPiBt X2NsaWVudHNBd2FpdGluZ0NhbGxiYWNrOwogCi0gICAgYm9vbCBoYXNDbGllbnQoQ2FjaGVkUmVz b3VyY2VDbGllbnQqIGNsaWVudCkgeyByZXR1cm4gbV9jbGllbnRzLmNvbnRhaW5zKGNsaWVudCkg fHwgbV9jbGllbnRzQXdhaXRpbmdDYWxsYmFjay5jb250YWlucyhjbGllbnQpOyB9Ci0KICAgICBS ZXNvdXJjZVJlcXVlc3QgbV9yZXNvdXJjZVJlcXVlc3Q7CiAgICAgU3RyaW5nIG1fYWNjZXB0Owog ICAgIFJlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gbV9sb2FkZXI7Cg== 202736 2013-05-23 12:52:02 -0700 2013-05-23 14:17:24 -0700 fix style issue. frame_settings_crash.patch text/plain 3468 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDYwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA1LTIzICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2UgbmVlZCB0byBj bGVhciBtYWluIHJlc291cmNlIHdoZW4gZGV0YWNoaW5nIERvY3VtZW50TG9hZGVyIGZyb20gdGhl IGZyYW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE2NjgwCisKKyAgICAgICAgTm9ybWFsbHksIHdoZW4gd2UgZGV0YWNoIHRoZSBkb2N1bWVudExv YWRlciBpbiBEb2N1bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lLCBtYWluIHJlc291cmNlIGlz IGFsc28gY2xlYXJlZAorICAgICAgICBpbiBzdG9wTG9hZGluZygpLiAgVGhlcmUgaXMgcG9zc2li aWxpdHkgdGhhdCBtYWluIHJlc291cmNlIG5vdCBiZWluZyBjbGVhcmVkLCBhbmQgdGhpcyBjb3Vs ZCBjYXVzZSBjcmFzaCBsYXRlcgorICAgICAgICBzaW5jZSBkb2NMb2FkZXIgY291bGQgc3RpbGwg cmVjZWl2ZSByZXNvdXJjZSBjYWxsYmFja3MuICBUbyBhdm9pZCB0aGF0LCB3ZSBjYW4gcmVtb3Zl IGRvY0xvYWRlciBmcm9tIG1haW4gcmVzb3VyY2UncworICAgICAgICBjbGllbnQgc2V0IGluIGRl dGFjaEZyb21GcmFtZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgZG9lc24ndCBoYXBwZW4gb24gT1MgWC4KKworICAg ICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlLmg6IG1ha2UgaGFzQ2xpZW50IGFjY2Vzc2libGUgcHVibGljbHkuCisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6aGFzQ2xpZW50KToKKyAgICAgICAgKENhY2hlZFJl c291cmNlKToKKwogMjAxMy0wNS0xOCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVGhlIGVsbGlwc2lzIGluIGEgdGV4dCBvdmVyZmxvdyBzaG91bGQgbm90IGF2 b2lkIGZsb2F0cwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CShyZXZpc2lvbiAxNTA1ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OTMsNiArODkzLDggQEAgdm9pZCBEb2N1bWVudExv YWRlcjo6ZGV0YWNoRnJvbUZyYW1lKCkKICAgICAvLyBJdCBuZXZlciBtYWtlcyBzZW5zZSB0byBo YXZlIGEgZG9jdW1lbnQgbG9hZGVyIHRoYXQgaXMgZGV0YWNoZWQgZnJvbSBpdHMKICAgICAvLyBm cmFtZSBoYXZlIGFueSBsb2FkcyBhY3RpdmUsIHNvIGdvIGFoZWFkIGFuZCBraWxsIGFsbCB0aGUg bG9hZHMuCiAgICAgc3RvcExvYWRpbmcoKTsKKyAgICBpZiAobV9tYWluUmVzb3VyY2UgJiYgbV9t YWluUmVzb3VyY2UtPmhhc0NsaWVudCh0aGlzKSkKKyAgICAgICAgbV9tYWluUmVzb3VyY2UtPnJl bW92ZUNsaWVudCh0aGlzKTsKIAogICAgIG1fYXBwbGljYXRpb25DYWNoZUhvc3QtPnNldERPTUFw cGxpY2F0aW9uQ2FjaGUoMCk7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpsb2FkZXJE ZXRhY2hlZEZyb21GcmFtZShtX2ZyYW1lLCB0aGlzKTsKQEAgLTE0MTAsMTAgKzE0MTIsMTAgQEAg dm9pZCBEb2N1bWVudExvYWRlcjo6Y2FuY2VsTWFpblJlc291cmNlTAogCiB2b2lkIERvY3VtZW50 TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZSgpCiB7Ci0gICAgaWYgKG1fbWFpblJlc291cmNlKSB7 CisgICAgaWYgKG1fbWFpblJlc291cmNlICYmIG1fbWFpblJlc291cmNlLT5oYXNDbGllbnQodGhp cykpCiAgICAgICAgIG1fbWFpblJlc291cmNlLT5yZW1vdmVDbGllbnQodGhpcyk7Ci0gICAgICAg IG1fbWFpblJlc291cmNlID0gMDsKLSAgICB9CisKKyAgICBtX21haW5SZXNvdXJjZSA9IDA7CiB9 CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN1YnJlc291cmNlTG9hZGVyRmluaXNoZWRMb2FkaW5n T25lUGFydChSZXNvdXJjZUxvYWRlciogbG9hZGVyKQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmgJKHJldmlzaW9uIDE1MDU4NykKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMjIsNiArMTIyLDcgQEAgcHVibGljOgogICAgIHZvaWQgYWRkQ2xpZW50KENhY2hlZFJlc291 cmNlQ2xpZW50Kik7CiAgICAgdm9pZCByZW1vdmVDbGllbnQoQ2FjaGVkUmVzb3VyY2VDbGllbnQq KTsKICAgICBib29sIGhhc0NsaWVudHMoKSBjb25zdCB7IHJldHVybiAhbV9jbGllbnRzLmlzRW1w dHkoKSB8fCAhbV9jbGllbnRzQXdhaXRpbmdDYWxsYmFjay5pc0VtcHR5KCk7IH0KKyAgICBib29s IGhhc0NsaWVudChDYWNoZWRSZXNvdXJjZUNsaWVudCogY2xpZW50KSB7IHJldHVybiBtX2NsaWVu dHMuY29udGFpbnMoY2xpZW50KSB8fCBtX2NsaWVudHNBd2FpdGluZ0NhbGxiYWNrLmNvbnRhaW5z KGNsaWVudCk7IH0KICAgICBib29sIGRlbGV0ZUlmUG9zc2libGUoKTsKIAogICAgIGVudW0gUHJl bG9hZFJlc3VsdCB7CkBAIC0yNzYsOCArMjc3LDYgQEAgcHJvdGVjdGVkOgogICAgIH07CiAgICAg SGFzaE1hcDxDYWNoZWRSZXNvdXJjZUNsaWVudCosIE93blB0cjxDYWNoZWRSZXNvdXJjZUNhbGxi YWNrPiA+IG1fY2xpZW50c0F3YWl0aW5nQ2FsbGJhY2s7CiAKLSAgICBib29sIGhhc0NsaWVudChD YWNoZWRSZXNvdXJjZUNsaWVudCogY2xpZW50KSB7IHJldHVybiBtX2NsaWVudHMuY29udGFpbnMo Y2xpZW50KSB8fCBtX2NsaWVudHNBd2FpdGluZ0NhbGxiYWNrLmNvbnRhaW5zKGNsaWVudCk7IH0K LQogICAgIFJlc291cmNlUmVxdWVzdCBtX3Jlc291cmNlUmVxdWVzdDsKICAgICBTdHJpbmcgbV9h Y2NlcHQ7CiAgICAgUmVmUHRyPFN1YnJlc291cmNlTG9hZGVyPiBtX2xvYWRlcjsK