196130 2019-03-21 22:28:38 -0700 [JSC] Shrink sizeof(RegExpObject) 2019-03-21 23:46:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1520168 0 ysuzuki 2019-03-21 22:28:38 -0700 [JSC] Shrink sizeof(RegExpObject) 1520170 1 365680 ysuzuki 2019-03-21 22:34:03 -0700 Created attachment 365680 Patch 1520177 2 365680 ysuzuki 2019-03-21 23:18:59 -0700 Comment on attachment 365680 Patch Thanks! 1520186 3 365680 commit-queue 2019-03-21 23:45:26 -0700 Comment on attachment 365680 Patch Clearing flags on attachment: 365680 Committed r243364: <https://trac.webkit.org/changeset/243364> 1520187 4 commit-queue 2019-03-21 23:45:27 -0700 All reviewed patches have been landed. Closing bug. 1520188 5 webkit-bug-importer 2019-03-21 23:46:24 -0700 <rdar://problem/49142573> 365680 2019-03-21 22:34:03 -0700 2019-03-21 23:45:26 -0700 Patch bug-196130-20190321223403.patch text/plain 13609 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZDg1MTY5YmIzN2UzNzY3NDBjN2Y3OTQxZGNjODhiNjE4ODc0YWIwLi41NmE0ZWYwYjUxOWViN2M5 YjIyZjRmOTJlZjVkZDY4ZGE4NzQwODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0wMy0yMSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFNocmluayBzaXplb2YoUmVnRXhwT2JqZWN0KQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2MTMwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgc2l6ZW9mKFJlZ0V4cE9iamVj dCkgaXMgNDhCIGR1ZSB0byBvbmUgYm9vbCBmbGFnLiBXZSBzaG91bGQgY29tcHJlc3MgdGhpcyBm bGFnIGludG8gbG93ZXIgYml0IG9mIFJlZ0V4cCogZmllbGQgc28gdGhhdCB3ZSBjYW4gbWFrZSBS ZWdFeHBPYmplY3QgMzJCLgorICAgICAgICBJdCBzYXZlcyBtZW1vcnkgZm9vdHByaW50IDEuMyUg aW4gUkFNaWZpY2F0aW9uJ3MgcmVnZXhwLgorCisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZU5ld1Jl Z2V4cCk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVTZXRSZWdF eHBPYmplY3RMYXN0SW5kZXgpOgorICAgICAgICAqIGZ0bC9GVExBYnN0cmFjdEhlYXBSZXBvc2l0 b3J5Lmg6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVOZXdSZWdleHApOgorICAgICAgICAoSlND OjpGVEw6OkRGRzo6TG93ZXJERkdUb0IzOjpjb21waWxlU2V0UmVnRXhwT2JqZWN0TGFzdEluZGV4 KToKKyAgICAgICAgKiBydW50aW1lL1JlZ0V4cE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OlJl Z0V4cE9iamVjdDo6UmVnRXhwT2JqZWN0KToKKyAgICAgICAgKEpTQzo6UmVnRXhwT2JqZWN0Ojp2 aXNpdENoaWxkcmVuKToKKyAgICAgICAgKEpTQzo6UmVnRXhwT2JqZWN0OjpnZXRPd25Qcm9wZXJ0 eVNsb3QpOgorICAgICAgICAoSlNDOjpSZWdFeHBPYmplY3Q6OmRlZmluZU93blByb3BlcnR5KToK KyAgICAgICAgKiBydW50aW1lL1JlZ0V4cE9iamVjdC5oOgorCiAyMDE5LTAzLTIxICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgYW4gaW52YWxpZCBhc3Nl cnRpb24gaW4gREZHOjpTcGVjdWxhdGl2ZUpJVDo6bm9uU3BlY3VsYXRpdmVOb25QZWVwaG9sZUNv bXBhcmVOdWxsT3JVbmRlZmluZWQoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAKaW5kZXggODVhNWE4NzBkNWUxZThkMjRkYTc3OTI2MTEwNmRm N2MwZjI0MDBkOS4uYzk1NjQwNWU1MmQ4MjhmZjE5M2NkMGJhODNkOWExNjVkMjNjM2M0YiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKQEAg LTk3OTAsOSArOTc5MCw4IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVOZXdSZWdleHAo Tm9kZSogbm9kZSkKIAogICAgIG1faml0LnN0b3JlUHRyKAogICAgICAgICBUcnVzdGVkSW1tUHRy KG5vZGUtPmNlbGxPcGVyYW5kKCkpLAotICAgICAgICBDQ2FsbEhlbHBlcnM6OkFkZHJlc3MocmVz dWx0R1BSLCBSZWdFeHBPYmplY3Q6Om9mZnNldE9mUmVnRXhwKCkpKTsKKyAgICAgICAgQ0NhbGxI ZWxwZXJzOjpBZGRyZXNzKHJlc3VsdEdQUiwgUmVnRXhwT2JqZWN0OjpvZmZzZXRPZlJlZ0V4cEFu ZExhc3RJbmRleElzTm90V3JpdGFibGVGbGFnKCkpKTsKICAgICBtX2ppdC5zdG9yZVZhbHVlKGxh c3RJbmRleFJlZ3MsIENDYWxsSGVscGVyczo6QWRkcmVzcyhyZXN1bHRHUFIsIFJlZ0V4cE9iamVj dDo6b2Zmc2V0T2ZMYXN0SW5kZXgoKSkpOwotICAgIG1faml0LnN0b3JlOChUcnVzdGVkSW1tMzIo dHJ1ZSksIENDYWxsSGVscGVyczo6QWRkcmVzcyhyZXN1bHRHUFIsIFJlZ0V4cE9iamVjdDo6b2Zm c2V0T2ZMYXN0SW5kZXhJc1dyaXRhYmxlKCkpKTsKICAgICBtX2ppdC5tdXRhdG9yRmVuY2UoKm1f aml0LnZtKCkpOwogCiAgICAgYWRkU2xvd1BhdGhHZW5lcmF0b3Ioc2xvd1BhdGhDYWxsKHNsb3dQ YXRoLCB0aGlzLCBvcGVyYXRpb25OZXdSZWdleHBXaXRoTGFzdEluZGV4LCByZXN1bHRHUFIsIHJl Z2V4cCwgbGFzdEluZGV4UmVncykpOwpAQCAtMTExMzAsOSArMTExMjksMTAgQEAgdm9pZCBTcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZVNldFJlZ0V4cE9iamVjdExhc3RJbmRleChOb2RlKiBub2RlKQog ICAgICAgICBzcGVjdWxhdGVSZWdFeHBPYmplY3Qobm9kZS0+Y2hpbGQxKCksIHJlZ0V4cEdQUik7 CiAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soCiAgICAgICAgICAgICBFeG90aWNPYmplY3RNb2Rl LCBKU1ZhbHVlUmVncygpLCBudWxscHRyLAotICAgICAgICAgICAgbV9qaXQuYnJhbmNoVGVzdDgo Ci0gICAgICAgICAgICAgICAgSklUQ29tcGlsZXI6Olplcm8sCi0gICAgICAgICAgICAgICAgSklU Q29tcGlsZXI6OkFkZHJlc3MocmVnRXhwR1BSLCBSZWdFeHBPYmplY3Q6Om9mZnNldE9mTGFzdElu ZGV4SXNXcml0YWJsZSgpKSkpOworICAgICAgICAgICAgbV9qaXQuYnJhbmNoVGVzdFB0cigKKyAg ICAgICAgICAgICAgICBKSVRDb21waWxlcjo6Tm9uWmVybywKKyAgICAgICAgICAgICAgICBKSVRD b21waWxlcjo6QWRkcmVzcyhyZWdFeHBHUFIsIFJlZ0V4cE9iamVjdDo6b2Zmc2V0T2ZSZWdFeHBB bmRMYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZygpKSwKKyAgICAgICAgICAgICAgICBKSVRDb21w aWxlcjo6VHJ1c3RlZEltbTMyKFJlZ0V4cE9iamVjdDo6bGFzdEluZGV4SXNOb3RXcml0YWJsZUZs YWcpKSk7CiAgICAgfQogCiAgICAgbV9qaXQuc3RvcmVWYWx1ZSh2YWx1ZVJlZ3MsIEpJVENvbXBp bGVyOjpBZGRyZXNzKHJlZ0V4cEdQUiwgUmVnRXhwT2JqZWN0OjpvZmZzZXRPZkxhc3RJbmRleCgp KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTEFic3RyYWN0SGVh cFJlcG9zaXRvcnkuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQWJzdHJhY3RIZWFw UmVwb3NpdG9yeS5oCmluZGV4IDRiZjg4YjU0MTM3MzAxZjg1MzMzYzQ4ZDJjZDdiYjE0YzQ1ZDcw MTkuLjg5OTk1ZTY3NDhkM2YyNDJhNWUwMjA1Y2EwY2FlMTY0NTgzOTdlMzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQWJzdHJhY3RIZWFwUmVwb3NpdG9yeS5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQWJzdHJhY3RIZWFwUmVwb3NpdG9yeS5o CkBAIC05Niw5ICs5Niw4IEBAIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgRlRMIHsKICAgICBt YWNybyhKU1Njb3BlX25leHQsIEpTU2NvcGU6Om9mZnNldE9mTmV4dCgpKSBcCiAgICAgbWFjcm8o SlNTeW1ib2xUYWJsZU9iamVjdF9zeW1ib2xUYWJsZSwgSlNTeW1ib2xUYWJsZU9iamVjdDo6b2Zm c2V0T2ZTeW1ib2xUYWJsZSgpKSBcCiAgICAgbWFjcm8oSlNXcmFwcGVyT2JqZWN0X2ludGVybmFs VmFsdWUsIEpTV3JhcHBlck9iamVjdDo6aW50ZXJuYWxWYWx1ZU9mZnNldCgpKSBcCi0gICAgbWFj cm8oUmVnRXhwT2JqZWN0X3JlZ0V4cCwgUmVnRXhwT2JqZWN0OjpvZmZzZXRPZlJlZ0V4cCgpKSBc CisgICAgbWFjcm8oUmVnRXhwT2JqZWN0X3JlZ0V4cEFuZExhc3RJbmRleElzTm90V3JpdGFibGVG bGFnLCBSZWdFeHBPYmplY3Q6Om9mZnNldE9mUmVnRXhwQW5kTGFzdEluZGV4SXNOb3RXcml0YWJs ZUZsYWcoKSkgXAogICAgIG1hY3JvKFJlZ0V4cE9iamVjdF9sYXN0SW5kZXgsIFJlZ0V4cE9iamVj dDo6b2Zmc2V0T2ZMYXN0SW5kZXgoKSkgXAotICAgIG1hY3JvKFJlZ0V4cE9iamVjdF9sYXN0SW5k ZXhJc1dyaXRhYmxlLCBSZWdFeHBPYmplY3Q6Om9mZnNldE9mTGFzdEluZGV4SXNXcml0YWJsZSgp KSBcCiAgICAgbWFjcm8oU2hhZG93Q2hpY2tlbl9QYWNrZXRfY2FsbGVlLCBPQkpFQ1RfT0ZGU0VU T0YoU2hhZG93Q2hpY2tlbjo6UGFja2V0LCBjYWxsZWUpKSBcCiAgICAgbWFjcm8oU2hhZG93Q2hp Y2tlbl9QYWNrZXRfZnJhbWUsIE9CSkVDVF9PRkZTRVRPRihTaGFkb3dDaGlja2VuOjpQYWNrZXQs IGZyYW1lKSkgXAogICAgIG1hY3JvKFNoYWRvd0NoaWNrZW5fUGFja2V0X2NhbGxlckZyYW1lLCBP QkpFQ1RfT0ZGU0VUT0YoU2hhZG93Q2hpY2tlbjo6UGFja2V0LCBjYWxsZXJGcmFtZSkpIFwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAppbmRleCBhNjg4 ZjJmYWUyMGYzYTI3MDI1ZDc1ZTRiNjc2ZmVjOTE2M2I4MWU1Li44YjlhMjkxODcwMWEyOGEwNDQ3 NDM2OTU2YmRmZTI4Y2U0M2E3Yjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExMb3dlckRGR1RvQjMuY3BwCkBAIC0xMTI5MCw5ICsxMTI5MCw4IEBAIGNsYXNzIExvd2VyREZH VG9CMyB7CiAKICAgICAgICAgYXV0byBzdHJ1Y3R1cmUgPSBtX2dyYXBoLnJlZ2lzdGVyU3RydWN0 dXJlKG1fZ3JhcGguZ2xvYmFsT2JqZWN0Rm9yKG1fbm9kZS0+b3JpZ2luLnNlbWFudGljKS0+cmVn RXhwU3RydWN0dXJlKCkpOwogICAgICAgICBMVmFsdWUgZmFzdFJlc3VsdFZhbHVlID0gYWxsb2Nh dGVPYmplY3Q8UmVnRXhwT2JqZWN0PihzdHJ1Y3R1cmUsIG1fb3V0LmludFB0clplcm8sIHNsb3dD YXNlKTsKLSAgICAgICAgbV9vdXQuc3RvcmVQdHIoZnJvemVuUG9pbnRlcihyZWdleHApLCBmYXN0 UmVzdWx0VmFsdWUsIG1faGVhcHMuUmVnRXhwT2JqZWN0X3JlZ0V4cCk7CisgICAgICAgIG1fb3V0 LnN0b3JlUHRyKGZyb3plblBvaW50ZXIocmVnZXhwKSwgZmFzdFJlc3VsdFZhbHVlLCBtX2hlYXBz LlJlZ0V4cE9iamVjdF9yZWdFeHBBbmRMYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZyk7CiAgICAg ICAgIG1fb3V0LnN0b3JlNjQobGFzdEluZGV4LCBmYXN0UmVzdWx0VmFsdWUsIG1faGVhcHMuUmVn RXhwT2JqZWN0X2xhc3RJbmRleCk7Ci0gICAgICAgIG1fb3V0LnN0b3JlMzJBczgobV9vdXQuY29u c3RJbnQzMih0cnVlKSwgbV9vdXQuYWRkcmVzcyhmYXN0UmVzdWx0VmFsdWUsIG1faGVhcHMuUmVn RXhwT2JqZWN0X2xhc3RJbmRleElzV3JpdGFibGUpKTsKICAgICAgICAgbXV0YXRvckZlbmNlKCk7 CiAgICAgICAgIFZhbHVlRnJvbUJsb2NrIGZhc3RSZXN1bHQgPSBtX291dC5hbmNob3IoZmFzdFJl c3VsdFZhbHVlKTsKICAgICAgICAgbV9vdXQuanVtcChjb250aW51YXRpb24pOwpAQCAtMTEzNzgs NyArMTEzNzcsOSBAQCBjbGFzcyBMb3dlckRGR1RvQjMgewogCiAgICAgICAgICAgICBzcGVjdWxh dGUoCiAgICAgICAgICAgICAgICAgRXhvdGljT2JqZWN0TW9kZSwgbm9WYWx1ZSgpLCBudWxscHRy LAotICAgICAgICAgICAgICAgIG1fb3V0LmlzWmVybzMyKG1fb3V0LmxvYWQ4WmVyb0V4dDMyKHJl Z0V4cCwgbV9oZWFwcy5SZWdFeHBPYmplY3RfbGFzdEluZGV4SXNXcml0YWJsZSkpKTsKKyAgICAg ICAgICAgICAgICBtX291dC50ZXN0Tm9uWmVyb1B0cigKKyAgICAgICAgICAgICAgICAgICAgbV9v dXQubG9hZFB0cihyZWdFeHAsIG1faGVhcHMuUmVnRXhwT2JqZWN0X3JlZ0V4cEFuZExhc3RJbmRl eElzTm90V3JpdGFibGVGbGFnKSwKKyAgICAgICAgICAgICAgICAgICAgbV9vdXQuY29uc3RJbnRQ dHIoUmVnRXhwT2JqZWN0OjpsYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZykpKTsKIAogICAgICAg ICAgICAgbV9vdXQuc3RvcmU2NCh2YWx1ZSwgcmVnRXhwLCBtX2hlYXBzLlJlZ0V4cE9iamVjdF9s YXN0SW5kZXgpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1JlZ0V4cE9iamVjdC5jcHAKaW5kZXggMDNmYmU0NjAzNjMwNjEwYWRiYTFjOGUy ZWJkODBjNTY0MTkwOTdjYS4uM2E5ZDlhN2NkZmYzZmUxMDdlODBhYWU2OTM4Yjk2NzYyNTFkM2Q1 YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwT2JqZWN0 LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBPYmplY3QuY3Bw CkBAIC0zOCw4ICszOCw3IEBAIGNvbnN0IENsYXNzSW5mbyBSZWdFeHBPYmplY3Q6OnNfaW5mbyA9 IHsgIlJlZ0V4cCIsICZCYXNlOjpzX2luZm8sIG51bGxwdHIsIG51bGxwCiAKIFJlZ0V4cE9iamVj dDo6UmVnRXhwT2JqZWN0KFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIFJlZ0V4cCogcmVn RXhwKQogICAgIDogSlNOb25GaW5hbE9iamVjdCh2bSwgc3RydWN0dXJlKQotICAgICwgbV9yZWdF eHAodm0sIHRoaXMsIHJlZ0V4cCkKLSAgICAsIG1fbGFzdEluZGV4SXNXcml0YWJsZSh0cnVlKQor ICAgICwgbV9yZWdFeHBBbmRMYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZyhiaXR3aXNlX2Nhc3Q8 dWludHB0cl90PihyZWdFeHApKSAvLyBsYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZyBpcyBub3Qg c2V0LgogewogICAgIG1fbGFzdEluZGV4LnNldFdpdGhvdXRXcml0ZUJhcnJpZXIoanNOdW1iZXIo MCkpOwogfQpAQCAtNTYsNyArNTUsNyBAQCB2b2lkIFJlZ0V4cE9iamVjdDo6dmlzaXRDaGlsZHJl bihKU0NlbGwqIGNlbGwsIFNsb3RWaXNpdG9yJiB2aXNpdG9yKQogICAgIFJlZ0V4cE9iamVjdCog dGhpc09iamVjdCA9IGpzQ2FzdDxSZWdFeHBPYmplY3QqPihjZWxsKTsKICAgICBBU1NFUlRfR0Nf T0JKRUNUX0lOSEVSSVRTKHRoaXNPYmplY3QsIGluZm8oKSk7CiAgICAgQmFzZTo6dmlzaXRDaGls ZHJlbih0aGlzT2JqZWN0LCB2aXNpdG9yKTsKLSAgICB2aXNpdG9yLmFwcGVuZCh0aGlzT2JqZWN0 LT5tX3JlZ0V4cCk7CisgICAgdmlzaXRvci5hcHBlbmRVbmJhcnJpZXJlZCh0aGlzT2JqZWN0LT5y ZWdFeHAoKSk7CiAgICAgdmlzaXRvci5hcHBlbmQodGhpc09iamVjdC0+bV9sYXN0SW5kZXgpOwog fQogCkBAIC02NSw3ICs2NCw3IEBAIGJvb2wgUmVnRXhwT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eVNs b3QoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBleGVjLCBQcm9wZXJ0CiAgICAgVk0mIHZt ID0gZXhlYy0+dm0oKTsKICAgICBpZiAocHJvcGVydHlOYW1lID09IHZtLnByb3BlcnR5TmFtZXMt Pmxhc3RJbmRleCkgewogICAgICAgICBSZWdFeHBPYmplY3QqIHJlZ0V4cCA9IGpzQ2FzdDxSZWdF eHBPYmplY3QqPihvYmplY3QpOwotICAgICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzID0gcmVnRXhw LT5tX2xhc3RJbmRleElzV3JpdGFibGUgPyBQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udERlbGV0ZSB8 IFByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSA6IFByb3BlcnR5QXR0cmlidXRlOjpEb250RGVs ZXRlIHwgUHJvcGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtIHwgUHJvcGVydHlBdHRyaWJ1dGU6OlJl YWRPbmx5OworICAgICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzID0gcmVnRXhwLT5sYXN0SW5kZXhJ c1dyaXRhYmxlKCkgPyBQcm9wZXJ0eUF0dHJpYnV0ZTo6RG9udERlbGV0ZSB8IFByb3BlcnR5QXR0 cmlidXRlOjpEb250RW51bSA6IFByb3BlcnR5QXR0cmlidXRlOjpEb250RGVsZXRlIHwgUHJvcGVy dHlBdHRyaWJ1dGU6OkRvbnRFbnVtIHwgUHJvcGVydHlBdHRyaWJ1dGU6OlJlYWRPbmx5OwogICAg ICAgICBzbG90LnNldFZhbHVlKHJlZ0V4cCwgYXR0cmlidXRlcywgcmVnRXhwLT5nZXRMYXN0SW5k ZXgoKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KQEAgLTExNyw3ICsxMTYsNyBAQCBi b29sIFJlZ0V4cE9iamVjdDo6ZGVmaW5lT3duUHJvcGVydHkoSlNPYmplY3QqIG9iamVjdCwgRXhl Y1N0YXRlKiBleGVjLCBQcm9wZXJ0eQogICAgICAgICAgICAgcmV0dXJuIHR5cGVFcnJvcihleGVj LCBzY29wZSwgc2hvdWxkVGhyb3csIFVuY29uZmlndXJhYmxlUHJvcGVydHlDaGFuZ2VFbnVtZXJh YmlsaXR5RXJyb3IpOwogICAgICAgICBpZiAoZGVzY3JpcHRvci5pc0FjY2Vzc29yRGVzY3JpcHRv cigpKQogICAgICAgICAgICAgcmV0dXJuIHR5cGVFcnJvcihleGVjLCBzY29wZSwgc2hvdWxkVGhy b3csIFVuY29uZmlndXJhYmxlUHJvcGVydHlDaGFuZ2VBY2Nlc3NNZWNoYW5pc21FcnJvcik7Ci0g ICAgICAgIGlmICghcmVnRXhwLT5tX2xhc3RJbmRleElzV3JpdGFibGUpIHsKKyAgICAgICAgaWYg KCFyZWdFeHAtPmxhc3RJbmRleElzV3JpdGFibGUoKSkgewogICAgICAgICAgICAgaWYgKGRlc2Ny aXB0b3Iud3JpdGFibGVQcmVzZW50KCkgJiYgZGVzY3JpcHRvci53cml0YWJsZSgpKQogICAgICAg ICAgICAgICAgIHJldHVybiB0eXBlRXJyb3IoZXhlYywgc2NvcGUsIHNob3VsZFRocm93LCBVbmNv bmZpZ3VyYWJsZVByb3BlcnR5Q2hhbmdlV3JpdGFiaWxpdHlFcnJvcik7CiAgICAgICAgICAgICBp ZiAoZGVzY3JpcHRvci52YWx1ZSgpICYmICFzYW1lVmFsdWUoZXhlYywgcmVnRXhwLT5nZXRMYXN0 SW5kZXgoKSwgZGVzY3JpcHRvci52YWx1ZSgpKSkKQEAgLTEyOSw3ICsxMjgsNyBAQCBib29sIFJl Z0V4cE9iamVjdDo6ZGVmaW5lT3duUHJvcGVydHkoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRl KiBleGVjLCBQcm9wZXJ0eQogICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZmFsc2UpOwogICAgICAgICB9CiAgICAgICAgIGlmIChkZXNjcmlwdG9yLndyaXRhYmxlUHJlc2Vu dCgpICYmICFkZXNjcmlwdG9yLndyaXRhYmxlKCkpCi0gICAgICAgICAgICByZWdFeHAtPm1fbGFz dEluZGV4SXNXcml0YWJsZSA9IGZhbHNlOworICAgICAgICAgICAgcmVnRXhwLT5zZXRMYXN0SW5k ZXhJc05vdFdyaXRhYmxlKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwT2JqZWN0LmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBPYmplY3QuaAppbmRleCAxZGU1M2M2ZmQx ODA3YTllYWJlZTJiNjdhY2QwYWJmN2Q3ZWYyNjNiLi5iNjBiYWM4ZDU5ZmJhMGQ1OWEwZTZkNDZm OThhMjRiOTExZmYxMWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9SZWdFeHBPYmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdF eHBPYmplY3QuaApAQCAtMzIsNiArMzIsOCBAQCBjbGFzcyBSZWdFeHBPYmplY3QgZmluYWwgOiBw dWJsaWMgSlNOb25GaW5hbE9iamVjdCB7CiAgICAgdXNpbmcgQmFzZSA9IEpTTm9uRmluYWxPYmpl Y3Q7CiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFN0cnVjdHVyZUZsYWdzID0gQmFzZTo6U3Ry dWN0dXJlRmxhZ3MgfCBPdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QgfCBPdmVycmlkZXNHZXRQ cm9wZXJ0eU5hbWVzOwogCisgICAgc3RhdGljIGNvbnN0ZXhwciB1aW50cHRyX3QgbGFzdEluZGV4 SXNOb3RXcml0YWJsZUZsYWcgPSAxOworCiAgICAgc3RhdGljIFJlZ0V4cE9iamVjdCogY3JlYXRl KFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIFJlZ0V4cCogcmVnRXhwKQogICAgIHsKICAg ICAgICAgUmVnRXhwT2JqZWN0KiBvYmplY3QgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2VsbDxS ZWdFeHBPYmplY3Q+KHZtLmhlYXApKSBSZWdFeHBPYmplY3Qodm0sIHN0cnVjdHVyZSwgcmVnRXhw KTsKQEAgLTQ2LDE1ICs0OCwyNCBAQCBjbGFzcyBSZWdFeHBPYmplY3QgZmluYWwgOiBwdWJsaWMg SlNOb25GaW5hbE9iamVjdCB7CiAgICAgICAgIHJldHVybiBvYmplY3Q7CiAgICAgfQogCi0gICAg dm9pZCBzZXRSZWdFeHAoVk0mIHZtLCBSZWdFeHAqIHIpIHsgbV9yZWdFeHAuc2V0KHZtLCB0aGlz LCByKTsgfQotICAgIFJlZ0V4cCogcmVnRXhwKCkgY29uc3QgeyByZXR1cm4gbV9yZWdFeHAuZ2V0 KCk7IH0KKyAgICB2b2lkIHNldFJlZ0V4cChWTSYgdm0sIFJlZ0V4cCogcmVnRXhwKQorICAgIHsK KyAgICAgICAgdWludHB0cl90IHJlc3VsdCA9IChtX3JlZ0V4cEFuZExhc3RJbmRleElzTm90V3Jp dGFibGVGbGFnICYgbGFzdEluZGV4SXNOb3RXcml0YWJsZUZsYWcpIHwgYml0d2lzZV9jYXN0PHVp bnRwdHJfdD4ocmVnRXhwKTsKKyAgICAgICAgbV9yZWdFeHBBbmRMYXN0SW5kZXhJc05vdFdyaXRh YmxlRmxhZyA9IHJlc3VsdDsKKyAgICAgICAgdm0uaGVhcC53cml0ZUJhcnJpZXIodGhpcywgcmVn RXhwKTsKKyAgICB9CisKKyAgICBSZWdFeHAqIHJlZ0V4cCgpIGNvbnN0CisgICAgeworICAgICAg ICByZXR1cm4gYml0d2lzZV9jYXN0PFJlZ0V4cCo+KG1fcmVnRXhwQW5kTGFzdEluZGV4SXNOb3RX cml0YWJsZUZsYWcgJiAofmxhc3RJbmRleElzTm90V3JpdGFibGVGbGFnKSk7CisgICAgfQogCiAg ICAgYm9vbCBzZXRMYXN0SW5kZXgoRXhlY1N0YXRlKiBleGVjLCBzaXplX3QgbGFzdEluZGV4KQog ICAgIHsKICAgICAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICAgICAgYXV0byBzY29wZSA9 IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCi0gICAgICAgIGlmIChMSUtFTFkobV9sYXN0SW5k ZXhJc1dyaXRhYmxlKSkgeworICAgICAgICBpZiAoTElLRUxZKGxhc3RJbmRleElzV3JpdGFibGUo KSkpIHsKICAgICAgICAgICAgIG1fbGFzdEluZGV4LnNldFdpdGhvdXRXcml0ZUJhcnJpZXIoanNO dW1iZXIobGFzdEluZGV4KSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQpA QCAtNjYsMTEgKzc3LDEwIEBAIGNsYXNzIFJlZ0V4cE9iamVjdCBmaW5hbCA6IHB1YmxpYyBKU05v bkZpbmFsT2JqZWN0IHsKICAgICAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICAgICAgYXV0 byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCi0gICAgICAgIGlmIChMSUtFTFko bV9sYXN0SW5kZXhJc1dyaXRhYmxlKSkgeworICAgICAgICBpZiAoTElLRUxZKGxhc3RJbmRleElz V3JpdGFibGUoKSkpIHsKICAgICAgICAgICAgIG1fbGFzdEluZGV4LnNldCh2bSwgdGhpcywgbGFz dEluZGV4KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9Ci0KICAgICAgICAg cmV0dXJuIHR5cGVFcnJvcihleGVjLCBzY29wZSwgc2hvdWxkVGhyb3csIFJlYWRvbmx5UHJvcGVy dHlXcml0ZUVycm9yKTsKICAgICB9CiAgICAgSlNWYWx1ZSBnZXRMYXN0SW5kZXgoKSBjb25zdApA QCAtOTUsOSArMTA1LDkgQEAgY2xhc3MgUmVnRXhwT2JqZWN0IGZpbmFsIDogcHVibGljIEpTTm9u RmluYWxPYmplY3QgewogICAgICAgICByZXR1cm4gU3RydWN0dXJlOjpjcmVhdGUodm0sIGdsb2Jh bE9iamVjdCwgcHJvdG90eXBlLCBUeXBlSW5mbyhSZWdFeHBPYmplY3RUeXBlLCBTdHJ1Y3R1cmVG bGFncyksIGluZm8oKSk7CiAgICAgfQogCi0gICAgc3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZlJl Z0V4cCgpCisgICAgc3RhdGljIHB0cmRpZmZfdCBvZmZzZXRPZlJlZ0V4cEFuZExhc3RJbmRleElz Tm90V3JpdGFibGVGbGFnKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0Yo UmVnRXhwT2JqZWN0LCBtX3JlZ0V4cCk7CisgICAgICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0Yo UmVnRXhwT2JqZWN0LCBtX3JlZ0V4cEFuZExhc3RJbmRleElzTm90V3JpdGFibGVGbGFnKTsKICAg ICB9CiAKICAgICBzdGF0aWMgcHRyZGlmZl90IG9mZnNldE9mTGFzdEluZGV4KCkKQEAgLTEwNSwx MSArMTE1LDYgQEAgY2xhc3MgUmVnRXhwT2JqZWN0IGZpbmFsIDogcHVibGljIEpTTm9uRmluYWxP YmplY3QgewogICAgICAgICByZXR1cm4gT0JKRUNUX09GRlNFVE9GKFJlZ0V4cE9iamVjdCwgbV9s YXN0SW5kZXgpOwogICAgIH0KIAotICAgIHN0YXRpYyBwdHJkaWZmX3Qgb2Zmc2V0T2ZMYXN0SW5k ZXhJc1dyaXRhYmxlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBPQkpFQ1RfT0ZGU0VUT0YoUmVn RXhwT2JqZWN0LCBtX2xhc3RJbmRleElzV3JpdGFibGUpOwotICAgIH0KLQogICAgIHN0YXRpYyBz aXplX3QgYWxsb2NhdGlvblNpemUoQ2hlY2tlZDxzaXplX3Q+IGlubGluZUNhcGFjaXR5KQogICAg IHsKICAgICAgICAgQVNTRVJUX1VOVVNFRChpbmxpbmVDYXBhY2l0eSwgIWlubGluZUNhcGFjaXR5 KTsKQEAgLTEyMiw2ICsxMjcsMTYgQEAgY2xhc3MgUmVnRXhwT2JqZWN0IGZpbmFsIDogcHVibGlj IEpTTm9uRmluYWxPYmplY3QgewogCiAgICAgc3RhdGljIHZvaWQgdmlzaXRDaGlsZHJlbihKU0Nl bGwqLCBTbG90VmlzaXRvciYpOwogCisgICAgYm9vbCBsYXN0SW5kZXhJc1dyaXRhYmxlKCkgY29u c3QKKyAgICB7CisgICAgICAgIHJldHVybiAhKG1fcmVnRXhwQW5kTGFzdEluZGV4SXNOb3RXcml0 YWJsZUZsYWcgJiBsYXN0SW5kZXhJc05vdFdyaXRhYmxlRmxhZyk7CisgICAgfQorCisgICAgdm9p ZCBzZXRMYXN0SW5kZXhJc05vdFdyaXRhYmxlKCkKKyAgICB7CisgICAgICAgIG1fcmVnRXhwQW5k TGFzdEluZGV4SXNOb3RXcml0YWJsZUZsYWcgPSAobV9yZWdFeHBBbmRMYXN0SW5kZXhJc05vdFdy aXRhYmxlRmxhZyB8IGxhc3RJbmRleElzTm90V3JpdGFibGVGbGFnKTsKKyAgICB9CisKICAgICBK U19FWFBPUlRfUFJJVkFURSBzdGF0aWMgYm9vbCBkZWxldGVQcm9wZXJ0eShKU0NlbGwqLCBFeGVj U3RhdGUqLCBQcm9wZXJ0eU5hbWUpOwogICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyB2b2lk IGdldE93bk5vbkluZGV4UHJvcGVydHlOYW1lcyhKU09iamVjdCosIEV4ZWNTdGF0ZSosIFByb3Bl cnR5TmFtZUFycmF5JiwgRW51bWVyYXRpb25Nb2RlKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSBz dGF0aWMgdm9pZCBnZXRQcm9wZXJ0eU5hbWVzKEpTT2JqZWN0KiwgRXhlY1N0YXRlKiwgUHJvcGVy dHlOYW1lQXJyYXkmLCBFbnVtZXJhdGlvbk1vZGUpOwpAQCAtMTMxLDkgKzE0Niw4IEBAIGNsYXNz IFJlZ0V4cE9iamVjdCBmaW5hbCA6IHB1YmxpYyBKU05vbkZpbmFsT2JqZWN0IHsKIHByaXZhdGU6 CiAgICAgTWF0Y2hSZXN1bHQgbWF0Y2hJbmxpbmUoRXhlY1N0YXRlKiwgSlNHbG9iYWxPYmplY3Qq LCBKU1N0cmluZyopOwogCi0gICAgV3JpdGVCYXJyaWVyPFJlZ0V4cD4gbV9yZWdFeHA7CisgICAg dWludHB0cl90IG1fcmVnRXhwQW5kTGFzdEluZGV4SXNOb3RXcml0YWJsZUZsYWcgeyAwIH07CiAg ICAgV3JpdGVCYXJyaWVyPFVua25vd24+IG1fbGFzdEluZGV4OwotICAgIHVpbnQ4X3QgbV9sYXN0 SW5kZXhJc1dyaXRhYmxlOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSlNDCg==