199077 2019-06-20 13:35:53 -0700 [bmalloc] IsoTLS Layout extension initializes one IsoTLSEntry twice 2019-06-21 14:32:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist fpizlo ggaren keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1546638 0 ysuzuki 2019-06-20 13:35:53 -0700 If startEntry == oldLastEntry and IsoTLS is expanded, we construct the same entry twice. 1546840 1 372622 ysuzuki 2019-06-21 02:03:01 -0700 Created attachment 372622 Patch 1546842 2 372623 ysuzuki 2019-06-21 02:12:40 -0700 Created attachment 372623 Patch 1546856 3 372623 ews-watchlist 2019-06-21 04:10:42 -0700 Comment on attachment 372623 Patch Attachment 372623 did not pass jsc-ews (mac): Output: https://webkit-queues.webkit.org/results/12540028 New failing tests: mozilla-tests.yaml/js1_5/Array/regress-101964.js.mozilla-no-ftl apiTests 1546907 4 ysuzuki 2019-06-21 10:20:54 -0700 (In reply to Build Bot from comment #3) > Comment on attachment 372623 [details] > Patch > > Attachment 372623 [details] did not pass jsc-ews (mac): > Output: https://webkit-queues.webkit.org/results/12540028 > > New failing tests: > mozilla-tests.yaml/js1_5/Array/regress-101964.js.mozilla-no-ftl > apiTests This is flaky test 1546945 5 372639 ysuzuki 2019-06-21 12:36:57 -0700 Created attachment 372639 Patch 1546995 6 372639 saam 2019-06-21 14:30:05 -0700 Comment on attachment 372639 Patch r=me 1546997 7 ysuzuki 2019-06-21 14:31:34 -0700 Committed r246698: <https://trac.webkit.org/changeset/246698> 1546998 8 webkit-bug-importer 2019-06-21 14:32:17 -0700 <rdar://problem/52002682> 372622 2019-06-21 02:03:01 -0700 2019-06-21 02:12:39 -0700 Patch bug-199077-20190621020300.patch text/plain 3109 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggZWM0ZGI5MDcwZTY5MzA1 MDY3ZGI5ZDllNTI1NDhhYjU5YTQzZDA3NC4uODI4NWI4MDc2OTBhZmNlNTQ5YjA5YzhhM2I2OGY5 NzlmNWQwZTkxMyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA2LTIxICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW2JtYWxsb2NdIElzb1RM UyBMYXlvdXQgZXh0ZW5zaW9uIGluaXRpYWxpemVzIG9uZSBJc29UTFNFbnRyeSB0d2ljZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm91bmQgdGhhdCBJ c29UTFM6OmVuc3VyZUVudHJpZXMgY2FuIGNvbnN0cnVjdCB0aGUgc2FtZSBJc29UTFNFbnRyeSB0 d2ljZS4KKworICAgICAgICAxLiBXZSBoYXZlIG9sZExhc3RFbnRyeS4KKyAgICAgICAgMi4gSW4g dGhhdCBjYXNlLCBzdGFydEVudHJ5IGlzIG9sZExhc3RFbnRyeS4KKyAgICAgICAgMy4gV2UgZm91 bmQgdGFyZ2V0RW50cnkgd2l0aCBsYXJnZSBvZmZzZXQuCisgICAgICAgIDQuIFdlIHJlYWxsb2Nh dGUgSXNvVExTIGFuZCBtb3ZlIGVudHJpZXMgdG8gdGhlIG5ldyBvbmUuIFdlIG1vdmUgW2hlYWQs IG9sZExhc3RFbnRyeV0gZW50cmllcy4KKyAgICAgICAgNS4gRmluYWxseSwgaWYgc3RhcnRFbnRy eSBleGlzdHMsIHdlIG5ld2x5IGNvbnN0cnVjdCBbc3RhcnRFbnRyeSwgdGFyZ2V0RW50cnldCisg ICAgICAgIDYuIEluIHRoZSBhYm92ZSBzZXF1ZW5jZSwgb2xkTGFzdEVudHJ5ICg9PSBzdGFydEVu dHJ5KSBpcyBjb25zdHJ1Y3RlZCBhZ2Fpbi4KKworICAgICAgICBXZSBjYW4gY2xlYW4gdXAgSXNv VExTOjplbnN1cmVFbnRyaWVzIGNvZGUsIGJ1dCBpdCBpcyBhIGJpdCBkYW5nZXJvdXMgYXQgdGhp cyB0aW1lWzFdLgorICAgICAgICBTbyBpbnN0ZWFkLCB3ZSBjYXJlZnVsbHkgYWRkIGRlZmVuc2l2 ZSBjb2RlIHRvIGhhbmRsZSB0aGUgYWJvdmUgY2FzZSBjb3JyZWN0bHkuIExhdGVyLCB3ZSB3aWxs CisgICAgICAgIGF0dGVtcHQgdG8gY2xlYW4gdXAgSXNvVExTOjplbnN1cmVFbnRyaWVzIGNvZGUu CisKKyAgICAgICAgWzFdOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk5MTAzCisKKyAgICAgICAgKiBibWFsbG9jL0lzb1RMUy5jcHA6CisgICAgICAgIChibWFsbG9j OjpJc29UTFM6OmVuc3VyZUVudHJpZXMpOgorCiAyMDE5LTA2LTE5ICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW2JtYWxsb2NdIElzb0hlYXAncyBpbml0aWFs aXphdGlvbiBpcyByYWN5IHdpdGggSXNvSGVhcDo6aXNJbml0aWFsaXplZApkaWZmIC0tZ2l0IGEv U291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFMuY3BwIGIvU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9Jc29UTFMuY3BwCmluZGV4IGMyMDMyMTNiODU1YmRjZGM5ZWQwNzk2ZmQyMDRhYjVkOTQ4ZDgw MDYuLmYyNzdmZGEyYjZmNTBjYzg0ZWFlMDFkNjI3OTE0M2VlYzllZTUyMzMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNwcAorKysgYi9Tb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0lzb1RMUy5jcHAKQEAgLTEyMywxMSArMTIzLDI0IEBAIElzb1RMUyogSXNvVExTOjpl bnN1cmVFbnRyaWVzKHVuc2lnbmVkIG9mZnNldCkKICAgICB9CiAgICAgCiAgICAgaWYgKHN0YXJ0 RW50cnkpIHsKLSAgICAgICAgc3RhcnRFbnRyeS0+d2Fsa1VwVG9JbmNsdXNpdmUoCi0gICAgICAg ICAgICB0YXJnZXRFbnRyeSwKLSAgICAgICAgICAgIFsmXSAoSXNvVExTRW50cnkqIGVudHJ5KSB7 Ci0gICAgICAgICAgICAgICAgZW50cnktPmNvbnN0cnVjdCh0bHMtPm1fZGF0YSArIGVudHJ5LT5v ZmZzZXQoKSk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgLy8gRklYTUU6IElzb1RMUzo6ZW5z dXJlRW50cmllcyBjYW4gYmUgY2xlYW5lZCB1cC4gRm9yIGV4YW1wbGUsIHN0YXJ0RW50cnkgc2hv dWxkIGJlIGBvbGRMYXN0RW50cnkgPyBvbGRMYXN0RW50cnktPm1fbmV4dCA6IGxheW91dC5oZWFk KClgIGluc3RlYWQsCisgICAgICAgIC8vIGJlY2F1c2Ugd2UgYWxyZWFkeSBlbnN1cmVkIHRoYXQg YFJFTEVBU0VfQkFTU0VSVCghb2xkTGFzdEVudHJ5IHx8IG9sZExhc3RFbnRyeS0+b2Zmc2V0KCkg PCBvZmZzZXQpYC4gQW5kIHN0YXJ0RW50cnkgaXMgbmV2ZXIgbnVsbHB0ci4KKyAgICAgICAgLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTEwMworICAgICAgICBp ZiAob2xkTGFzdEVudHJ5KSB7CisgICAgICAgICAgICBpZiAob2xkTGFzdEVudHJ5ICE9IHRhcmdl dEVudHJ5KSB7CisgICAgICAgICAgICAgICAgb2xkTGFzdEVudHJ5LT5tX25leHQtPndhbGtVcFRv SW5jbHVzaXZlKAorICAgICAgICAgICAgICAgICAgICB0YXJnZXRFbnRyeSwKKyAgICAgICAgICAg ICAgICAgICAgWyZdIChJc29UTFNFbnRyeSogZW50cnkpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGVudHJ5LT5jb25zdHJ1Y3QodGxzLT5tX2RhdGEgKyBlbnRyeS0+b2Zmc2V0KCkpOworICAg ICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIHN0YXJ0RW50cnktPndhbGtVcFRvSW5jbHVzaXZlKAorICAgICAgICAgICAgICAg IHRhcmdldEVudHJ5LAorICAgICAgICAgICAgICAgIFsmXSAoSXNvVExTRW50cnkqIGVudHJ5KSB7 CisgICAgICAgICAgICAgICAgICAgIGVudHJ5LT5jb25zdHJ1Y3QodGxzLT5tX2RhdGEgKyBlbnRy eS0+b2Zmc2V0KCkpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAgICAgIAog ICAgICAgICB0bHMtPm1fbGFzdEVudHJ5ID0gdGFyZ2V0RW50cnk7CiAgICAgICAgIHRscy0+bV9l eHRlbnQgPSB0YXJnZXRFbnRyeS0+ZXh0ZW50KCk7Cg== 372623 2019-06-21 02:12:40 -0700 2019-06-21 12:36:56 -0700 Patch bug-199077-20190621021239.patch text/plain 3137 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggZWM0ZGI5MDcwZTY5MzA1 MDY3ZGI5ZDllNTI1NDhhYjU5YTQzZDA3NC4uNmFjZDMxNjllYTg0Y2U1NzUxZjI2MTcyOTI0MjFl Y2I2MGExZGM2YiAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA2LTIxICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW2JtYWxsb2NdIElzb1RM UyBMYXlvdXQgZXh0ZW5zaW9uIGluaXRpYWxpemVzIG9uZSBJc29UTFNFbnRyeSB0d2ljZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm91bmQgdGhhdCBJ c29UTFM6OmVuc3VyZUVudHJpZXMgY2FuIGNvbnN0cnVjdCB0aGUgc2FtZSBJc29UTFNFbnRyeSBt YW55IHRpbWVzLCBpdCBjYW4gbGVhayBtZW1vcnkgYmVjYXVzZSB0aGUgY29uc3RydWN0aW9uIGNs ZWFycyBwcmV2aW91cyBmaWVsZHMgaW5jbHVkaW5nIGZyZWVsaXN0LgorCisgICAgICAgIDEuIFdl IGhhdmUgb2xkTGFzdEVudHJ5LgorICAgICAgICAyLiBJbiB0aGF0IGNhc2UsIHN0YXJ0RW50cnkg aXMgb2xkTGFzdEVudHJ5LgorICAgICAgICAzLiBXZSBmaW5kIHNvbWUgdGFyZ2V0RW50cnkuCisg ICAgICAgIDQuIEZpbmFsbHksIGlmIHN0YXJ0RW50cnkgZXhpc3RzLCB3ZSBuZXdseSBjb25zdHJ1 Y3QgW3N0YXJ0RW50cnksIHRhcmdldEVudHJ5XQorICAgICAgICA1LiBJbiB0aGUgYWJvdmUgc2Vx dWVuY2UsIG9sZExhc3RFbnRyeSAoPT0gc3RhcnRFbnRyeSkgaXMgY29uc3RydWN0ZWQgYWdhaW4s IHdoaWxlIG9sZExhc3RFbnRyeSBpcyBhbHJlYWR5IGNvbnN0cnVjdGVkIHByZXZpb3VzbHkuCisK KyAgICAgICAgV2UgY2FuIGNsZWFuIHVwIElzb1RMUzo6ZW5zdXJlRW50cmllcyBjb2RlLCBidXQg aXQgaXMgYSBiaXQgZGFuZ2Vyb3VzIGF0IHRoaXMgdGltZVsxXS4KKyAgICAgICAgU28gaW5zdGVh ZCwgd2UgY2FyZWZ1bGx5IGFkZCBkZWZlbnNpdmUgY29kZSB0byBoYW5kbGUgdGhlIGFib3ZlIGNh c2UgY29ycmVjdGx5LiBMYXRlciwgd2Ugd2lsbAorICAgICAgICBhdHRlbXB0IHRvIGNsZWFuIHVw IElzb1RMUzo6ZW5zdXJlRW50cmllcyBjb2RlLgorCisgICAgICAgIFsxXTogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTEwMworCisgICAgICAgICogYm1hbGxvYy9J c29UTFMuY3BwOgorICAgICAgICAoYm1hbGxvYzo6SXNvVExTOjplbnN1cmVFbnRyaWVzKToKKwog MjAxOS0wNi0xOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAg IFtibWFsbG9jXSBJc29IZWFwJ3MgaW5pdGlhbGl6YXRpb24gaXMgcmFjeSB3aXRoIElzb0hlYXA6 OmlzSW5pdGlhbGl6ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExT LmNwcCBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNwcAppbmRleCBjMjAzMjEzYjg1 NWJkY2RjOWVkMDc5NmZkMjA0YWI1ZDk0OGQ4MDA2Li5mMjc3ZmRhMmI2ZjUwY2M4NGVhZTAxZDYy NzkxNDNlZWM5ZWU1MjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RM Uy5jcHAKKysrIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFMuY3BwCkBAIC0xMjMsMTEg KzEyMywyNCBAQCBJc29UTFMqIElzb1RMUzo6ZW5zdXJlRW50cmllcyh1bnNpZ25lZCBvZmZzZXQp CiAgICAgfQogICAgIAogICAgIGlmIChzdGFydEVudHJ5KSB7Ci0gICAgICAgIHN0YXJ0RW50cnkt PndhbGtVcFRvSW5jbHVzaXZlKAotICAgICAgICAgICAgdGFyZ2V0RW50cnksCi0gICAgICAgICAg ICBbJl0gKElzb1RMU0VudHJ5KiBlbnRyeSkgewotICAgICAgICAgICAgICAgIGVudHJ5LT5jb25z dHJ1Y3QodGxzLT5tX2RhdGEgKyBlbnRyeS0+b2Zmc2V0KCkpOwotICAgICAgICAgICAgfSk7Cisg ICAgICAgIC8vIEZJWE1FOiBJc29UTFM6OmVuc3VyZUVudHJpZXMgY2FuIGJlIGNsZWFuZWQgdXAu IEZvciBleGFtcGxlLCBzdGFydEVudHJ5IHNob3VsZCBiZSBgb2xkTGFzdEVudHJ5ID8gb2xkTGFz dEVudHJ5LT5tX25leHQgOiBsYXlvdXQuaGVhZCgpYCBpbnN0ZWFkLAorICAgICAgICAvLyBiZWNh dXNlIHdlIGFscmVhZHkgZW5zdXJlZCB0aGF0IGBSRUxFQVNFX0JBU1NFUlQoIW9sZExhc3RFbnRy eSB8fCBvbGRMYXN0RW50cnktPm9mZnNldCgpIDwgb2Zmc2V0KWAuIEFuZCBzdGFydEVudHJ5IGlz IG5ldmVyIG51bGxwdHIuCisgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTkxMDMKKyAgICAgICAgaWYgKG9sZExhc3RFbnRyeSkgeworICAgICAgICAg ICAgaWYgKG9sZExhc3RFbnRyeSAhPSB0YXJnZXRFbnRyeSkgeworICAgICAgICAgICAgICAgIG9s ZExhc3RFbnRyeS0+bV9uZXh0LT53YWxrVXBUb0luY2x1c2l2ZSgKKyAgICAgICAgICAgICAgICAg ICAgdGFyZ2V0RW50cnksCisgICAgICAgICAgICAgICAgICAgIFsmXSAoSXNvVExTRW50cnkqIGVu dHJ5KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeS0+Y29uc3RydWN0KHRscy0+bV9k YXRhICsgZW50cnktPm9mZnNldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAg ICAgICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBzdGFydEVudHJ5LT53YWxrVXBU b0luY2x1c2l2ZSgKKyAgICAgICAgICAgICAgICB0YXJnZXRFbnRyeSwKKyAgICAgICAgICAgICAg ICBbJl0gKElzb1RMU0VudHJ5KiBlbnRyeSkgeworICAgICAgICAgICAgICAgICAgICBlbnRyeS0+ Y29uc3RydWN0KHRscy0+bV9kYXRhICsgZW50cnktPm9mZnNldCgpKTsKKyAgICAgICAgICAgICAg ICB9KTsKKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgdGxzLT5tX2xhc3RFbnRyeSA9IHRh cmdldEVudHJ5OwogICAgICAgICB0bHMtPm1fZXh0ZW50ID0gdGFyZ2V0RW50cnktPmV4dGVudCgp Owo= 372639 2019-06-21 12:36:57 -0700 2019-06-21 14:30:05 -0700 Patch bug-199077-20190621123657.patch text/plain 3968 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Njg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggZWM0ZGI5MDcwZTY5MzA1 MDY3ZGI5ZDllNTI1NDhhYjU5YTQzZDA3NC4uZWUyMzZkNDQxYTI1ZjA3ZDE3OGE1NGQxMWMyZTUx ZTZhYWI5OWE2OSAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTIxICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW2JtYWxsb2NdIElzb1RM UyBMYXlvdXQgZXh0ZW5zaW9uIGluaXRpYWxpemVzIG9uZSBJc29UTFNFbnRyeSB0d2ljZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDc3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm91bmQgdGhhdCBJ c29UTFM6OmVuc3VyZUVudHJpZXMgY2FuIGNvbnN0cnVjdCB0aGUgc2FtZSBJc29UTFNFbnRyeSBt YW55IHRpbWVzLCBpdCBjYW4gbGVhayBtZW1vcnkgYmVjYXVzZSB0aGUgY29uc3RydWN0aW9uIGNs ZWFycyBwcmV2aW91cyBmaWVsZHMgaW5jbHVkaW5nIGZyZWVsaXN0LgorCisgICAgICAgIDEuIFdl IGhhdmUgb2xkTGFzdEVudHJ5LgorICAgICAgICAyLiBJbiB0aGF0IGNhc2UsIHN0YXJ0RW50cnkg aXMgb2xkTGFzdEVudHJ5LgorICAgICAgICAzLiBXZSBmaW5kIHNvbWUgdGFyZ2V0RW50cnkuCisg ICAgICAgIDQuIEZpbmFsbHksIGlmIHN0YXJ0RW50cnkgZXhpc3RzLCB3ZSBuZXdseSBjb25zdHJ1 Y3QgW3N0YXJ0RW50cnksIHRhcmdldEVudHJ5XQorICAgICAgICA1LiBJbiB0aGUgYWJvdmUgc2Vx dWVuY2UsIG9sZExhc3RFbnRyeSAoPT0gc3RhcnRFbnRyeSkgaXMgY29uc3RydWN0ZWQgYWdhaW4s IHdoaWxlIG9sZExhc3RFbnRyeSBpcyBhbHJlYWR5IGNvbnN0cnVjdGVkIHByZXZpb3VzbHkuCisK KyAgICAgICAgV2UgZml4IHRoaXMgaXNzdWUgYnkgY2hhbmdpbmcgdGhlIHN0YXJ0RW50cnkuIFdl IGFscmVhZHkgaGF2ZSBgUkVMRUFTRV9CQVNTRVJUKCFvbGRMYXN0RW50cnkgfHwgb2xkTGFzdEVu dHJ5LT5vZmZzZXQoKSA8IG9mZnNldCk7YAorICAgICAgICBhc3NlcnRpb24uIFRoaXMgbWVhbnMg dGhhdCBgb2xkTGFzdEVudHJ5LT5tX25leHRgIG11c3QgZXhpc3QsIG90aGVyd2lzZSB0aGUgZm9s bG93aW5nIGxvb3Agd291bGQgbm90IGZpbmQgYSBgdGFyZ2V0RW50cnlgLiBBbmQgYGxheW91dC5o ZWFkKClgCisgICAgICAgIG11c3QgcmV0dXJuIG5vbiBudWxscHRyIGF0IGBJc29UTFM6OmVuc3Vy ZUVudHJpZXNgIGJlY2F1c2UgYElzb1RMUzo6ZW5zdXJlRW50cmllc2AgcmVxdWlyZXMgdGhhdCBg SXNvSGVhcDw+YCBpcyBpbml0aWFsaXplZCwgYW5kIGBJc29IZWFwPD5gCisgICAgICAgIG11c3Qg YWRkIGF0IGxlYXN0IG9uZSBUTFMgZW50cnkgdG8gdGhlIElzb1RMU0xheW91dC4KKworICAgICAg ICAqIGJtYWxsb2MvSXNvVExTLmNwcDoKKyAgICAgICAgKGJtYWxsb2M6Oklzb1RMUzo6ZW5zdXJl RW50cmllcyk6CisKIDIwMTktMDYtMTkgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNv bT4KIAogICAgICAgICBbYm1hbGxvY10gSXNvSGVhcCdzIGluaXRpYWxpemF0aW9uIGlzIHJhY3kg d2l0aCBJc29IZWFwOjppc0luaXRpYWxpemVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9i bWFsbG9jL0lzb1RMUy5jcHAgYi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RMUy5jcHAKaW5k ZXggYzIwMzIxM2I4NTViZGNkYzllZDA3OTZmZDIwNGFiNWQ5NDhkODAwNi4uYjVkMzIyMTk0ZTNh MDUxZWFjMDlhNDEwMjljYTI0MWY1ZDQ3ODkwZCAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2Mv Ym1hbGxvYy9Jc29UTFMuY3BwCisrKyBiL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNw cApAQCAtODIsMjEgKzgyLDE5IEBAIElzb1RMUyogSXNvVExTOjplbnN1cmVFbnRyaWVzKHVuc2ln bmVkIG9mZnNldCkKICAgICBJc29UTFNFbnRyeSogb2xkTGFzdEVudHJ5ID0gdGxzID8gdGxzLT5t X2xhc3RFbnRyeSA6IG51bGxwdHI7CiAgICAgUkVMRUFTRV9CQVNTRVJUKCFvbGRMYXN0RW50cnkg fHwgb2xkTGFzdEVudHJ5LT5vZmZzZXQoKSA8IG9mZnNldCk7CiAgICAgCi0gICAgSXNvVExTRW50 cnkqIHN0YXJ0RW50cnkgPSBvbGRMYXN0RW50cnkgPyBvbGRMYXN0RW50cnkgOiBsYXlvdXQuaGVh ZCgpOworICAgIElzb1RMU0VudHJ5KiBzdGFydEVudHJ5ID0gb2xkTGFzdEVudHJ5ID8gb2xkTGFz dEVudHJ5LT5tX25leHQgOiBsYXlvdXQuaGVhZCgpOworICAgIFJFTEVBU0VfQkFTU0VSVChzdGFy dEVudHJ5KTsKICAgICAKICAgICBJc29UTFNFbnRyeSogdGFyZ2V0RW50cnkgPSBzdGFydEVudHJ5 OwotICAgIHNpemVfdCByZXF1aXJlZENhcGFjaXR5ID0gMDsKLSAgICBpZiAoc3RhcnRFbnRyeSkg ewotICAgICAgICBmb3IgKDs7KSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0JBU1NFUlQodGFyZ2V0 RW50cnkpOwotICAgICAgICAgICAgUkVMRUFTRV9CQVNTRVJUKHRhcmdldEVudHJ5LT5vZmZzZXQo KSA8PSBvZmZzZXQpOwotICAgICAgICAgICAgaWYgKHRhcmdldEVudHJ5LT5vZmZzZXQoKSA9PSBv ZmZzZXQpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB0YXJnZXRFbnRyeSA9 IHRhcmdldEVudHJ5LT5tX25leHQ7Ci0gICAgICAgIH0KKyAgICBmb3IgKDs7KSB7CiAgICAgICAg IFJFTEVBU0VfQkFTU0VSVCh0YXJnZXRFbnRyeSk7Ci0gICAgICAgIHJlcXVpcmVkQ2FwYWNpdHkg PSB0YXJnZXRFbnRyeS0+ZXh0ZW50KCk7CisgICAgICAgIFJFTEVBU0VfQkFTU0VSVCh0YXJnZXRF bnRyeS0+b2Zmc2V0KCkgPD0gb2Zmc2V0KTsKKyAgICAgICAgaWYgKHRhcmdldEVudHJ5LT5vZmZz ZXQoKSA9PSBvZmZzZXQpCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgdGFyZ2V0RW50cnkg PSB0YXJnZXRFbnRyeS0+bV9uZXh0OwogICAgIH0KKyAgICBSRUxFQVNFX0JBU1NFUlQodGFyZ2V0 RW50cnkpOworICAgIHNpemVfdCByZXF1aXJlZENhcGFjaXR5ID0gdGFyZ2V0RW50cnktPmV4dGVu dCgpOwogICAgIAogICAgIGlmICghdGxzIHx8IHJlcXVpcmVkQ2FwYWNpdHkgPiB0bHMtPm1fY2Fw YWNpdHkpIHsKICAgICAgICAgc2l6ZV90IHJlcXVpcmVkU2l6ZSA9IHNpemVGb3JDYXBhY2l0eShy ZXF1aXJlZENhcGFjaXR5KTsKQEAgLTEyMiwxNiArMTIwLDE0IEBAIElzb1RMUyogSXNvVExTOjpl bnN1cmVFbnRyaWVzKHVuc2lnbmVkIG9mZnNldCkKICAgICAgICAgc2V0KHRscyk7CiAgICAgfQog ICAgIAotICAgIGlmIChzdGFydEVudHJ5KSB7Ci0gICAgICAgIHN0YXJ0RW50cnktPndhbGtVcFRv SW5jbHVzaXZlKAotICAgICAgICAgICAgdGFyZ2V0RW50cnksCi0gICAgICAgICAgICBbJl0gKElz b1RMU0VudHJ5KiBlbnRyeSkgewotICAgICAgICAgICAgICAgIGVudHJ5LT5jb25zdHJ1Y3QodGxz LT5tX2RhdGEgKyBlbnRyeS0+b2Zmc2V0KCkpOwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIAot ICAgICAgICB0bHMtPm1fbGFzdEVudHJ5ID0gdGFyZ2V0RW50cnk7Ci0gICAgICAgIHRscy0+bV9l eHRlbnQgPSB0YXJnZXRFbnRyeS0+ZXh0ZW50KCk7Ci0gICAgfQorICAgIHN0YXJ0RW50cnktPndh bGtVcFRvSW5jbHVzaXZlKAorICAgICAgICB0YXJnZXRFbnRyeSwKKyAgICAgICAgWyZdIChJc29U TFNFbnRyeSogZW50cnkpIHsKKyAgICAgICAgICAgIGVudHJ5LT5jb25zdHJ1Y3QodGxzLT5tX2Rh dGEgKyBlbnRyeS0+b2Zmc2V0KCkpOworICAgICAgICB9KTsKKyAgICAKKyAgICB0bHMtPm1fbGFz dEVudHJ5ID0gdGFyZ2V0RW50cnk7CisgICAgdGxzLT5tX2V4dGVudCA9IHRhcmdldEVudHJ5LT5l eHRlbnQoKTsKICAgICAKICAgICByZXR1cm4gdGxzOwogfQo=