158266 2016-06-01 11:38:57 -0700 Fix null dereferencing in ResourceTimingInformation::addResourceTiming 2016-06-01 13:14:09 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen ap cdumez commit-queue japhet ryanhaddad oldest_to_newest 1198210 0 achristensen 2016-06-01 11:38:57 -0700 Fix null dereferencing in ResourceTimingInformation::addResourceTiming 1198213 1 280253 achristensen 2016-06-01 11:43:19 -0700 Created attachment 280253 Patch 1198216 2 280253 beidson 2016-06-01 11:45:58 -0700 Comment on attachment 280253 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=280253&action=review How was this noticed? How does it reproduce? How can we test it? > Source/WebCore/ChangeLog:9 > + Reviewed by NOBODY (OOPS!). > + > + * loader/ResourceTimingInformation.cpp: There's an expected WebCore/ChangeLog line missing here...! 1198220 3 280255 achristensen 2016-06-01 11:50:14 -0700 Created attachment 280255 Patch 1198222 4 280255 cdumez 2016-06-01 11:53:36 -0700 Comment on attachment 280255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=280255&action=review > Source/WebCore/loader/ResourceTimingInformation.cpp:46 > + auto initiatorIt = m_initiatorMap.find(resource); Considering it does nothing when document is null, shouldn't we update the parameter to be a Document& document and do a null check at the call site if needed? 1198223 5 280255 ap 2016-06-01 11:54:01 -0700 Comment on attachment 280255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=280255&action=review > Source/WebCore/ChangeLog:9 > + This would crash sometimes in http/tests/security/cross-frame-access-custom.html Given that it's a flaky crash, is it actually correct to fix it with a null check? What will the observable failure be when we bail out early? 1198226 6 280257 achristensen 2016-06-01 12:04:18 -0700 Created attachment 280257 Patch 1198228 7 achristensen 2016-06-01 12:09:03 -0700 (In reply to comment #5) > Comment on attachment 280255 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=280255&action=review > > > Source/WebCore/ChangeLog:9 > > + This would crash sometimes in http/tests/security/cross-frame-access-custom.html > > Given that it's a flaky crash, is it actually correct to fix it with a null > check? What will the observable failure be when we bail out early? If there's no document, then the performance entry simply won't be recorded. I think this is correct. Chris's suggestion makes this patch look and feel much better. We were really assuming CachedResourceLoader::document always returned non-null, which was a bad assumption. There are other similar checks in CachedResourceLoader.cpp. 1198238 8 280257 cdumez 2016-06-01 12:41:30 -0700 Comment on attachment 280257 Patch Seems reasonable. 1198249 9 280257 commit-queue 2016-06-01 13:14:04 -0700 Comment on attachment 280257 Patch Clearing flags on attachment: 280257 Committed r201565: <http://trac.webkit.org/changeset/201565> 1198250 10 commit-queue 2016-06-01 13:14:09 -0700 All reviewed patches have been landed. Closing bug. 280253 2016-06-01 11:43:19 -0700 2016-06-01 11:50:11 -0700 Patch bug-158266-20160601114438.patch text/plain 2298 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMTU2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA2LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IG51bGwg ZGVyZWZlcmVuY2luZyBpbiBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRp bWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4 MjY2CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI2NTI4NDY2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VUaW1pbmdJbmZv cm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9u OjphZGRSZXNvdXJjZVRpbWluZyk6CisgICAgICAgIFNvbWV0aW1lcyB3ZSB3b3VsZCBoaXQgYSBu dWxsIHBvaW50ZXIgaW4gaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1mcmFtZS1hY2Nlc3MtY3Vz dG9tLmh0bWwKKyAgICAgICAgd2hlbiBjYWxsaW5nIHBhcmVudERvY3VtZW50LgorCiAyMDE2LTA2 LTAxICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaW5s aW5lIGNhcGFjaXR5IGZvciBTdHlsZVByb3BlcnR5U2hvcnRoYW5kIFZlY3RvcnMuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24u Y3BwCShyZXZpc2lvbiAyMDE1MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VU aW1pbmdJbmZvcm1hdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDEzICs0MywxMyBAQCB2 b2lkIFJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291CiAgICAgQVNTRVJUKFJ1bnRp bWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVk KCkpOwogICAgIGlmIChyZXNvdXJjZSAmJiByZXNvdXJjZS0+cmVzb3VyY2VSZXF1ZXN0KCkudXJs KCkucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpCiAgICAgICAgICYmICgoIXJlc291cmNlLT5lcnJv ck9jY3VycmVkKCkgJiYgIXJlc291cmNlLT53YXNDYW5jZWxlZCgpKSB8fCByZXNvdXJjZS0+cmVz cG9uc2UoKS5odHRwU3RhdHVzQ29kZSgpID09IDMwNCkpIHsKLSAgICAgICAgSGFzaE1hcDxDYWNo ZWRSZXNvdXJjZSosIEluaXRpYXRvckluZm8+OjppdGVyYXRvciBpbml0aWF0b3JJdCA9IG1faW5p dGlhdG9yTWFwLmZpbmQocmVzb3VyY2UpOworICAgICAgICBhdXRvIGluaXRpYXRvckl0ID0gbV9p bml0aWF0b3JNYXAuZmluZChyZXNvdXJjZSk7CiAgICAgICAgIGlmIChpbml0aWF0b3JJdCAhPSBt X2luaXRpYXRvck1hcC5lbmQoKSAmJiBpbml0aWF0b3JJdC0+dmFsdWUuYWRkZWQgPT0gTm90WWV0 QWRkZWQpIHsKLSAgICAgICAgICAgIEFTU0VSVChkb2N1bWVudCk7CiAgICAgICAgICAgICBEb2N1 bWVudCogaW5pdGlhdG9yRG9jdW1lbnQgPSBkb2N1bWVudDsKLSAgICAgICAgICAgIGlmIChyZXNv dXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpNYWluUmVzb3VyY2UpCisgICAgICAgICAg ICBpZiAoZG9jdW1lbnQgJiYgcmVzb3VyY2UtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6TWFp blJlc291cmNlKQogICAgICAgICAgICAgICAgIGluaXRpYXRvckRvY3VtZW50ID0gZG9jdW1lbnQt PnBhcmVudERvY3VtZW50KCk7Ci0gICAgICAgICAgICBBU1NFUlQoaW5pdGlhdG9yRG9jdW1lbnQp OworICAgICAgICAgICAgaWYgKCFpbml0aWF0b3JEb2N1bWVudCkKKyAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICBBU1NFUlQoaW5pdGlhdG9yRG9jdW1lbnQtPmRvbVdpbmRvdygp KTsKICAgICAgICAgICAgIEFTU0VSVChpbml0aWF0b3JEb2N1bWVudC0+ZG9tV2luZG93KCktPnBl cmZvcm1hbmNlKCkpOwogICAgICAgICAgICAgY29uc3QgSW5pdGlhdG9ySW5mbyYgaW5mbyA9IGlu aXRpYXRvckl0LT52YWx1ZTsK 280255 2016-06-01 11:50:14 -0700 2016-06-01 12:04:14 -0700 Patch bug-158266-20160601115134.patch text/plain 2405 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMTU2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA2LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IG51bGwg ZGVyZWZlcmVuY2luZyBpbiBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRp bWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4 MjY2CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI2NTI4NDY2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3b3VsZCBjcmFzaCBzb21ldGltZXMg aW4gaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1mcmFtZS1hY2Nlc3MtY3VzdG9tLmh0bWwKKwor ICAgICAgICAqIGxvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291cmNlVGltaW5nKToK KyAgICAgICAgV2Ugd291bGQgZGVyZWZlcmVuY2UgYSBudWxsIHBvaW50ZXIgb24gdGhlIGZpcnN0 IGluc3RydWN0aW9uIHdoZW4gY2FsbGluZyAKKyAgICAgICAgRG9jdW1lbnQ6OnBhcmVudERvY3Vt ZW50LCB3aGljaCBtZWFucyB0aGUgZG9jdW1lbnQgd2FzIG51bGwuCisKIDIwMTYtMDYtMDEgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBpbmxpbmUgY2Fw YWNpdHkgZm9yIFN0eWxlUHJvcGVydHlTaG9ydGhhbmQgVmVjdG9ycy4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5jcHAJKHJl dmlzaW9uIDIwMTUyNCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZVRpbWluZ0lu Zm9ybWF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsMTMgKzQzLDEzIEBAIHZvaWQgUmVz b3VyY2VUaW1pbmdJbmZvcm1hdGlvbjo6YWRkUmVzb3UKICAgICBBU1NFUlQoUnVudGltZUVuYWJs ZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRpbWluZ0VuYWJsZWQoKSk7CiAg ICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLT5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKS5wcm90 b2NvbElzSW5IVFRQRmFtaWx5KCkKICAgICAgICAgJiYgKCghcmVzb3VyY2UtPmVycm9yT2NjdXJy ZWQoKSAmJiAhcmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpIHx8IHJlc291cmNlLT5yZXNwb25zZSgp Lmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KSkgewotICAgICAgICBIYXNoTWFwPENhY2hlZFJlc291 cmNlKiwgSW5pdGlhdG9ySW5mbz46Oml0ZXJhdG9yIGluaXRpYXRvckl0ID0gbV9pbml0aWF0b3JN YXAuZmluZChyZXNvdXJjZSk7CisgICAgICAgIGF1dG8gaW5pdGlhdG9ySXQgPSBtX2luaXRpYXRv ck1hcC5maW5kKHJlc291cmNlKTsKICAgICAgICAgaWYgKGluaXRpYXRvckl0ICE9IG1faW5pdGlh dG9yTWFwLmVuZCgpICYmIGluaXRpYXRvckl0LT52YWx1ZS5hZGRlZCA9PSBOb3RZZXRBZGRlZCkg ewotICAgICAgICAgICAgQVNTRVJUKGRvY3VtZW50KTsKICAgICAgICAgICAgIERvY3VtZW50KiBp bml0aWF0b3JEb2N1bWVudCA9IGRvY3VtZW50OwotICAgICAgICAgICAgaWYgKHJlc291cmNlLT50 eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6Ok1haW5SZXNvdXJjZSkKKyAgICAgICAgICAgIGlmIChk b2N1bWVudCAmJiByZXNvdXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpNYWluUmVzb3Vy Y2UpCiAgICAgICAgICAgICAgICAgaW5pdGlhdG9yRG9jdW1lbnQgPSBkb2N1bWVudC0+cGFyZW50 RG9jdW1lbnQoKTsKLSAgICAgICAgICAgIEFTU0VSVChpbml0aWF0b3JEb2N1bWVudCk7CisgICAg ICAgICAgICBpZiAoIWluaXRpYXRvckRvY3VtZW50KQorICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgIEFTU0VSVChpbml0aWF0b3JEb2N1bWVudC0+ZG9tV2luZG93KCkpOwogICAg ICAgICAgICAgQVNTRVJUKGluaXRpYXRvckRvY3VtZW50LT5kb21XaW5kb3coKS0+cGVyZm9ybWFu Y2UoKSk7CiAgICAgICAgICAgICBjb25zdCBJbml0aWF0b3JJbmZvJiBpbmZvID0gaW5pdGlhdG9y SXQtPnZhbHVlOwo= 280257 2016-06-01 12:04:18 -0700 2016-06-01 13:14:04 -0700 Patch bug-158266-20160601120538.patch text/plain 5014 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMTU2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA2LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IG51bGwg ZGVyZWZlcmVuY2luZyBpbiBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRp bWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4 MjY2CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI2NTI4NDY2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3b3VsZCBjcmFzaCBzb21ldGltZXMg aW4gaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1mcmFtZS1hY2Nlc3MtY3VzdG9tLmh0bWwKKwor ICAgICAgICAqIGxvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlVGltaW5nSW5mb3JtYXRpb246OmFkZFJlc291cmNlVGltaW5nKToK KyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5oOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAgICAgKFdlYkNv cmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpsb2FkRG9uZSk6CisgICAgICAgIFdlIHdvdWxkIGRl cmVmZXJlbmNlIGEgbnVsbCBwb2ludGVyIG9uIHRoZSBmaXJzdCBpbnN0cnVjdGlvbiB3aGVuIGNh bGxpbmcgCisgICAgICAgIERvY3VtZW50OjpwYXJlbnREb2N1bWVudCBmcm9tIFJlc291cmNlVGlt aW5nSW5mb3JtYXRpb246OmFkZFJlc291cmNlVGltaW5nLCAKKyAgICAgICAgd2hpY2ggbWVhbnMg dGhlIGRvY3VtZW50IHdhcyBudWxsLiAgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRvY3VtZW50IGV2 ZW4gaGFzCisgICAgICAgIGEgY29tbWVudCBzYXlpbmcgaXQgY2FuIGJlIG51bGwsIHNvIHdlIHNo b3VsZCBjaGVjayBpdCBiZWZvcmUgdXNpbmcgaXQuCisKIDIwMTYtMDYtMDEgIFNhaWQgQWJvdS1I YWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBTVkdJbWFnZSBzaG91 bGQgcmVwb3J0IGl0cyBtZW1vcnkgY29zdCB0byBKUyBnYXJiYWdlIGNvbGxlY3RvcgpJbmRleDog U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9u LmNwcAkocmV2aXNpb24gMjAxNTI0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl VGltaW5nSW5mb3JtYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCwxNyArMzgsMTYgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12b2lkIFJlc291cmNlVGltaW5nSW5mb3JtYXRpb246 OmFkZFJlc291cmNlVGltaW5nKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSwgRG9jdW1lbnQqIGRv Y3VtZW50KQordm9pZCBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWlu ZyhDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UsIERvY3VtZW50JiBkb2N1bWVudCkKIHsKICAgICBB U1NFUlQoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRp bWluZ0VuYWJsZWQoKSk7CiAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLT5yZXNvdXJjZVJl cXVlc3QoKS51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkKICAgICAgICAgJiYgKCghcmVz b3VyY2UtPmVycm9yT2NjdXJyZWQoKSAmJiAhcmVzb3VyY2UtPndhc0NhbmNlbGVkKCkpIHx8IHJl c291cmNlLT5yZXNwb25zZSgpLmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KSkgewotICAgICAgICBI YXNoTWFwPENhY2hlZFJlc291cmNlKiwgSW5pdGlhdG9ySW5mbz46Oml0ZXJhdG9yIGluaXRpYXRv ckl0ID0gbV9pbml0aWF0b3JNYXAuZmluZChyZXNvdXJjZSk7CisgICAgICAgIGF1dG8gaW5pdGlh dG9ySXQgPSBtX2luaXRpYXRvck1hcC5maW5kKHJlc291cmNlKTsKICAgICAgICAgaWYgKGluaXRp YXRvckl0ICE9IG1faW5pdGlhdG9yTWFwLmVuZCgpICYmIGluaXRpYXRvckl0LT52YWx1ZS5hZGRl ZCA9PSBOb3RZZXRBZGRlZCkgewotICAgICAgICAgICAgQVNTRVJUKGRvY3VtZW50KTsKLSAgICAg ICAgICAgIERvY3VtZW50KiBpbml0aWF0b3JEb2N1bWVudCA9IGRvY3VtZW50OworICAgICAgICAg ICAgRG9jdW1lbnQqIGluaXRpYXRvckRvY3VtZW50ID0gJmRvY3VtZW50OwogICAgICAgICAgICAg aWYgKHJlc291cmNlLT50eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6Ok1haW5SZXNvdXJjZSkKLSAg ICAgICAgICAgICAgICBpbml0aWF0b3JEb2N1bWVudCA9IGRvY3VtZW50LT5wYXJlbnREb2N1bWVu dCgpOworICAgICAgICAgICAgICAgIGluaXRpYXRvckRvY3VtZW50ID0gZG9jdW1lbnQucGFyZW50 RG9jdW1lbnQoKTsKICAgICAgICAgICAgIEFTU0VSVChpbml0aWF0b3JEb2N1bWVudCk7CiAgICAg ICAgICAgICBBU1NFUlQoaW5pdGlhdG9yRG9jdW1lbnQtPmRvbVdpbmRvdygpKTsKICAgICAgICAg ICAgIEFTU0VSVChpbml0aWF0b3JEb2N1bWVudC0+ZG9tV2luZG93KCktPnBlcmZvcm1hbmNlKCkp OwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlVGltaW5nSW5mb3JtYXRpb24u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VUaW1pbmdJbmZv cm1hdGlvbi5oCShyZXZpc2lvbiAyMDE1MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VUaW1pbmdJbmZvcm1hdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBA IGNsYXNzIEZyYW1lOwogY2xhc3MgUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbiB7CiBwdWJsaWM6 CiAKLSAgICB2b2lkIGFkZFJlc291cmNlVGltaW5nKENhY2hlZFJlc291cmNlKiwgRG9jdW1lbnQq KTsKKyAgICB2b2lkIGFkZFJlc291cmNlVGltaW5nKENhY2hlZFJlc291cmNlKiwgRG9jdW1lbnQm KTsKICAgICB2b2lkIHN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZvcm1hdGlvbihjb25z dCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4mLCBjb25zdCBDYWNoZWRSZXNv dXJjZVJlcXVlc3QmLCBGcmFtZSopOwogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lv biAyMDE1MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VM b2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTksOSArNjE5LDkgQEAgQ2FjaGVkUmVzb3Vy Y2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhYwogICAgICAgICBsb2dNZW1vcnlDYWNoZVJlc291 cmNlUmVxdWVzdChmcmFtZSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmluTWVtb3J5Q2FjaGVL ZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjp1c2VkS2V5KCkpOwogICAgICAgICBtZW1vcnlD YWNoZS5yZXNvdXJjZUFjY2Vzc2VkKCpyZXNvdXJjZSk7CiAjaWYgRU5BQkxFKFdFQl9USU1JTkcp Ci0gICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJl c291cmNlVGltaW5nRW5hYmxlZCgpKSB7CisgICAgICAgIGlmIChkb2N1bWVudCgpICYmIFJ1bnRp bWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVk KCkpIHsKICAgICAgICAgICAgIG1fcmVzb3VyY2VUaW1pbmdJbmZvLnN0b3JlUmVzb3VyY2VUaW1p bmdJbml0aWF0b3JJbmZvcm1hdGlvbihyZXNvdXJjZSwgcmVxdWVzdCwgZnJhbWUoKSk7Ci0gICAg ICAgICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5hZGRSZXNvdXJjZVRpbWluZyhyZXNvdXJjZS5n ZXQoKSwgZG9jdW1lbnQoKSk7CisgICAgICAgICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5hZGRS ZXNvdXJjZVRpbWluZyhyZXNvdXJjZS5nZXQoKSwgKmRvY3VtZW50KCkpOwogICAgICAgICB9CiAj ZW5kaWYKICAgICAgICAgYnJlYWs7CkBAIC05NjcsOCArOTY3LDggQEAgdm9pZCBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6bG9hZERvbmUoQ2FjaAogICAgIFJlZlB0cjxEb2N1bWVudD4gcHJvdGVjdERv Y3VtZW50KG1fZG9jdW1lbnQpOwogCiAjaWYgRU5BQkxFKFdFQl9USU1JTkcpCi0gICAgaWYgKFJ1 bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFi bGVkKCkpCi0gICAgICAgIG1fcmVzb3VyY2VUaW1pbmdJbmZvLmFkZFJlc291cmNlVGltaW5nKHJl c291cmNlLCBkb2N1bWVudCgpKTsKKyAgICBpZiAoZG9jdW1lbnQoKSAmJiBSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKQorICAg ICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5hZGRSZXNvdXJjZVRpbWluZyhyZXNvdXJjZSwgKmRv Y3VtZW50KCkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ocmVzb3VyY2UpOwogI2VuZGlmCg==