179923 2017-11-21 08:49:29 -0800 [JSC] Make empty key as deleted mark in HashMapBucket and drop m_deleted field 2017-11-24 03:05:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki commit-queue darin ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1374029 0 ysuzuki 2017-11-21 08:49:29 -0800 [JSC] Make empty key as deleted mark in HashMapBucket and drop m_deleted field 1374030 1 327413 ysuzuki 2017-11-21 08:50:54 -0800 Created attachment 327413 Patch 1374032 2 327413 ysuzuki 2017-11-21 08:52:29 -0800 Comment on attachment 327413 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327413&action=review > Source/JavaScriptCore/runtime/HashMapImpl.h:598 > + ASSERT(!newEntry->deleted()); This ensures that added key is always non empty. 1374045 3 327415 ysuzuki 2017-11-21 09:06:24 -0800 Created attachment 327415 Patch 1374536 4 327415 ysuzuki 2017-11-24 02:44:07 -0800 Comment on attachment 327415 Patch Thank you! 1374543 5 327415 commit-queue 2017-11-24 03:04:43 -0800 Comment on attachment 327415 Patch Clearing flags on attachment: 327415 Committed r225130: <https://trac.webkit.org/changeset/225130> 1374544 6 commit-queue 2017-11-24 03:04:45 -0800 All reviewed patches have been landed. Closing bug. 1374545 7 webkit-bug-importer 2017-11-24 03:05:25 -0800 <rdar://problem/35682010> 327413 2017-11-21 08:50:54 -0800 2017-11-21 09:06:22 -0800 Patch bug-179923-20171122015053.patch text/plain 9810 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZTA5NzY3MzEwZjZlNzAzNDFkN2FlMDA2MDNhZjkwMTQ0ODI4NWUxLi5hNDk1Y2RiZTZmM2YxYzhl ZmM2OTMyMmJhOTE1NTBiYTI1ZDdjOGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNiBAQAogMjAxNy0xMS0yMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbSlNDXSBNYWtlIGVtcHR5IGtleSBhcyBkZWxldGVkIG1hcmsgaW4g SGFzaE1hcEJ1Y2tldCBhbmQgZHJvcCBtX2RlbGV0ZWQgZmllbGQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTkyMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRvIG5vdCBzZXQgZW1wdHkgYXMgYSBr ZXkgaW4gSGFzaE1hcEJ1Y2tldCBzaW5jZSBKU01hcCAvIEpTU2V0IGNhbiBleHBvc2UgaXQgdG8g dXNlcnMuCisgICAgICAgIFNvIHdlIGNhbiB1c2UgaXQgYXMgYSBtYXJrZXIgb2YgZGVsZXRlZCBi dWNrZXQuCisKKyAgICAgICAgVGhpcyBwYXRjaCB1c2VzIGVtcHR5IGtleSBhcyBhIGRlbGV0ZWQg ZmxhZywgYW5kIGRyb3AgbV9kZWxldGVkIGZpZWxkIG9mIEhhc2hNYXBCdWNrZXQuCisgICAgICAg IEl0IHNocmlua3MgdGhlIHNpemUgb2YgSGFzaE1hcEJ1Y2tldCBtdWNoLgorCisgICAgICAgICog ZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZUdldE1hcEJ1Y2tldE5leHQpOgorICAgICAgICAqIGZ0bC9GVExBYnN0cmFj dEhlYXBSZXBvc2l0b3J5Lmg6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6Cisg ICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVHZXRNYXBCdWNrZXRO ZXh0KToKKyAgICAgICAgKiBydW50aW1lL0hhc2hNYXBJbXBsLmg6CisgICAgICAgIChKU0M6Okhh c2hNYXBCdWNrZXQ6OmNyZWF0ZVNlbnRpbmVsKToKKyAgICAgICAgKEpTQzo6SGFzaE1hcEJ1Y2tl dDo6SGFzaE1hcEJ1Y2tldCk6CisgICAgICAgIChKU0M6Okhhc2hNYXBCdWNrZXQ6OmRlbGV0ZWQg Y29uc3QpOgorICAgICAgICAoSlNDOjpIYXNoTWFwQnVja2V0OjptYWtlRGVsZXRlZCk6CisgICAg ICAgIChKU0M6Okhhc2hNYXBJbXBsOjpyZW1vdmUpOgorICAgICAgICAoSlNDOjpIYXNoTWFwSW1w bDo6Y2xlYXIpOgorICAgICAgICAoSlNDOjpIYXNoTWFwSW1wbDo6c2V0VXBIZWFkQW5kVGFpbCk6 CisgICAgICAgIChKU0M6Okhhc2hNYXBJbXBsOjphZGROb3JtYWxpemVkSW50ZXJuYWwpOgorICAg ICAgICAoSlNDOjpIYXNoTWFwQnVja2V0OjpzZXREZWxldGVkKTogRGVsZXRlZC4KKyAgICAgICAg KEpTQzo6SGFzaE1hcEJ1Y2tldDo6b2Zmc2V0T2ZEZWxldGVkKTogRGVsZXRlZC4KKyAgICAgICAg KCk6IERlbGV0ZWQuCisKKzIwMTctMTEtMjEgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBn bWFpbC5jb20+CisKICAgICAgICAgW0RGR11bRlRMXSBTdXBwb3J0IE1hcFNldCAvIFNldEFkZCBp bnRyaW5zaWNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzk4NTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcAppbmRleCBlMTYyMWQ2YjEzZWI3MWM5OTgxNmE2YjIxMGM2NTAzZTg3NDg0N2NjLi4z NGU2NDc1NjZlOTJlNzI2NTU5YTE4N2ZlYjYxZjk3MzJiYmIwMTg3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAtMTA3NjYsMTIgKzEw NzY2LDE2IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVHZXRNYXBCdWNrZXROZXh0KE5v ZGUqIG5vZGUpCiAgICAgR1BSUmVnIHJlc3VsdEdQUiA9IHJlc3VsdC5ncHIoKTsKIAogICAgIEFT U0VSVChIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5Pjo6b2Zmc2V0T2ZOZXh0KCkg PT0gSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZOZXh0 KCkpOwotICAgIEFTU0VSVChIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5Pjo6b2Zm c2V0T2ZEZWxldGVkKCkgPT0gSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVl Pjo6b2Zmc2V0T2ZEZWxldGVkKCkpOworICAgIEFTU0VSVChIYXNoTWFwQnVja2V0PEhhc2hNYXBC dWNrZXREYXRhS2V5Pjo6b2Zmc2V0T2ZLZXkoKSA9PSBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNr ZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZktleSgpKTsKICAgICBtX2ppdC5sb2FkUHRyKE1hY3Jv QXNzZW1ibGVyOjpBZGRyZXNzKGJ1Y2tldEdQUiwgSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0 RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZOZXh0KCkpLCByZXN1bHRHUFIpOwogCiAgICAgTWFjcm9B c3NlbWJsZXI6OkxhYmVsIGxvb3AgPSBtX2ppdC5sYWJlbCgpOwogICAgIGF1dG8gbm90QnVja2V0 ID0gbV9qaXQuYnJhbmNoVGVzdFB0cihNYWNyb0Fzc2VtYmxlcjo6WmVybywgcmVzdWx0R1BSKTsK LSAgICBhdXRvIGRvbmUgPSBtX2ppdC5icmFuY2hUZXN0MzIoTWFjcm9Bc3NlbWJsZXI6Olplcm8s IE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3VsdEdQUiwgSGFzaE1hcEJ1Y2tldDxIYXNoTWFw QnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZEZWxldGVkKCkpKTsKKyNpZiBVU0UoSlNWQUxV RTMyXzY0KQorICAgIGF1dG8gZG9uZSA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpO b3RFcXVhbCwgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBIYXNoTWFwQnVja2V0 PEhhc2hNYXBCdWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZktleSgpICsgVGFnT2Zmc2V0KSwg VHJ1c3RlZEltbTMyKEpTVmFsdWU6OkVtcHR5VmFsdWVUYWcpKTsKKyNlbHNlCisgICAgYXV0byBk b25lID0gbV9qaXQuYnJhbmNoVGVzdDY0KE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCBNYWNyb0Fz c2VtYmxlcjo6QWRkcmVzcyhyZXN1bHRHUFIsIEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERh dGFLZXlWYWx1ZT46Om9mZnNldE9mS2V5KCkpKTsKKyNlbmRpZgogICAgIG1faml0LmxvYWRQdHIo TWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MocmVzdWx0R1BSLCBIYXNoTWFwQnVja2V0PEhhc2hNYXBC dWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZk5leHQoKSksIHJlc3VsdEdQUik7CiAgICAgbV9q aXQuanVtcCgpLmxpbmtUbyhsb29wLCAmbV9qaXQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTEFic3RyYWN0SGVhcFJlcG9zaXRvcnkuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMQWJzdHJhY3RIZWFwUmVwb3NpdG9yeS5oCmluZGV4IDMyNGYxYmMw NDAwMzdiMWY1NjgxYTI5ZmMwZjg3ZGQ5ZDcxZDcwZjMuLjY3NmJkM2UzOWY4YmFiZjExOWU0ZmEx ZGRiY2NlZGM2NDAxNWUyZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwv RlRMQWJzdHJhY3RIZWFwUmVwb3NpdG9yeS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMQWJzdHJhY3RIZWFwUmVwb3NpdG9yeS5oCkBAIC0xMTgsNyArMTE4LDYgQEAgbmFtZXNw YWNlIEpTQyB7IG5hbWVzcGFjZSBGVEwgewogICAgIG1hY3JvKEhhc2hNYXBCdWNrZXRfdmFsdWUs IEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9mZnNldE9mVmFsdWUo KSkgXAogICAgIG1hY3JvKEhhc2hNYXBCdWNrZXRfa2V5LCBIYXNoTWFwQnVja2V0PEhhc2hNYXBC dWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZktleSgpKSBcCiAgICAgbWFjcm8oSGFzaE1hcEJ1 Y2tldF9uZXh0LCBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5VmFsdWU+OjpvZmZz ZXRPZk5leHQoKSkgXAotICAgIG1hY3JvKEhhc2hNYXBCdWNrZXRfZGVsZXRlZCwgSGFzaE1hcEJ1 Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZEZWxldGVkKCkpIFwKICAg ICBtYWNybyhTeW1ib2xfc3ltYm9sSW1wbCwgU3ltYm9sOjpvZmZzZXRPZlN5bWJvbEltcGwoKSkg XAogICAgIG1hY3JvKEpTRml4ZWRBcnJheV9zaXplLCBKU0ZpeGVkQXJyYXk6Om9mZnNldE9mU2l6 ZSgpKSBcCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJE RkdUb0IzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNw cAppbmRleCBmOTU0ZTg3Y2JiN2JmZWVlOGExNThmNGU3MmYxOWM4YzU1YmNmOGYzLi44ZjlhMTEz MDM3ZmU5ZWYwZGY1OTZhNjdiMDUwOTIyNTliNDk5ZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCkBAIC04NzQ5LDcgKzg3NDksNyBAQCBjbGFz cyBMb3dlckRGR1RvQjMgewogICAgICAgICBMQmFzaWNCbG9jayBsYXN0TmV4dCA9IG1fb3V0Lmlu c2VydE5ld0Jsb2Nrc0JlZm9yZShsb29wU3RhcnQpOwogCiAgICAgICAgIEFTU0VSVChIYXNoTWFw QnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5Pjo6b2Zmc2V0T2ZOZXh0KCkgPT0gSGFzaE1hcEJ1 Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZOZXh0KCkpOwotICAgICAg ICBBU1NFUlQoSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleT46Om9mZnNldE9mRGVs ZXRlZCgpID09IEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9mZnNl dE9mRGVsZXRlZCgpKTsKKyAgICAgICAgQVNTRVJUKEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tl dERhdGFLZXk+OjpvZmZzZXRPZktleSgpID09IEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERh dGFLZXlWYWx1ZT46Om9mZnNldE9mS2V5KCkpOwogICAgICAgICBMVmFsdWUgbWFwQnVja2V0UHJl diA9IGxvd0NlbGwobV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgIFZhbHVlRnJvbUJsb2NrIG1h cEJ1Y2tldFN0YXJ0ID0gbV9vdXQuYW5jaG9yKG1fb3V0LmxvYWRQdHIobWFwQnVja2V0UHJldiwg bV9oZWFwcy5IYXNoTWFwQnVja2V0X25leHQpKTsKICAgICAgICAgbV9vdXQuanVtcChsb29wU3Rh cnQpOwpAQCAtODc3MCw3ICs4NzcwLDcgQEAgY2xhc3MgTG93ZXJERkdUb0IzIHsKIAogICAgICAg ICBtX291dC5hcHBlbmRUbyhoYXNCdWNrZXQsIG5leHRCdWNrZXQpOwogICAgICAgICBWYWx1ZUZy b21CbG9jayBidWNrZXRSZXN1bHQgPSBtX291dC5hbmNob3IobWFwQnVja2V0KTsKLSAgICAgICAg bV9vdXQuYnJhbmNoKG1fb3V0LmlzWmVybzMyKG1fb3V0LmxvYWQzMihtYXBCdWNrZXQsIG1faGVh cHMuSGFzaE1hcEJ1Y2tldF9kZWxldGVkKSksIHVuc3VyZShjb250aW51YXRpb24pLCB1bnN1cmUo bmV4dEJ1Y2tldCkpOworICAgICAgICBtX291dC5icmFuY2gobV9vdXQuaXNaZXJvNjQobV9vdXQu bG9hZDY0KG1hcEJ1Y2tldCwgbV9oZWFwcy5IYXNoTWFwQnVja2V0X2tleSkpLCB1bnN1cmUobmV4 dEJ1Y2tldCksIHVuc3VyZShjb250aW51YXRpb24pKTsKIAogICAgICAgICBtX291dC5hcHBlbmRU byhuZXh0QnVja2V0LCBjb250aW51YXRpb24pOwogICAgICAgICBtX291dC5hZGRJbmNvbWluZ1Rv UGhpKG1hcEJ1Y2tldCwgbV9vdXQuYW5jaG9yKG1fb3V0LmxvYWRQdHIobWFwQnVja2V0LCBtX2hl YXBzLkhhc2hNYXBCdWNrZXRfbmV4dCkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9IYXNoTWFwSW1wbC5oCmluZGV4IDk2NWM0ZTc3MjEyY2UyM2E1MzVhMDVjOTcyM2ExZTBlM2M4 ZDlmMGMuLmJhZjdjOWIyNDM5MWI4NzUwODAxZmE0YWE3YTYwZmExMmIyYTU3YTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsLmgKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGFzaE1hcEltcGwuaApAQCAtOTksMTYgKzk5LDE0 IEBAIGNsYXNzIEhhc2hNYXBCdWNrZXQgOiBwdWJsaWMgSlNDZWxsIHsKIAogICAgIHN0YXRpYyBI YXNoTWFwQnVja2V0KiBjcmVhdGVTZW50aW5lbChWTSYgdm0pCiAgICAgewotICAgICAgICBhdXRv KiBidWNrZXQgPSBjcmVhdGUodm0pOwotICAgICAgICBidWNrZXQtPnNldERlbGV0ZWQodHJ1ZSk7 Ci0gICAgICAgIGJ1Y2tldC0+c2V0S2V5KHZtLCBqc1VuZGVmaW5lZCgpKTsKLSAgICAgICAgYnVj a2V0LT5zZXRWYWx1ZSh2bSwganNVbmRlZmluZWQoKSk7Ci0gICAgICAgIHJldHVybiBidWNrZXQ7 CisgICAgICAgIHJldHVybiBjcmVhdGUodm0pOwogICAgIH0KIAogICAgIEhhc2hNYXBCdWNrZXQo Vk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICAgICAgOiBCYXNlKHZtLCBzdHJ1Y3R1 cmUpCi0gICAgeyB9CisgICAgeworICAgICAgICBBU1NFUlQoZGVsZXRlZCgpKTsKKyAgICB9CiAK ICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0TmV4dChWTSYgdm0sIEhhc2hNYXBCdWNrZXQqIGJ1 Y2tldCkKICAgICB7CkBAIC0xNDUsOCArMTQzLDEyIEBAIGNsYXNzIEhhc2hNYXBCdWNrZXQgOiBw dWJsaWMgSlNDZWxsIHsKICAgICBBTFdBWVNfSU5MSU5FIEhhc2hNYXBCdWNrZXQqIG5leHQoKSBj b25zdCB7IHJldHVybiBtX25leHQuZ2V0KCk7IH0KICAgICBBTFdBWVNfSU5MSU5FIEhhc2hNYXBC dWNrZXQqIHByZXYoKSBjb25zdCB7IHJldHVybiBtX3ByZXYuZ2V0KCk7IH0KIAotICAgIEFMV0FZ U19JTkxJTkUgYm9vbCBkZWxldGVkKCkgY29uc3QgeyByZXR1cm4gbV9kZWxldGVkOyB9Ci0gICAg QUxXQVlTX0lOTElORSB2b2lkIHNldERlbGV0ZWQoYm9vbCBkZWxldGVkKSB7IG1fZGVsZXRlZCA9 IGRlbGV0ZWQ7IH0KKyAgICBBTFdBWVNfSU5MSU5FIGJvb2wgZGVsZXRlZCgpIGNvbnN0IHsgcmV0 dXJuICFrZXkoKTsgfQorICAgIEFMV0FZU19JTkxJTkUgdm9pZCBtYWtlRGVsZXRlZChWTSYgdm0p CisgICAgeworICAgICAgICBzZXRLZXkodm0sIEpTVmFsdWUoKSk7CisgICAgICAgIHNldFZhbHVl KHZtLCBKU1ZhbHVlKCkpOworICAgIH0KIAogICAgIHN0YXRpYyBwdHJkaWZmX3Qgb2Zmc2V0T2ZL ZXkoKQogICAgIHsKQEAgLTE2NCwxMSArMTY2LDYgQEAgY2xhc3MgSGFzaE1hcEJ1Y2tldCA6IHB1 YmxpYyBKU0NlbGwgewogICAgICAgICByZXR1cm4gT0JKRUNUX09GRlNFVE9GKEhhc2hNYXBCdWNr ZXQsIG1fbmV4dCk7CiAgICAgfQogCi0gICAgc3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZkRlbGV0 ZWQoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIE9CSkVDVF9PRkZTRVRPRihIYXNoTWFwQnVja2V0 LCBtX2RlbGV0ZWQpOwotICAgIH0KLQogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUID0gRGF0YT4K ICAgICBBTFdBWVNfSU5MSU5FIHN0YXRpYyB0eXBlbmFtZSBzdGQ6OmVuYWJsZV9pZjxzdGQ6Omlz X3NhbWU8VCwgSGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46OnZhbHVlLCBKU1ZhbHVlPjo6dHlw ZSBleHRyYWN0VmFsdWUoY29uc3QgSGFzaE1hcEJ1Y2tldCYgYnVja2V0KQogICAgIHsKQEAgLTE4 NCw3ICsxODEsNiBAQCBjbGFzcyBIYXNoTWFwQnVja2V0IDogcHVibGljIEpTQ2VsbCB7CiBwcml2 YXRlOgogICAgIFdyaXRlQmFycmllcjxIYXNoTWFwQnVja2V0PiBtX25leHQ7CiAgICAgV3JpdGVC YXJyaWVyPEhhc2hNYXBCdWNrZXQ+IG1fcHJldjsKLSAgICB1aW50MzJfdCBtX2RlbGV0ZWQgeyBm YWxzZSB9OwogICAgIERhdGEgbV9kYXRhOwogfTsKIApAQCAtNDYzLDcgKzQ1OSw3IEBAIGNsYXNz IEhhc2hNYXBJbXBsIDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgewogICAgICAgICBIYXNoTWFw QnVja2V0VHlwZSogaW1wbCA9ICpidWNrZXQ7CiAgICAgICAgIGltcGwtPm5leHQoKS0+c2V0UHJl dih2bSwgaW1wbC0+cHJldigpKTsKICAgICAgICAgaW1wbC0+cHJldigpLT5zZXROZXh0KHZtLCBp bXBsLT5uZXh0KCkpOwotICAgICAgICBpbXBsLT5zZXREZWxldGVkKHRydWUpOworICAgICAgICBp bXBsLT5tYWtlRGVsZXRlZCh2bSk7CiAKICAgICAgICAgKmJ1Y2tldCA9IGRlbGV0ZWRWYWx1ZSgp OwogCkBAIC00OTQsNyArNDkwLDcgQEAgY2xhc3MgSGFzaE1hcEltcGwgOiBwdWJsaWMgSlNOb25G aW5hbE9iamVjdCB7CiAgICAgICAgICAgICBIYXNoTWFwQnVja2V0VHlwZSogbmV4dCA9IGJ1Y2tl dC0+bmV4dCgpOwogICAgICAgICAgICAgLy8gV2UgcmVzdGFydCBlYWNoIGl0ZXJhdG9yIGJ5IHBv aW50aW5nIGl0IHRvIHRoZSBoZWFkIG9mIHRoZSBsaXN0LgogICAgICAgICAgICAgYnVja2V0LT5z ZXROZXh0KHZtLCBoZWFkKTsKLSAgICAgICAgICAgIGJ1Y2tldC0+c2V0RGVsZXRlZCh0cnVlKTsK KyAgICAgICAgICAgIGJ1Y2tldC0+bWFrZURlbGV0ZWQodm0pOwogICAgICAgICAgICAgYnVja2V0 ID0gbmV4dDsKICAgICAgICAgfQogICAgICAgICBtX2hlYWQtPnNldE5leHQodm0sIG1fdGFpbC5n ZXQoKSk7CkBAIC01NTQsOCArNTUwLDggQEAgY2xhc3MgSGFzaE1hcEltcGwgOiBwdWJsaWMgSlNO b25GaW5hbE9iamVjdCB7CiAKICAgICAgICAgbV9oZWFkLT5zZXROZXh0KHZtLCBtX3RhaWwuZ2V0 KCkpOwogICAgICAgICBtX3RhaWwtPnNldFByZXYodm0sIG1faGVhZC5nZXQoKSk7Ci0gICAgICAg IG1faGVhZC0+c2V0RGVsZXRlZCh0cnVlKTsKLSAgICAgICAgbV90YWlsLT5zZXREZWxldGVkKHRy dWUpOworICAgICAgICBBU1NFUlQobV9oZWFkLT5kZWxldGVkKCkpOworICAgICAgICBBU1NFUlQo bV90YWlsLT5kZWxldGVkKCkpOwogICAgIH0KIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBhZGRO b3JtYWxpemVkTm9uRXhpc3RpbmdGb3JDbG9uaW5nKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBr ZXksIEpTVmFsdWUgdmFsdWUgPSBKU1ZhbHVlKCkpCkBAIC01OTksMTEgKzU5NSwxMSBAQCBjbGFz cyBIYXNoTWFwSW1wbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0IHsKICAgICAgICAgYnVmZmVy W2luZGV4XSA9IG5ld0VudHJ5OwogICAgICAgICBuZXdFbnRyeS0+c2V0S2V5KHZtLCBrZXkpOwog ICAgICAgICBuZXdFbnRyeS0+c2V0VmFsdWUodm0sIHZhbHVlKTsKLSAgICAgICAgbmV3RW50cnkt PnNldERlbGV0ZWQoZmFsc2UpOworICAgICAgICBBU1NFUlQoIW5ld0VudHJ5LT5kZWxldGVkKCkp OwogICAgICAgICBIYXNoTWFwQnVja2V0VHlwZSogbmV3VGFpbCA9IEhhc2hNYXBCdWNrZXRUeXBl OjpjcmVhdGUodm0pOwogICAgICAgICBtX3RhaWwuc2V0KHZtLCB0aGlzLCBuZXdUYWlsKTsKICAg ICAgICAgbmV3VGFpbC0+c2V0UHJldih2bSwgbmV3RW50cnkpOwotICAgICAgICBuZXdUYWlsLT5z ZXREZWxldGVkKHRydWUpOworICAgICAgICBBU1NFUlQobmV3VGFpbC0+ZGVsZXRlZCgpKTsKICAg ICAgICAgbmV3RW50cnktPnNldE5leHQodm0sIG5ld1RhaWwpOwogCiAgICAgICAgICsrbV9rZXlD b3VudDsK 327415 2017-11-21 09:06:24 -0800 2017-11-24 03:04:43 -0800 Patch bug-179923-20171122020623.patch text/plain 10082 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZTA5NzY3MzEwZjZlNzAzNDFkN2FlMDA2MDNhZjkwMTQ0ODI4NWUxLi5kMjQ0ZTAyMTE1ZGRkMGFk NzEzZjZiZDAwNjliMDJiMjJmYzBjNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0MCBAQAogMjAxNy0xMS0yMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbSlNDXSBNYWtlIGVtcHR5IGtleSBhcyBkZWxldGVkIG1hcmsgaW4g SGFzaE1hcEJ1Y2tldCBhbmQgZHJvcCBtX2RlbGV0ZWQgZmllbGQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTkyMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGRvIG5vdCBzZXQgZW1wdHkgYXMgYSBr ZXkgaW4gSGFzaE1hcEJ1Y2tldCBzaW5jZSBKU01hcCAvIEpTU2V0IGNhbiBleHBvc2UgaXQgdG8g dXNlcnMuCisgICAgICAgIFNvIHdlIGNhbiB1c2UgaXQgYXMgYSBtYXJrZXIgb2YgZGVsZXRlZCBi dWNrZXQuCisKKyAgICAgICAgVGhpcyBwYXRjaCB1c2VzIGVtcHR5IGtleSBhcyBhIGRlbGV0ZWQg ZmxhZywgYW5kIGRyb3AgbV9kZWxldGVkIGZpZWxkIG9mIEhhc2hNYXBCdWNrZXQuCisgICAgICAg IEl0IHNocmlua3MgdGhlIHNpemUgb2YgSGFzaE1hcEJ1Y2tldCBtdWNoLgorCisgICAgICAgICog ZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2 ZUpJVDo6Y29tcGlsZUdldE1hcEJ1Y2tldE5leHQpOgorICAgICAgICAqIGZ0bC9GVExBYnN0cmFj dEhlYXBSZXBvc2l0b3J5Lmg6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6Cisg ICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVHZXRNYXBCdWNrZXRO ZXh0KToKKyAgICAgICAgKiBydW50aW1lL0hhc2hNYXBJbXBsLmg6CisgICAgICAgIChKU0M6Okhh c2hNYXBCdWNrZXQ6OmNyZWF0ZVNlbnRpbmVsKToKKyAgICAgICAgV2UgbWFrZSBzZW50aW5lbCBi dWNrZXQgYXMgKHVuZGVmaW5lZCwgdW5kZWZpbmVkKSBzaW5jZSBERkcvRlRMIGNhbiBsb2FkIGEg dmFsdWUgZnJvbSBzZW50aW5lbHMuCisgICAgICAgIFdoaWxlIHRoZSBzZW50aW5lbCdzIGRlbGV0 ZWQgZmxhZyBiZWNvbWVzIGZhbHNlIHNpbmNlIGtleSBpcyBzZXQsIGl0IGlzIG5vdCBhIHByb2Js ZW0gc2luY2UgZGVsZXRlZAorICAgICAgICBmbGFnIG9mIHNlbnRpbmVsIGJ1Y2tldCBpcyBub3Qg dXNlZC4KKworICAgICAgICAoSlNDOjpIYXNoTWFwQnVja2V0OjpIYXNoTWFwQnVja2V0KToKKyAg ICAgICAgKEpTQzo6SGFzaE1hcEJ1Y2tldDo6ZGVsZXRlZCBjb25zdCk6CisgICAgICAgIChKU0M6 Okhhc2hNYXBCdWNrZXQ6Om1ha2VEZWxldGVkKToKKyAgICAgICAgKEpTQzo6SGFzaE1hcEltcGw6 OnJlbW92ZSk6CisgICAgICAgIChKU0M6Okhhc2hNYXBJbXBsOjpjbGVhcik6CisgICAgICAgIChK U0M6Okhhc2hNYXBJbXBsOjpzZXRVcEhlYWRBbmRUYWlsKToKKyAgICAgICAgKEpTQzo6SGFzaE1h cEltcGw6OmFkZE5vcm1hbGl6ZWRJbnRlcm5hbCk6CisgICAgICAgIChKU0M6Okhhc2hNYXBCdWNr ZXQ6OnNldERlbGV0ZWQpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpIYXNoTWFwQnVja2V0Ojpv ZmZzZXRPZkRlbGV0ZWQpOiBEZWxldGVkLgorICAgICAgICAoKTogRGVsZXRlZC4KKworMjAxNy0x MS0yMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KKwogICAgICAgICBb REZHXVtGVExdIFN1cHBvcnQgTWFwU2V0IC8gU2V0QWRkIGludHJpbnNpY3MKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTg1OAogCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCmluZGV4IGUxNjIxZDZi MTNlYjcxYzk5ODE2YTZiMjEwYzY1MDNlODc0ODQ3Y2MuLjM0ZTY0NzU2NmU5MmU3MjY1NTlhMTg3 ZmViNjFmOTczMmJiYjAxODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQuY3BwCkBAIC0xMDc2NiwxMiArMTA3NjYsMTYgQEAgdm9pZCBTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZUdldE1hcEJ1Y2tldE5leHQoTm9kZSogbm9kZSkKICAgICBHUFJSZWcg cmVzdWx0R1BSID0gcmVzdWx0LmdwcigpOwogCiAgICAgQVNTRVJUKEhhc2hNYXBCdWNrZXQ8SGFz aE1hcEJ1Y2tldERhdGFLZXk+OjpvZmZzZXRPZk5leHQoKSA9PSBIYXNoTWFwQnVja2V0PEhhc2hN YXBCdWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZk5leHQoKSk7Ci0gICAgQVNTRVJUKEhhc2hN YXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXk+OjpvZmZzZXRPZkRlbGV0ZWQoKSA9PSBIYXNo TWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRPZkRlbGV0ZWQoKSk7 CisgICAgQVNTRVJUKEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXk+OjpvZmZzZXRP ZktleSgpID09IEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9mZnNl dE9mS2V5KCkpOwogICAgIG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYnVj a2V0R1BSLCBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5VmFsdWU+OjpvZmZzZXRP Zk5leHQoKSksIHJlc3VsdEdQUik7CiAKICAgICBNYWNyb0Fzc2VtYmxlcjo6TGFiZWwgbG9vcCA9 IG1faml0LmxhYmVsKCk7CiAgICAgYXV0byBub3RCdWNrZXQgPSBtX2ppdC5icmFuY2hUZXN0UHRy KE1hY3JvQXNzZW1ibGVyOjpaZXJvLCByZXN1bHRHUFIpOwotICAgIGF1dG8gZG9uZSA9IG1faml0 LmJyYW5jaFRlc3QzMihNYWNyb0Fzc2VtYmxlcjo6WmVybywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3MocmVzdWx0R1BSLCBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRhS2V5VmFsdWU+Ojpv ZmZzZXRPZkRlbGV0ZWQoKSkpOworI2lmIFVTRShKU1ZBTFVFMzJfNjQpCisgICAgYXV0byBkb25l ID0gbV9qaXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBNYWNyb0Fzc2VtYmxl cjo6QWRkcmVzcyhyZXN1bHRHUFIsIEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlW YWx1ZT46Om9mZnNldE9mS2V5KCkgKyBUYWdPZmZzZXQpLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6 RW1wdHlWYWx1ZVRhZykpOworI2Vsc2UKKyAgICBhdXRvIGRvbmUgPSBtX2ppdC5icmFuY2hUZXN0 NjQoTWFjcm9Bc3NlbWJsZXI6Ok5vblplcm8sIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKHJlc3Vs dEdQUiwgSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZL ZXkoKSkpOworI2VuZGlmCiAgICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVz cyhyZXN1bHRHUFIsIEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9m ZnNldE9mTmV4dCgpKSwgcmVzdWx0R1BSKTsKICAgICBtX2ppdC5qdW1wKCkubGlua1RvKGxvb3As ICZtX2ppdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQWJz dHJhY3RIZWFwUmVwb3NpdG9yeS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExBYnN0 cmFjdEhlYXBSZXBvc2l0b3J5LmgKaW5kZXggMzI0ZjFiYzA0MDAzN2IxZjU2ODFhMjlmYzBmODdk ZDlkNzFkNzBmMy4uNjc2YmQzZTM5ZjhiYWJmMTE5ZTRmYTFkZGJjY2VkYzY0MDE1ZTJlYyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExBYnN0cmFjdEhlYXBSZXBvc2l0 b3J5LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExBYnN0cmFjdEhlYXBSZXBv c2l0b3J5LmgKQEAgLTExOCw3ICsxMTgsNiBAQCBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIEZU TCB7CiAgICAgbWFjcm8oSGFzaE1hcEJ1Y2tldF92YWx1ZSwgSGFzaE1hcEJ1Y2tldDxIYXNoTWFw QnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZWYWx1ZSgpKSBcCiAgICAgbWFjcm8oSGFzaE1h cEJ1Y2tldF9rZXksIEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9m ZnNldE9mS2V5KCkpIFwKICAgICBtYWNybyhIYXNoTWFwQnVja2V0X25leHQsIEhhc2hNYXBCdWNr ZXQ8SGFzaE1hcEJ1Y2tldERhdGFLZXlWYWx1ZT46Om9mZnNldE9mTmV4dCgpKSBcCi0gICAgbWFj cm8oSGFzaE1hcEJ1Y2tldF9kZWxldGVkLCBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRh S2V5VmFsdWU+OjpvZmZzZXRPZkRlbGV0ZWQoKSkgXAogICAgIG1hY3JvKFN5bWJvbF9zeW1ib2xJ bXBsLCBTeW1ib2w6Om9mZnNldE9mU3ltYm9sSW1wbCgpKSBcCiAgICAgbWFjcm8oSlNGaXhlZEFy cmF5X3NpemUsIEpTRml4ZWRBcnJheTo6b2Zmc2V0T2ZTaXplKCkpIFwKIApkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCmluZGV4IGY5NTRlODdjYmI3YmZl ZWU4YTE1OGY0ZTcyZjE5YzhjNTViY2Y4ZjMuLjhmOWExMTMwMzdmZTllZjBkZjU5NmE2N2IwNTA5 MjI1OWI0OTlmZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93 ZXJERkdUb0IzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAKQEAgLTg3NDksNyArODc0OSw3IEBAIGNsYXNzIExvd2VyREZHVG9CMyB7CiAgICAg ICAgIExCYXNpY0Jsb2NrIGxhc3ROZXh0ID0gbV9vdXQuaW5zZXJ0TmV3QmxvY2tzQmVmb3JlKGxv b3BTdGFydCk7CiAKICAgICAgICAgQVNTRVJUKEhhc2hNYXBCdWNrZXQ8SGFzaE1hcEJ1Y2tldERh dGFLZXk+OjpvZmZzZXRPZk5leHQoKSA9PSBIYXNoTWFwQnVja2V0PEhhc2hNYXBCdWNrZXREYXRh S2V5VmFsdWU+OjpvZmZzZXRPZk5leHQoKSk7Ci0gICAgICAgIEFTU0VSVChIYXNoTWFwQnVja2V0 PEhhc2hNYXBCdWNrZXREYXRhS2V5Pjo6b2Zmc2V0T2ZEZWxldGVkKCkgPT0gSGFzaE1hcEJ1Y2tl dDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZEZWxldGVkKCkpOworICAgICAg ICBBU1NFUlQoSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleT46Om9mZnNldE9mS2V5 KCkgPT0gSGFzaE1hcEJ1Y2tldDxIYXNoTWFwQnVja2V0RGF0YUtleVZhbHVlPjo6b2Zmc2V0T2ZL ZXkoKSk7CiAgICAgICAgIExWYWx1ZSBtYXBCdWNrZXRQcmV2ID0gbG93Q2VsbChtX25vZGUtPmNo aWxkMSgpKTsKICAgICAgICAgVmFsdWVGcm9tQmxvY2sgbWFwQnVja2V0U3RhcnQgPSBtX291dC5h bmNob3IobV9vdXQubG9hZFB0cihtYXBCdWNrZXRQcmV2LCBtX2hlYXBzLkhhc2hNYXBCdWNrZXRf bmV4dCkpOwogICAgICAgICBtX291dC5qdW1wKGxvb3BTdGFydCk7CkBAIC04NzcwLDcgKzg3NzAs NyBAQCBjbGFzcyBMb3dlckRGR1RvQjMgewogCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKGhhc0J1 Y2tldCwgbmV4dEJ1Y2tldCk7CiAgICAgICAgIFZhbHVlRnJvbUJsb2NrIGJ1Y2tldFJlc3VsdCA9 IG1fb3V0LmFuY2hvcihtYXBCdWNrZXQpOwotICAgICAgICBtX291dC5icmFuY2gobV9vdXQuaXNa ZXJvMzIobV9vdXQubG9hZDMyKG1hcEJ1Y2tldCwgbV9oZWFwcy5IYXNoTWFwQnVja2V0X2RlbGV0 ZWQpKSwgdW5zdXJlKGNvbnRpbnVhdGlvbiksIHVuc3VyZShuZXh0QnVja2V0KSk7CisgICAgICAg IG1fb3V0LmJyYW5jaChtX291dC5pc1plcm82NChtX291dC5sb2FkNjQobWFwQnVja2V0LCBtX2hl YXBzLkhhc2hNYXBCdWNrZXRfa2V5KSksIHVuc3VyZShuZXh0QnVja2V0KSwgdW5zdXJlKGNvbnRp bnVhdGlvbikpOwogCiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKG5leHRCdWNrZXQsIGNvbnRpbnVh dGlvbik7CiAgICAgICAgIG1fb3V0LmFkZEluY29taW5nVG9QaGkobWFwQnVja2V0LCBtX291dC5h bmNob3IobV9vdXQubG9hZFB0cihtYXBCdWNrZXQsIG1faGVhcHMuSGFzaE1hcEJ1Y2tldF9uZXh0 KSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSGFzaE1hcElt cGwuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0hhc2hNYXBJbXBsLmgKaW5kZXgg OTY1YzRlNzcyMTJjZTIzYTUzNWEwNWM5NzIzYTFlMGUzYzhkOWYwYy4uYTJiNzNhNGZhMWY1ZjU1 YmY2YWExNjdhOGY5MmRmNjc2OTE3MTgyMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSGFzaE1hcEltcGwuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9IYXNoTWFwSW1wbC5oCkBAIC0xMDAsMTUgKzEwMCwxNyBAQCBjbGFzcyBIYXNoTWFwQnVj a2V0IDogcHVibGljIEpTQ2VsbCB7CiAgICAgc3RhdGljIEhhc2hNYXBCdWNrZXQqIGNyZWF0ZVNl bnRpbmVsKFZNJiB2bSkKICAgICB7CiAgICAgICAgIGF1dG8qIGJ1Y2tldCA9IGNyZWF0ZSh2bSk7 Ci0gICAgICAgIGJ1Y2tldC0+c2V0RGVsZXRlZCh0cnVlKTsKICAgICAgICAgYnVja2V0LT5zZXRL ZXkodm0sIGpzVW5kZWZpbmVkKCkpOwogICAgICAgICBidWNrZXQtPnNldFZhbHVlKHZtLCBqc1Vu ZGVmaW5lZCgpKTsKKyAgICAgICAgQVNTRVJUKCFidWNrZXQtPmRlbGV0ZWQoKSk7CiAgICAgICAg IHJldHVybiBidWNrZXQ7CiAgICAgfQogCiAgICAgSGFzaE1hcEJ1Y2tldChWTSYgdm0sIFN0cnVj dHVyZSogc3RydWN0dXJlKQogICAgICAgICA6IEJhc2Uodm0sIHN0cnVjdHVyZSkKLSAgICB7IH0K KyAgICB7CisgICAgICAgIEFTU0VSVChkZWxldGVkKCkpOworICAgIH0KIAogICAgIEFMV0FZU19J TkxJTkUgdm9pZCBzZXROZXh0KFZNJiB2bSwgSGFzaE1hcEJ1Y2tldCogYnVja2V0KQogICAgIHsK QEAgLTE0NSw4ICsxNDcsMTIgQEAgY2xhc3MgSGFzaE1hcEJ1Y2tldCA6IHB1YmxpYyBKU0NlbGwg ewogICAgIEFMV0FZU19JTkxJTkUgSGFzaE1hcEJ1Y2tldCogbmV4dCgpIGNvbnN0IHsgcmV0dXJu IG1fbmV4dC5nZXQoKTsgfQogICAgIEFMV0FZU19JTkxJTkUgSGFzaE1hcEJ1Y2tldCogcHJldigp IGNvbnN0IHsgcmV0dXJuIG1fcHJldi5nZXQoKTsgfQogCi0gICAgQUxXQVlTX0lOTElORSBib29s IGRlbGV0ZWQoKSBjb25zdCB7IHJldHVybiBtX2RlbGV0ZWQ7IH0KLSAgICBBTFdBWVNfSU5MSU5F IHZvaWQgc2V0RGVsZXRlZChib29sIGRlbGV0ZWQpIHsgbV9kZWxldGVkID0gZGVsZXRlZDsgfQor ICAgIEFMV0FZU19JTkxJTkUgYm9vbCBkZWxldGVkKCkgY29uc3QgeyByZXR1cm4gIWtleSgpOyB9 CisgICAgQUxXQVlTX0lOTElORSB2b2lkIG1ha2VEZWxldGVkKFZNJiB2bSkKKyAgICB7CisgICAg ICAgIHNldEtleSh2bSwgSlNWYWx1ZSgpKTsKKyAgICAgICAgc2V0VmFsdWUodm0sIEpTVmFsdWUo KSk7CisgICAgfQogCiAgICAgc3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZktleSgpCiAgICAgewpA QCAtMTY0LDExICsxNzAsNiBAQCBjbGFzcyBIYXNoTWFwQnVja2V0IDogcHVibGljIEpTQ2VsbCB7 CiAgICAgICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoSGFzaE1hcEJ1Y2tldCwgbV9uZXh0KTsK ICAgICB9CiAKLSAgICBzdGF0aWMgcHRyZGlmZl90IG9mZnNldE9mRGVsZXRlZCgpCi0gICAgewot ICAgICAgICByZXR1cm4gT0JKRUNUX09GRlNFVE9GKEhhc2hNYXBCdWNrZXQsIG1fZGVsZXRlZCk7 Ci0gICAgfQotCiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQgPSBEYXRhPgogICAgIEFMV0FZU19J TkxJTkUgc3RhdGljIHR5cGVuYW1lIHN0ZDo6ZW5hYmxlX2lmPHN0ZDo6aXNfc2FtZTxULCBIYXNo TWFwQnVja2V0RGF0YUtleVZhbHVlPjo6dmFsdWUsIEpTVmFsdWU+Ojp0eXBlIGV4dHJhY3RWYWx1 ZShjb25zdCBIYXNoTWFwQnVja2V0JiBidWNrZXQpCiAgICAgewpAQCAtMTg0LDcgKzE4NSw2IEBA IGNsYXNzIEhhc2hNYXBCdWNrZXQgOiBwdWJsaWMgSlNDZWxsIHsKIHByaXZhdGU6CiAgICAgV3Jp dGVCYXJyaWVyPEhhc2hNYXBCdWNrZXQ+IG1fbmV4dDsKICAgICBXcml0ZUJhcnJpZXI8SGFzaE1h cEJ1Y2tldD4gbV9wcmV2OwotICAgIHVpbnQzMl90IG1fZGVsZXRlZCB7IGZhbHNlIH07CiAgICAg RGF0YSBtX2RhdGE7CiB9OwogCkBAIC00NjMsNyArNDYzLDcgQEAgY2xhc3MgSGFzaE1hcEltcGwg OiBwdWJsaWMgSlNOb25GaW5hbE9iamVjdCB7CiAgICAgICAgIEhhc2hNYXBCdWNrZXRUeXBlKiBp bXBsID0gKmJ1Y2tldDsKICAgICAgICAgaW1wbC0+bmV4dCgpLT5zZXRQcmV2KHZtLCBpbXBsLT5w cmV2KCkpOwogICAgICAgICBpbXBsLT5wcmV2KCktPnNldE5leHQodm0sIGltcGwtPm5leHQoKSk7 Ci0gICAgICAgIGltcGwtPnNldERlbGV0ZWQodHJ1ZSk7CisgICAgICAgIGltcGwtPm1ha2VEZWxl dGVkKHZtKTsKIAogICAgICAgICAqYnVja2V0ID0gZGVsZXRlZFZhbHVlKCk7CiAKQEAgLTQ5NCw3 ICs0OTQsNyBAQCBjbGFzcyBIYXNoTWFwSW1wbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0IHsK ICAgICAgICAgICAgIEhhc2hNYXBCdWNrZXRUeXBlKiBuZXh0ID0gYnVja2V0LT5uZXh0KCk7CiAg ICAgICAgICAgICAvLyBXZSByZXN0YXJ0IGVhY2ggaXRlcmF0b3IgYnkgcG9pbnRpbmcgaXQgdG8g dGhlIGhlYWQgb2YgdGhlIGxpc3QuCiAgICAgICAgICAgICBidWNrZXQtPnNldE5leHQodm0sIGhl YWQpOwotICAgICAgICAgICAgYnVja2V0LT5zZXREZWxldGVkKHRydWUpOworICAgICAgICAgICAg YnVja2V0LT5tYWtlRGVsZXRlZCh2bSk7CiAgICAgICAgICAgICBidWNrZXQgPSBuZXh0OwogICAg ICAgICB9CiAgICAgICAgIG1faGVhZC0+c2V0TmV4dCh2bSwgbV90YWlsLmdldCgpKTsKQEAgLTU1 NCw4ICs1NTQsOCBAQCBjbGFzcyBIYXNoTWFwSW1wbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0 IHsKIAogICAgICAgICBtX2hlYWQtPnNldE5leHQodm0sIG1fdGFpbC5nZXQoKSk7CiAgICAgICAg IG1fdGFpbC0+c2V0UHJldih2bSwgbV9oZWFkLmdldCgpKTsKLSAgICAgICAgbV9oZWFkLT5zZXRE ZWxldGVkKHRydWUpOwotICAgICAgICBtX3RhaWwtPnNldERlbGV0ZWQodHJ1ZSk7CisgICAgICAg IEFTU0VSVChtX2hlYWQtPmRlbGV0ZWQoKSk7CisgICAgICAgIEFTU0VSVChtX3RhaWwtPmRlbGV0 ZWQoKSk7CiAgICAgfQogCiAgICAgQUxXQVlTX0lOTElORSB2b2lkIGFkZE5vcm1hbGl6ZWROb25F eGlzdGluZ0ZvckNsb25pbmcoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGtleSwgSlNWYWx1ZSB2 YWx1ZSA9IEpTVmFsdWUoKSkKQEAgLTU5OSwxMSArNTk5LDExIEBAIGNsYXNzIEhhc2hNYXBJbXBs IDogcHVibGljIEpTTm9uRmluYWxPYmplY3QgewogICAgICAgICBidWZmZXJbaW5kZXhdID0gbmV3 RW50cnk7CiAgICAgICAgIG5ld0VudHJ5LT5zZXRLZXkodm0sIGtleSk7CiAgICAgICAgIG5ld0Vu dHJ5LT5zZXRWYWx1ZSh2bSwgdmFsdWUpOwotICAgICAgICBuZXdFbnRyeS0+c2V0RGVsZXRlZChm YWxzZSk7CisgICAgICAgIEFTU0VSVCghbmV3RW50cnktPmRlbGV0ZWQoKSk7CiAgICAgICAgIEhh c2hNYXBCdWNrZXRUeXBlKiBuZXdUYWlsID0gSGFzaE1hcEJ1Y2tldFR5cGU6OmNyZWF0ZSh2bSk7 CiAgICAgICAgIG1fdGFpbC5zZXQodm0sIHRoaXMsIG5ld1RhaWwpOwogICAgICAgICBuZXdUYWls LT5zZXRQcmV2KHZtLCBuZXdFbnRyeSk7Ci0gICAgICAgIG5ld1RhaWwtPnNldERlbGV0ZWQodHJ1 ZSk7CisgICAgICAgIEFTU0VSVChuZXdUYWlsLT5kZWxldGVkKCkpOwogICAgICAgICBuZXdFbnRy eS0+c2V0TmV4dCh2bSwgbmV3VGFpbCk7CiAKICAgICAgICAgKyttX2tleUNvdW50Owo=