154598 2016-02-23 11:29:33 -0800 Lay the groundwork for more constness in StyleResolver-related code 2016-02-23 13:18:04 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue koivisto simon.fraser zalan oldest_to_newest 1167482 0 simon.fraser 2016-02-23 11:29:33 -0800 Lay the groundwork for more constness in StyleResolver-related code 1167484 1 272039 simon.fraser 2016-02-23 11:31:06 -0800 Created attachment 272039 Patch 1167510 2 272039 commit-queue 2016-02-23 13:18:01 -0800 Comment on attachment 272039 Patch Clearing flags on attachment: 272039 Committed r196991: <http://trac.webkit.org/changeset/196991> 1167511 3 commit-queue 2016-02-23 13:18:04 -0800 All reviewed patches have been landed. Closing bug. 272039 2016-02-23 11:31:06 -0800 2016-02-23 13:18:01 -0800 Patch bug-154598-20160223113048.patch text/plain 23560 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzMyMGRkNzkxMWI3ZTMy Njg2NWM3OTUwZjBiMzRiZjEzNDA5OGMxNi4uZDBmYTUwMzI4NjM0N2E1NTRhY2YxMTQ3OTJiMmY2 NGY3ZWJkMjRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE2LTAyLTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIExheSB0aGUgZ3Jv dW5kd29yayBmb3IgbW9yZSBjb25zdG5lc3MgaW4gU3R5bGVSZXNvbHZlci1yZWxhdGVkIGNvZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDU5OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc29t ZSBvZiB0aGUgbGVhZiBmdW5jdGlvbnMgdGhhdCBhcmUgdXNlZCBieSB0aGUgc3R5bGUgcmVzb2x2 ZXIgdGFrZSAKKyAgICAgICAgY29uc3QgQ1NTVmFsdWVzLCBhbmQgdXNlICdhdXRvJyBtb3JlIHRv IGF1dG9tYXRpY2FsbHkgZ2V0IGNvbnN0IHN0YWNrIHZhcmlhYmxlcworICAgICAgICB3aGVuIGFw cHJvcHJpYXRlLgorCisgICAgICAgICogY3NzL0NTU0JvcmRlckltYWdlU2xpY2VWYWx1ZS5oOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTQm9yZGVySW1hZ2VTbGljZVZhbHVlOjpzbGljZXMpOgorICAg ICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJp bWl0aXZlVmFsdWU6OmlzUXVpcmtWYWx1ZSk6CisgICAgICAgICogY3NzL0ZvbnRWYXJpYW50QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0Rm9udFZhcmlhbnRMaWdhdHVyZXMp OgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdEZvbnRWYXJpYW50TnVtZXJpYyk6CisgICAgICAg IChXZWJDb3JlOjpleHRyYWN0Rm9udFZhcmlhbnRFYXN0QXNpYW4pOgorICAgICAgICAqIGNzcy9G b250VmFyaWFudEJ1aWxkZXIuaDoKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ29udmVydGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSZWZs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVy dEdyaWRBdXRvRmxvdyk6CisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVTdHJva2UpOgorICAg ICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVz b2x2ZXI6OmNvbG9yRnJvbVByaW1pdGl2ZVZhbHVlSXNEZXJpdmVkRnJvbUVsZW1lbnQpOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6Y29sb3JGcm9tUHJpbWl0aXZlVmFsdWUpOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6Y3JlYXRlRmlsdGVyT3BlcmF0aW9ucyk6 CisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKiBjc3MvVHJhbnNmb3Jt RnVuY3Rpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5zZm9ybXNGb3JWYWx1ZSk6Cisg ICAgICAgICogY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5oOgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9TdHlsZVBlbmRpbmdJbWFnZS5oOgorICAgICAgICAqIHN2Zy9TVkdMZW5ndGguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U1ZHTGVuZ3RoOjpmcm9tQ1NTUHJpbWl0aXZlVmFsdWUpOgorICAg ICAgICAqIHN2Zy9TVkdMZW5ndGguaDoKKwogMjAxNi0wMi0yMiAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBlYXRlZCBiYWNrZ3JvdW5kIGltYWdl cyBoYXZlIHRoZSB3cm9uZyBwb3NpdGlvbiB3aGVuIHVzaW5nIGJvdHRvbS9yaWdodC1yZWxhdGl2 ZSBiYWNrZ3JvdW5kLXBvc2l0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Qm9yZGVySW1hZ2VTbGljZVZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1h Z2VTbGljZVZhbHVlLmgKaW5kZXggYjhiNzU1MjljNDg1Yjk3Yjk3MWI3NGRmNzA3YzEyOTAzNDg0 Mzk5Mi4uY2YwN2NjZmZjOTZhMTgxYWZiYTlmZTg4YTViZTIwZmE3M2ZkYjQzOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlU2xpY2VWYWx1ZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWUuaApAQCAtNDMsNyArNDMs NyBAQCBwdWJsaWM6CiAKICAgICBTdHJpbmcgY3VzdG9tQ1NTVGV4dCgpIGNvbnN0OwogCi0gICAg UXVhZCogc2xpY2VzKCkgeyByZXR1cm4gbV9zbGljZXMgPyBtX3NsaWNlcy0+Z2V0UXVhZFZhbHVl KCkgOiAwOyB9CisgICAgUXVhZCogc2xpY2VzKCkgY29uc3QgeyByZXR1cm4gbV9zbGljZXMgPyBt X3NsaWNlcy0+Z2V0UXVhZFZhbHVlKCkgOiBudWxscHRyOyB9CiAKICAgICBib29sIGVxdWFscyhj b25zdCBDU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWUmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJpbWl0aXZlVmFsdWUuaAppbmRleCA1OTU3Y2QxZjA2ZTA1MzQ5NDI1ODMxOTY4MTViMjk1 ZWFhMWIzZTA3Li5hYjVjZDYwOTRkODhmNjE3YTdiNjg4Y2UyMjBmYWUzYjk5NzY1NWJlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaApAQCAtMzY5LDcgKzM2OSw3IEBAIHB1 YmxpYzoKIAogICAgIFN0cmluZyBjdXN0b21DU1NUZXh0KCkgY29uc3Q7CiAKLSAgICBib29sIGlz UXVpcmtWYWx1ZSgpIHsgcmV0dXJuIG1faXNRdWlya1ZhbHVlOyB9CisgICAgYm9vbCBpc1F1aXJr VmFsdWUoKSBjb25zdCB7IHJldHVybiBtX2lzUXVpcmtWYWx1ZTsgfQogCiAgICAgdm9pZCBhZGRT dWJyZXNvdXJjZVN0eWxlVVJMcyhMaXN0SGFzaFNldDxVUkw+JiwgY29uc3QgU3R5bGVTaGVldENv bnRlbnRzKikgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250VmFy aWFudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRWYXJpYW50QnVpbGRlci5j cHAKaW5kZXggMGM5ZTE0OGQzZmJkMDE2ZTAzM2Q4NTY1OGE1M2ZlOTU4MWZhNzFlMS4uOTJmYjY2 ZjQ0NGFjNTc5OWZhNjQ2YmM3OTQ0YWQzNzkwYTRjM2UyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0ZvbnRWYXJpYW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L0ZvbnRWYXJpYW50QnVpbGRlci5jcHAKQEAgLTMzLDcgKzMzLDcgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1Gb250VmFyaWFudExpZ2F0dXJlc1ZhbHVlcyBleHRyYWN0Rm9udFZhcmlhbnRM aWdhdHVyZXMoQ1NTVmFsdWUmIHZhbHVlKQorRm9udFZhcmlhbnRMaWdhdHVyZXNWYWx1ZXMgZXh0 cmFjdEZvbnRWYXJpYW50TGlnYXR1cmVzKGNvbnN0IENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBG b250VmFyaWFudExpZ2F0dXJlcyBjb21tb24gPSBGb250VmFyaWFudExpZ2F0dXJlczo6Tm9ybWFs OwogICAgIEZvbnRWYXJpYW50TGlnYXR1cmVzIGRpc2NyZXRpb25hcnkgPSBGb250VmFyaWFudExp Z2F0dXJlczo6Tm9ybWFsOwpAQCAtOTEsNyArOTEsNyBAQCBGb250VmFyaWFudExpZ2F0dXJlc1Zh bHVlcyBleHRyYWN0Rm9udFZhcmlhbnRMaWdhdHVyZXMoQ1NTVmFsdWUmIHZhbHVlKQogICAgIHJl dHVybiBGb250VmFyaWFudExpZ2F0dXJlc1ZhbHVlcyhjb21tb24sIGRpc2NyZXRpb25hcnksIGhp c3RvcmljYWwsIGNvbnRleHR1YWxBbHRlcm5hdGVzKTsKIH0KIAotRm9udFZhcmlhbnROdW1lcmlj VmFsdWVzIGV4dHJhY3RGb250VmFyaWFudE51bWVyaWMoQ1NTVmFsdWUmIHZhbHVlKQorRm9udFZh cmlhbnROdW1lcmljVmFsdWVzIGV4dHJhY3RGb250VmFyaWFudE51bWVyaWMoY29uc3QgQ1NTVmFs dWUmIHZhbHVlKQogewogICAgIEZvbnRWYXJpYW50TnVtZXJpY0ZpZ3VyZSBmaWd1cmUgPSBGb250 VmFyaWFudE51bWVyaWNGaWd1cmU6Ok5vcm1hbDsKICAgICBGb250VmFyaWFudE51bWVyaWNTcGFj aW5nIHNwYWNpbmcgPSBGb250VmFyaWFudE51bWVyaWNTcGFjaW5nOjpOb3JtYWw7CkBAIC0xMzcs NyArMTM3LDcgQEAgRm9udFZhcmlhbnROdW1lcmljVmFsdWVzIGV4dHJhY3RGb250VmFyaWFudE51 bWVyaWMoQ1NTVmFsdWUmIHZhbHVlKQogICAgIHJldHVybiBGb250VmFyaWFudE51bWVyaWNWYWx1 ZXMoZmlndXJlLCBzcGFjaW5nLCBmcmFjdGlvbiwgb3JkaW5hbCwgc2xhc2hlZFplcm8pOwogfQog Ci1Gb250VmFyaWFudEVhc3RBc2lhblZhbHVlcyBleHRyYWN0Rm9udFZhcmlhbnRFYXN0QXNpYW4o Q1NTVmFsdWUmIHZhbHVlKQorRm9udFZhcmlhbnRFYXN0QXNpYW5WYWx1ZXMgZXh0cmFjdEZvbnRW YXJpYW50RWFzdEFzaWFuKGNvbnN0IENTU1ZhbHVlJiB2YWx1ZSkKIHsKICAgICBGb250VmFyaWFu dEVhc3RBc2lhblZhcmlhbnQgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6 Tm9ybWFsOwogICAgIEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGggd2lkdGggPSBGb250VmFyaWFu dEVhc3RBc2lhbldpZHRoOjpOb3JtYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Rm9udFZhcmlhbnRCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRm9udFZhcmlhbnRCdWls ZGVyLmgKaW5kZXggZDFiMjY1ZDQ4OTI1YWMzMDMzMWQ0MGM5MjBhMTdjMmY5ODkwYTUyZC4uNWYy OWUwYzUwNzg0NzhkZmQ5NDljYWUxYTU0YmM5YmE0MjgxZTU3NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL0ZvbnRWYXJpYW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9Gb250VmFyaWFudEJ1aWxkZXIuaApAQCAtMzYsOSArMzYsOSBAQCBzdHJ1Y3QgRm9udFZhcmlh bnRMaWdhdHVyZXNWYWx1ZXM7CiBzdHJ1Y3QgRm9udFZhcmlhbnROdW1lcmljVmFsdWVzOwogc3Ry dWN0IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFsdWVzOwogCi1Gb250VmFyaWFudExpZ2F0dXJlc1Zh bHVlcyBleHRyYWN0Rm9udFZhcmlhbnRMaWdhdHVyZXMoQ1NTVmFsdWUmKTsKLUZvbnRWYXJpYW50 TnVtZXJpY1ZhbHVlcyBleHRyYWN0Rm9udFZhcmlhbnROdW1lcmljKENTU1ZhbHVlJik7Ci1Gb250 VmFyaWFudEVhc3RBc2lhblZhbHVlcyBleHRyYWN0Rm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTVmFs dWUmKTsKK0ZvbnRWYXJpYW50TGlnYXR1cmVzVmFsdWVzIGV4dHJhY3RGb250VmFyaWFudExpZ2F0 dXJlcyhjb25zdCBDU1NWYWx1ZSYpOworRm9udFZhcmlhbnROdW1lcmljVmFsdWVzIGV4dHJhY3RG b250VmFyaWFudE51bWVyaWMoY29uc3QgQ1NTVmFsdWUmKTsKK0ZvbnRWYXJpYW50RWFzdEFzaWFu VmFsdWVzIGV4dHJhY3RGb250VmFyaWFudEVhc3RBc2lhbihjb25zdCBDU1NWYWx1ZSYpOwogCiBS ZWY8Q1NTVmFsdWU+IGNvbXB1dGVGb250VmFyaWFudChjb25zdCBGb250VmFyaWFudFNldHRpbmdz Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0 ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAx YjA4NGFhZGYxYjY1NzZkMTk1MDA5MmI1NmVjOWMxM2ExMWZkZmVmLi4xY2QzZDc4YzQ5YjE1YjYw MDdmZTdmNDU1MmI2MDlmNmRmZjA2NzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyQ29udmVydGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVp bGRlckNvbnZlcnRlci5oCkBAIC01NjcsNyArNTY3LDcgQEAgaW5saW5lIFBhc3NSZWZQdHI8U3R5 bGVSZWZsZWN0aW9uPiBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRSZWZsZWN0aW9uKFN0 eWwKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgQ1NTUmVmbGVjdFZhbHVl JiByZWZsZWN0VmFsdWUgPSBkb3duY2FzdDxDU1NSZWZsZWN0VmFsdWU+KHZhbHVlKTsKKyAgICBh dXRvJiByZWZsZWN0VmFsdWUgPSBkb3duY2FzdDxDU1NSZWZsZWN0VmFsdWU+KHZhbHVlKTsKIAog ICAgIFJlZlB0cjxTdHlsZVJlZmxlY3Rpb24+IHJlZmxlY3Rpb24gPSBTdHlsZVJlZmxlY3Rpb246 OmNyZWF0ZSgpOwogICAgIHJlZmxlY3Rpb24tPnNldERpcmVjdGlvbigqcmVmbGVjdFZhbHVlLmRp cmVjdGlvbigpKTsKQEAgLTkxNiw4ICs5MTYsOCBAQCBpbmxpbmUgR3JpZEF1dG9GbG93IFN0eWxl QnVpbGRlckNvbnZlcnRlcjo6Y29udmVydEdyaWRBdXRvRmxvdyhTdHlsZVJlc29sdmVyJiwgQwog ICAgIGlmICghbGlzdC5sZW5ndGgoKSkKICAgICAgICAgcmV0dXJuIFJlbmRlclN0eWxlOjppbml0 aWFsR3JpZEF1dG9GbG93KCk7CiAKLSAgICBDU1NQcmltaXRpdmVWYWx1ZSYgZmlyc3QgPSBkb3du Y2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKmxpc3QuaXRlbSgwKSk7Ci0gICAgQ1NTUHJpbWl0aXZl VmFsdWUqIHNlY29uZCA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihsaXN0Lml0ZW0oMSkp OworICAgIGF1dG8mIGZpcnN0ID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpsaXN0Lml0 ZW0oMCkpOworICAgIGF1dG8qIHNlY29uZCA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihs aXN0Lml0ZW0oMSkpOwogCiAgICAgR3JpZEF1dG9GbG93IGF1dG9GbG93ID0gUmVuZGVyU3R5bGU6 OmluaXRpYWxHcmlkQXV0b0Zsb3coKTsKICAgICBzd2l0Y2ggKGZpcnN0LmdldFZhbHVlSUQoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCmluZGV4IDRmYmNmMmVlNWZk ZWFlMDVjMTgzZmU4MWZiNmE3ZDI3ODI1NjEzM2IuLjQwZDE5Y2Y3M2MxYTc2OTlhMTZjMGI2M2E0 M2U3MGVhMjFiZDc0YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgK QEAgLTM5Niw4ICszOTYsOCBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5 VmFsdWVTaXplKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTUwogICAgIGF1dG8mIHZh bHVlTGlzdCA9IGRvd25jYXN0PENTU1ZhbHVlTGlzdD4odmFsdWUpOwogICAgIHN3aXRjaCAodmFs dWVMaXN0Lmxlbmd0aCgpKSB7CiAgICAgY2FzZSAyOiB7Ci0gICAgICAgIENTU1ZhbHVlKiBmaXJz dFZhbHVlID0gdmFsdWVMaXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMCk7Ci0gICAgICAgIENT U1ZhbHVlKiBzZWNvbmRWYWx1ZSA9IHZhbHVlTGlzdC5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEp OworICAgICAgICBhdXRvIGZpcnN0VmFsdWUgPSB2YWx1ZUxpc3QuaXRlbVdpdGhvdXRCb3VuZHND aGVjaygwKTsKKyAgICAgICAgYXV0byBzZWNvbmRWYWx1ZSA9IHZhbHVlTGlzdC5pdGVtV2l0aG91 dEJvdW5kc0NoZWNrKDEpOwogICAgICAgICAvLyA8bGVuZ3RoPnsyfSB8IDxwYWdlLXNpemU+IDxv cmllbnRhdGlvbj4KICAgICAgICAgaWYgKCFpczxDU1NQcmltaXRpdmVWYWx1ZT4oKmZpcnN0VmFs dWUpIHx8ICFpczxDU1NQcmltaXRpdmVWYWx1ZT4oKnNlY29uZFZhbHVlKSkKICAgICAgICAgICAg IHJldHVybjsKQEAgLTQyMCw3ICs0MjAsNyBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0 b206OmFwcGx5VmFsdWVTaXplKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTUwogICAg ICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSAxOiB7Ci0gICAgICAgIENTU1ZhbHVlKiB2YWx1 ZSA9IHZhbHVlTGlzdC5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApOworICAgICAgICBhdXRvIHZh bHVlID0gdmFsdWVMaXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMCk7CiAgICAgICAgIC8vIDxs ZW5ndGg+IHwgYXV0byB8IDxwYWdlLXNpemU+IHwgWyBwb3J0cmFpdCB8IGxhbmRzY2FwZV0KICAg ICAgICAgaWYgKCFpczxDU1NQcmltaXRpdmVWYWx1ZT4oKnZhbHVlKSkKICAgICAgICAgICAgIHJl dHVybjsKQEAgLTExOTUsNyArMTE5NSw3IEBAIGlubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3Rv bTo6YXBwbHlJbmhlcml0U3Ryb2tlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiBpbmxp bmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVTdHJva2UoU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQogewogICAgIFNWR1JlbmRlclN0eWxl JiBzdmdTdHlsZSA9IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+YWNjZXNzU1ZHU3R5bGUoKTsKLSAg ICBTVkdQYWludCYgc3ZnUGFpbnQgPSBkb3duY2FzdDxTVkdQYWludD4odmFsdWUpOworICAgIGF1 dG8mIHN2Z1BhaW50ID0gZG93bmNhc3Q8U1ZHUGFpbnQ+KHZhbHVlKTsKICAgICBzdmdTdHlsZS5z ZXRTdHJva2VQYWludChzdmdQYWludC5wYWludFR5cGUoKSwgU3R5bGVCdWlsZGVyQ29udmVydGVy Ojpjb252ZXJ0U1ZHQ29sb3Ioc3R5bGVSZXNvbHZlciwgc3ZnUGFpbnQpLCBzdmdQYWludC51cmko KSwgc3R5bGVSZXNvbHZlci5hcHBseVByb3BlcnR5VG9SZWd1bGFyU3R5bGUoKSwgc3R5bGVSZXNv bHZlci5hcHBseVByb3BlcnR5VG9WaXNpdGVkTGlua1N0eWxlKCkpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggYWJjZTk1MTQ1NmM3MDEwOGM1M2NjOGQzNWIzNGEy NmYxYjQxM2ZjYS4uYzgwNDU3MTZhMGMyNWNlMWQ2ZTYzZjAzZTJhYzU5NTdlNGE5N2ZlZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtMTc5MCw3ICsxNzkwLDcgQEAgc3Rh dGljIENvbG9yIGNvbG9yRm9yQ1NTVmFsdWUoQ1NTVmFsdWVJRCBjc3NWYWx1ZUlkKQogICAgIHJl dHVybiBSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPnN5c3RlbUNvbG9yKGNzc1ZhbHVlSWQp OwogfQogCi1ib29sIFN0eWxlUmVzb2x2ZXI6OmNvbG9yRnJvbVByaW1pdGl2ZVZhbHVlSXNEZXJp dmVkRnJvbUVsZW1lbnQoQ1NTUHJpbWl0aXZlVmFsdWUmIHZhbHVlKQorYm9vbCBTdHlsZVJlc29s dmVyOjpjb2xvckZyb21QcmltaXRpdmVWYWx1ZUlzRGVyaXZlZEZyb21FbGVtZW50KGNvbnN0IENT U1ByaW1pdGl2ZVZhbHVlJiB2YWx1ZSkKIHsKICAgICBpbnQgaWRlbnQgPSB2YWx1ZS5nZXRWYWx1 ZUlEKCk7CiAgICAgc3dpdGNoIChpZGVudCkgewpAQCAtMTgwNCw3ICsxODA0LDcgQEAgYm9vbCBT dHlsZVJlc29sdmVyOjpjb2xvckZyb21QcmltaXRpdmVWYWx1ZUlzRGVyaXZlZEZyb21FbGVtZW50 KENTU1ByaW1pdGl2ZVZhbHUKICAgICB9CiB9CiAKLUNvbG9yIFN0eWxlUmVzb2x2ZXI6OmNvbG9y RnJvbVByaW1pdGl2ZVZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlJiB2YWx1ZSwgYm9vbCBmb3JWaXNp dGVkTGluaykgY29uc3QKK0NvbG9yIFN0eWxlUmVzb2x2ZXI6OmNvbG9yRnJvbVByaW1pdGl2ZVZh bHVlKGNvbnN0IENTU1ByaW1pdGl2ZVZhbHVlJiB2YWx1ZSwgYm9vbCBmb3JWaXNpdGVkTGluaykg Y29uc3QKIHsKICAgICBpZiAodmFsdWUuaXNSR0JDb2xvcigpKQogICAgICAgICByZXR1cm4gQ29s b3IodmFsdWUuZ2V0UkdCQTMyVmFsdWUoKSk7CkBAIC0xODk3LDEzICsxODk3LDEzIEBAIHZvaWQg U3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdTVkdEb2N1bWVudHMoKQogICAgIHN0YXRlLmZpbHRl cnNXaXRoUGVuZGluZ1NWR0RvY3VtZW50cygpLmNsZWFyKCk7CiB9CiAKLWJvb2wgU3R5bGVSZXNv bHZlcjo6Y3JlYXRlRmlsdGVyT3BlcmF0aW9ucyhDU1NWYWx1ZSYgaW5WYWx1ZSwgRmlsdGVyT3Bl cmF0aW9ucyYgb3V0T3BlcmF0aW9ucykKK2Jvb2wgU3R5bGVSZXNvbHZlcjo6Y3JlYXRlRmlsdGVy T3BlcmF0aW9ucyhjb25zdCBDU1NWYWx1ZSYgaW5WYWx1ZSwgRmlsdGVyT3BlcmF0aW9ucyYgb3V0 T3BlcmF0aW9ucykKIHsKICAgICBTdGF0ZSYgc3RhdGUgPSBtX3N0YXRlOwogICAgIEFTU0VSVChv dXRPcGVyYXRpb25zLmlzRW1wdHkoKSk7CiAgICAgCiAgICAgaWYgKGlzPENTU1ByaW1pdGl2ZVZh bHVlPihpblZhbHVlKSkgewotICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFs dWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oaW5WYWx1ZSk7CisgICAgICAgIGF1dG8m IHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KGluVmFsdWUpOwog ICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlTm9uZSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KQEAgLTE5MjIsMTIgKzE5MjIsMTIgQEAg Ym9vbCBTdHlsZVJlc29sdmVyOjpjcmVhdGVGaWx0ZXJPcGVyYXRpb25zKENTU1ZhbHVlJiBpblZh bHVlLCBGaWx0ZXJPcGVyYXRpb25zJgogICAgICAgICBpZiAob3BlcmF0aW9uVHlwZSA9PSBGaWx0 ZXJPcGVyYXRpb246OlJFRkVSRU5DRSkgewogICAgICAgICAgICAgaWYgKGZpbHRlclZhbHVlLmxl bmd0aCgpICE9IDEpCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBDU1NW YWx1ZSYgYXJndW1lbnQgPSAqZmlsdGVyVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygwKTsK KyAgICAgICAgICAgIGF1dG8mIGFyZ3VtZW50ID0gKmZpbHRlclZhbHVlLml0ZW1XaXRob3V0Qm91 bmRzQ2hlY2soMCk7CiAKICAgICAgICAgICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KGFy Z3VtZW50KSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAgQ1NTUHJp bWl0aXZlVmFsdWUmIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+ KGFyZ3VtZW50KTsKKyAgICAgICAgICAgIGF1dG8mIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8 Q1NTUHJpbWl0aXZlVmFsdWU+KGFyZ3VtZW50KTsKICAgICAgICAgICAgIFN0cmluZyBjc3NVcmwg PSBwcmltaXRpdmVWYWx1ZS5nZXRTdHJpbmdWYWx1ZSgpOwogICAgICAgICAgICAgVVJMIHVybCA9 IG1fc3RhdGUuZG9jdW1lbnQoKS5jb21wbGV0ZVVSTChjc3NVcmwpOwogCkBAIC0xOTQxLDcgKzE5 NDEsNyBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlvbnMoQ1NTVmFs dWUmIGluVmFsdWUsIEZpbHRlck9wZXJhdGlvbnMmCiAKICAgICAgICAgLy8gQ2hlY2sgdGhhdCBh bGwgcGFyYW1ldGVycyBhcmUgcHJpbWl0aXZlIHZhbHVlcywgd2l0aCB0aGUKICAgICAgICAgLy8g ZXhjZXB0aW9uIG9mIGRyb3Agc2hhZG93IHdoaWNoIGhhcyBhIENTU1NoYWRvd1ZhbHVlIHBhcmFt ZXRlci4KLSAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGZpcnN0VmFsdWUgPSBudWxscHRyOwor ICAgICAgICBjb25zdCBDU1NQcmltaXRpdmVWYWx1ZSogZmlyc3RWYWx1ZSA9IG51bGxwdHI7CiAg ICAgICAgIGlmIChvcGVyYXRpb25UeXBlICE9IEZpbHRlck9wZXJhdGlvbjo6RFJPUF9TSEFET1cp IHsKICAgICAgICAgICAgIGJvb2wgaGF2ZU5vblByaW1pdGl2ZVZhbHVlID0gZmFsc2U7CiAgICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwgZmlsdGVyVmFsdWUubGVuZ3RoKCk7ICsr aikgewpAQCAtMjAwNiwxMSArMjAwNiwxMSBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZp bHRlck9wZXJhdGlvbnMoQ1NTVmFsdWUmIGluVmFsdWUsIEZpbHRlck9wZXJhdGlvbnMmCiAgICAg ICAgICAgICBpZiAoZmlsdGVyVmFsdWUubGVuZ3RoKCkgIT0gMSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgICAgIENTU1ZhbHVlJiBjc3NWYWx1ZSA9ICpmaWx0ZXJW YWx1ZS5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApOworICAgICAgICAgICAgYXV0byYgY3NzVmFs dWUgPSAqZmlsdGVyVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygwKTsKICAgICAgICAgICAg IGlmICghaXM8Q1NTU2hhZG93VmFsdWU+KGNzc1ZhbHVlKSkKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICAgICAgQ1NTU2hhZG93VmFsdWUmIGl0ZW0gPSBkb3duY2FzdDxDU1NT aGFkb3dWYWx1ZT4oY3NzVmFsdWUpOworICAgICAgICAgICAgYXV0byYgaXRlbSA9IGRvd25jYXN0 PENTU1NoYWRvd1ZhbHVlPihjc3NWYWx1ZSk7CiAgICAgICAgICAgICBpbnQgeCA9IGl0ZW0ueC0+ Y29tcHV0ZUxlbmd0aDxpbnQ+KHN0YXRlLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSk7CiAg ICAgICAgICAgICBpbnQgeSA9IGl0ZW0ueS0+Y29tcHV0ZUxlbmd0aDxpbnQ+KHN0YXRlLmNzc1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEoKSk7CiAgICAgICAgICAgICBJbnRQb2ludCBsb2NhdGlvbih4 LCB5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmggYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCmluZGV4IDc1MjY0OGJhNzExOTRjYThm YThiMTllNjgxZjZhMmVjOTJkZWJiNWQuLmViNDM1ZTZkOTQwNmU1OWZkM2NiZGNjOGQ5NTZlOTFh MmJkYWFkMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaApAQCAtMTg1LDggKzE4NSw4 IEBAIHB1YmxpYzoKICAgICBib29sIHVzZVNWR1pvb21SdWxlcygpOwogICAgIGJvb2wgdXNlU1ZH Wm9vbVJ1bGVzRm9yTGVuZ3RoKCk7CiAKLSAgICBzdGF0aWMgYm9vbCBjb2xvckZyb21QcmltaXRp dmVWYWx1ZUlzRGVyaXZlZEZyb21FbGVtZW50KENTU1ByaW1pdGl2ZVZhbHVlJik7Ci0gICAgQ29s b3IgY29sb3JGcm9tUHJpbWl0aXZlVmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUmLCBib29sIGZvclZp c2l0ZWRMaW5rID0gZmFsc2UpIGNvbnN0OworICAgIHN0YXRpYyBib29sIGNvbG9yRnJvbVByaW1p dGl2ZVZhbHVlSXNEZXJpdmVkRnJvbUVsZW1lbnQoY29uc3QgQ1NTUHJpbWl0aXZlVmFsdWUmKTsK KyAgICBDb2xvciBjb2xvckZyb21QcmltaXRpdmVWYWx1ZShjb25zdCBDU1NQcmltaXRpdmVWYWx1 ZSYsIGJvb2wgZm9yVmlzaXRlZExpbmsgPSBmYWxzZSkgY29uc3Q7CiAKICAgICBib29sIGhhc1Nl bGVjdG9yRm9ySWQoY29uc3QgQXRvbWljU3RyaW5nJikgY29uc3Q7CiAgICAgYm9vbCBoYXNTZWxl Y3RvckZvckNsYXNzKGNvbnN0IEF0b21pY1N0cmluZyYpIGNvbnN0OwpAQCAtMjExLDcgKzIxMSw3 IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY2xlYXJDYWNoZWRQcm9wZXJ0aWVzQWZmZWN0ZWRCeVZp ZXdwb3J0VW5pdHMoKTsKIAotICAgIGJvb2wgY3JlYXRlRmlsdGVyT3BlcmF0aW9ucyhDU1NWYWx1 ZSYgaW5WYWx1ZSwgRmlsdGVyT3BlcmF0aW9ucyYgb3V0T3BlcmF0aW9ucyk7CisgICAgYm9vbCBj cmVhdGVGaWx0ZXJPcGVyYXRpb25zKGNvbnN0IENTU1ZhbHVlJiBpblZhbHVlLCBGaWx0ZXJPcGVy YXRpb25zJiBvdXRPcGVyYXRpb25zKTsKICAgICB2b2lkIGxvYWRQZW5kaW5nU1ZHRG9jdW1lbnRz KCk7CiAKICAgICB2b2lkIGxvYWRQZW5kaW5nUmVzb3VyY2VzKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvVHJhbnNmb3JtRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9UcmFuc2Zvcm1GdW5jdGlvbnMuY3BwCmluZGV4IDAzYmUzMTQyYzdmYjIwOTZjYzA2MmNhMGU5 MjlmZGZmNTEwYjI1YTUuLjFlZGJjMjZkNjI0Y2ZhMmQ5NjdjZTllMjU1MWMzMzk1NWM2NTliZjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuY3BwCkBAIC04MSw3ICs4 MSw3IEBAIExlbmd0aCBjb252ZXJ0VG9GbG9hdExlbmd0aChjb25zdCBDU1NQcmltaXRpdmVWYWx1 ZSogcHJpbWl0aXZlVmFsdWUsIGNvbnN0IENTU1RvCiAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVl ID8gcHJpbWl0aXZlVmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEZsb2F0Q29udmVyc2lvbiB8 IFBlcmNlbnRDb252ZXJzaW9uIHwgQ2FsY3VsYXRlZENvbnZlcnNpb24+KGNvbnZlcnNpb25EYXRh KSA6IExlbmd0aChVbmRlZmluZWQpOwogfQogCi1ib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NW YWx1ZSYgdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcnNpb25E YXRhLCBUcmFuc2Zvcm1PcGVyYXRpb25zJiBvdXRPcGVyYXRpb25zKQorYm9vbCB0cmFuc2Zvcm1z Rm9yVmFsdWUoY29uc3QgQ1NTVmFsdWUmIHZhbHVlLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNp b25EYXRhJiBjb252ZXJzaW9uRGF0YSwgVHJhbnNmb3JtT3BlcmF0aW9ucyYgb3V0T3BlcmF0aW9u cykKIHsKICAgICBpZiAoIWlzPENTU1ZhbHVlTGlzdD4odmFsdWUpKSB7CiAgICAgICAgIG91dE9w ZXJhdGlvbnMuY2xlYXIoKTsKQEAgLTEwNyw3ICsxMDcsNyBAQCBib29sIHRyYW5zZm9ybXNGb3JW YWx1ZShDU1NWYWx1ZSYgdmFsdWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNv bnZlcgogICAgICAgICBpZiAoaGF2ZU5vblByaW1pdGl2ZVZhbHVlKQogICAgICAgICAgICAgY29u dGludWU7CiAKLSAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUmIGZpcnN0VmFsdWUgPSBkb3duY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMCkpOworICAgICAgICBhdXRvJiBmaXJzdFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZl VmFsdWU+KCp0cmFuc2Zvcm1WYWx1ZS5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApKTsKIAogICAg ICAgICBzd2l0Y2ggKHRyYW5zZm9ybVZhbHVlLm9wZXJhdGlvblR5cGUoKSkgewogICAgICAgICBj YXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpTY2FsZVRyYW5zZm9ybU9wZXJhdGlvbjoKQEAg LTEyMSw3ICsxMjEsNyBAQCBib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NWYWx1ZSYgdmFsdWUs IGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcgogICAgICAgICAgICAgICAg IHN4ID0gZmlyc3RWYWx1ZS5nZXREb3VibGVWYWx1ZSgpOwogICAgICAgICAgICAgICAgIGlmICh0 cmFuc2Zvcm1WYWx1ZS5vcGVyYXRpb25UeXBlKCkgIT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWU6 OlNjYWxlWFRyYW5zZm9ybU9wZXJhdGlvbikgewogICAgICAgICAgICAgICAgICAgICBpZiAodHJh bnNmb3JtVmFsdWUubGVuZ3RoKCkgPiAxKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBDU1NQ cmltaXRpdmVWYWx1ZSYgc2Vjb25kVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4o KnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOworICAgICAgICAgICAg ICAgICAgICAgICAgYXV0byYgc2Vjb25kVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1 ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOwogICAgICAgICAg ICAgICAgICAgICAgICAgc3kgPSBzZWNvbmRWYWx1ZS5nZXREb3VibGVWYWx1ZSgpOwogICAgICAg ICAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgIHN5ID0gc3g7CkBA IC0xNDMsMTEgKzE0MywxMSBAQCBib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NWYWx1ZSYgdmFs dWUsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcgogICAgICAgICAgICAg ICAgIHN4ID0gZmlyc3RWYWx1ZS5nZXREb3VibGVWYWx1ZSgpOwogICAgICAgICAgICAgICAgIGlm ICh0cmFuc2Zvcm1WYWx1ZS5vcGVyYXRpb25UeXBlKCkgIT0gV2ViS2l0Q1NTVHJhbnNmb3JtVmFs dWU6OlNjYWxlWFRyYW5zZm9ybU9wZXJhdGlvbikgewogICAgICAgICAgICAgICAgICAgICBpZiAo dHJhbnNmb3JtVmFsdWUubGVuZ3RoKCkgPiAyKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBD U1NQcmltaXRpdmVWYWx1ZSYgdGhpcmRWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVl PigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygyKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBhdXRvJiB0aGlyZFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFs dWU+KCp0cmFuc2Zvcm1WYWx1ZS5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDIpKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIHN6ID0gdGhpcmRWYWx1ZS5nZXREb3VibGVWYWx1ZSgpOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGlmICh0cmFuc2Zvcm1WYWx1ZS5s ZW5ndGgoKSA+IDEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVl JiBzZWNvbmRWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFs dWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBh dXRvJiBzZWNvbmRWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3Jt VmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7CiAgICAgICAgICAgICAgICAgICAgICAg ICBzeSA9IHNlY29uZFZhbHVlLmdldERvdWJsZVZhbHVlKCk7CiAgICAgICAgICAgICAgICAgICAg IH0gZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgc3kgPSBzeDsKQEAgLTE2Nyw3ICsxNjcs NyBAQCBib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NWYWx1ZSYgdmFsdWUsIGNvbnN0IENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcgogICAgICAgICAgICAgICAgIHR4ID0gY29udmVy dFRvRmxvYXRMZW5ndGgoJmZpcnN0VmFsdWUsIGNvbnZlcnNpb25EYXRhKTsKICAgICAgICAgICAg ICAgICBpZiAodHJhbnNmb3JtVmFsdWUub3BlcmF0aW9uVHlwZSgpICE9IFdlYktpdENTU1RyYW5z Zm9ybVZhbHVlOjpUcmFuc2xhdGVYVHJhbnNmb3JtT3BlcmF0aW9uKSB7CiAgICAgICAgICAgICAg ICAgICAgIGlmICh0cmFuc2Zvcm1WYWx1ZS5sZW5ndGgoKSA+IDEpIHsKLSAgICAgICAgICAgICAg ICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBzZWNvbmRWYWx1ZSA9IGRvd25jYXN0PENTU1By aW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7 CisgICAgICAgICAgICAgICAgICAgICAgICBhdXRvJiBzZWNvbmRWYWx1ZSA9IGRvd25jYXN0PENT U1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygx KSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKCZz ZWNvbmRWYWx1ZSwgY29udmVyc2lvbkRhdGEpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgfQpAQCAtMTkyLDExICsxOTIsMTEgQEAgYm9vbCB0cmFuc2Zvcm1zRm9yVmFs dWUoQ1NTVmFsdWUmIHZhbHVlLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252 ZXIKICAgICAgICAgICAgICAgICB0eCA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKCZmaXJzdFZhbHVl LCBjb252ZXJzaW9uRGF0YSk7CiAgICAgICAgICAgICAgICAgaWYgKHRyYW5zZm9ybVZhbHVlLm9w ZXJhdGlvblR5cGUoKSAhPSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWFRyYW5z Zm9ybU9wZXJhdGlvbikgewogICAgICAgICAgICAgICAgICAgICBpZiAodHJhbnNmb3JtVmFsdWUu bGVuZ3RoKCkgPiAyKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1 ZSYgdGhpcmRWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFs dWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygyKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBh dXRvJiB0aGlyZFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCp0cmFuc2Zvcm1W YWx1ZS5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDIpKTsKICAgICAgICAgICAgICAgICAgICAgICAg IHR6ID0gY29udmVydFRvRmxvYXRMZW5ndGgoJnRoaXJkVmFsdWUsIGNvbnZlcnNpb25EYXRhKTsK ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBpZiAodHJhbnNmb3Jt VmFsdWUubGVuZ3RoKCkgPiAxKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBDU1NQcmltaXRp dmVWYWx1ZSYgc2Vjb25kVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5z Zm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOworICAgICAgICAgICAgICAgICAg ICAgICAgYXV0byYgc2Vjb25kVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRy YW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOwogICAgICAgICAgICAgICAg ICAgICAgICAgdHkgPSBjb252ZXJ0VG9GbG9hdExlbmd0aCgmc2Vjb25kVmFsdWUsIGNvbnZlcnNp b25EYXRhKTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTIz Myw5ICsyMzMsOSBAQCBib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NWYWx1ZSYgdmFsdWUsIGNv bnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlcgogICAgICAgICBjYXNlIFdlYktp dENTU1RyYW5zZm9ybVZhbHVlOjpSb3RhdGUzRFRyYW5zZm9ybU9wZXJhdGlvbjogewogICAgICAg ICAgICAgaWYgKHRyYW5zZm9ybVZhbHVlLmxlbmd0aCgpIDwgNCkKICAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBzZWNvbmRWYWx1ZSA9IGRvd25j YXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHND aGVjaygxKSk7Ci0gICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgdGhpcmRWYWx1ZSA9IGRv d25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3Vu ZHNDaGVjaygyKSk7Ci0gICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgZm91cnRoVmFsdWUg PSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0 Qm91bmRzQ2hlY2soMykpOworICAgICAgICAgICAgYXV0byYgc2Vjb25kVmFsdWUgPSBkb3duY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMSkpOworICAgICAgICAgICAgYXV0byYgdGhpcmRWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygyKSk7Cisg ICAgICAgICAgICBhdXRvJiBmb3VydGhWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVl PigqdHJhbnNmb3JtVmFsdWUuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygzKSk7CiAgICAgICAgICAg ICBkb3VibGUgeCA9IGZpcnN0VmFsdWUuZ2V0RG91YmxlVmFsdWUoKTsKICAgICAgICAgICAgIGRv dWJsZSB5ID0gc2Vjb25kVmFsdWUuZ2V0RG91YmxlVmFsdWUoKTsKICAgICAgICAgICAgIGRvdWJs ZSB6ID0gdGhpcmRWYWx1ZS5nZXREb3VibGVWYWx1ZSgpOwpAQCAtMjU1LDcgKzI1NSw3IEBAIGJv b2wgdHJhbnNmb3Jtc0ZvclZhbHVlKENTU1ZhbHVlJiB2YWx1ZSwgY29uc3QgQ1NTVG9MZW5ndGhD b252ZXJzaW9uRGF0YSYgY29udmVyCiAgICAgICAgICAgICAgICAgYW5nbGVYID0gYW5nbGU7CiAg ICAgICAgICAgICAgICAgaWYgKHRyYW5zZm9ybVZhbHVlLm9wZXJhdGlvblR5cGUoKSA9PSBXZWJL aXRDU1NUcmFuc2Zvcm1WYWx1ZTo6U2tld1RyYW5zZm9ybU9wZXJhdGlvbikgewogICAgICAgICAg ICAgICAgICAgICBpZiAodHJhbnNmb3JtVmFsdWUubGVuZ3RoKCkgPiAxKSB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBDU1NQcmltaXRpdmVWYWx1ZSYgc2Vjb25kVmFsdWUgPSBkb3duY2FzdDxD U1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hlY2so MSkpOworICAgICAgICAgICAgICAgICAgICAgICAgYXV0byYgc2Vjb25kVmFsdWUgPSBkb3duY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZT4oKnRyYW5zZm9ybVZhbHVlLml0ZW1XaXRob3V0Qm91bmRzQ2hl Y2soMSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYW5nbGVZID0gc2Vjb25kVmFsdWUuY29t cHV0ZURlZ3JlZXMoKTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuaCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9UcmFuc2Zvcm1GdW5jdGlvbnMuaAppbmRleCA3ZTNkNzk4Y2I4Njcw OWMyNGZlOThiM2ZkNmEyNjcwMzkwYjYwN2Y3Li44YzAxMjhlOWE5NzI4ZTRlYjY2OGQzMDA3YjE3 NjAyMjM1ZTdlMWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvVHJhbnNmb3JtRnVu Y3Rpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1RyYW5zZm9ybUZ1bmN0aW9ucy5oCkBA IC00Miw3ICs0Miw3IEBAIGNsYXNzIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOwogCiBzdHJ1Y3Qg TGVuZ3RoOwogCi1ib29sIHRyYW5zZm9ybXNGb3JWYWx1ZShDU1NWYWx1ZSYsIGNvbnN0IENTU1Rv TGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBUcmFuc2Zvcm1PcGVyYXRpb25zJik7Citib29sIHRyYW5z Zm9ybXNGb3JWYWx1ZShjb25zdCBDU1NWYWx1ZSYsIGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lv bkRhdGEmLCBUcmFuc2Zvcm1PcGVyYXRpb25zJik7CiBMZW5ndGggY29udmVydFRvRmxvYXRMZW5n dGgoY29uc3QgQ1NTUHJpbWl0aXZlVmFsdWUqLCBjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhJik7CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZVBlbmRpbmdJbWFnZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl UGVuZGluZ0ltYWdlLmgKaW5kZXggOTZlYjAxZTQ3ZTg3ZGRjZDQ0MzVkNWI4ODQ1NDM0NDhlNDJi ZTI3NC4uMTkyNGZiYTdhYzI5ZTM0MThlMWM0MTRiYzZmMDFmYzU2MzFjY2YzMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUGVuZGluZ0ltYWdlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUGVuZGluZ0ltYWdlLmgKQEAg LTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8U3R5bGVQZW5kaW5nSW1hZ2U+ IGNyZWF0ZShDU1NWYWx1ZSogdmFsdWUpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU3R5bGVQZW5k aW5nSW1hZ2UodmFsdWUpKTsgfQogCiAgICAgQ1NTSW1hZ2VWYWx1ZSogY3NzSW1hZ2VWYWx1ZSgp IGNvbnN0IHsgcmV0dXJuIGlzPENTU0ltYWdlVmFsdWU+KG1fdmFsdWUpID8gZG93bmNhc3Q8Q1NT SW1hZ2VWYWx1ZT4obV92YWx1ZSkgOiBudWxscHRyOyB9Ci0gICAgQ1NTSW1hZ2VHZW5lcmF0b3JW YWx1ZSogY3NzSW1hZ2VHZW5lcmF0b3JWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUgJiYg bV92YWx1ZS0+aXNJbWFnZUdlbmVyYXRvclZhbHVlKCkgPyBzdGF0aWNfY2FzdDxDU1NJbWFnZUdl bmVyYXRvclZhbHVlKj4obV92YWx1ZSkgOiBudWxscHRyOyB9CisgICAgQ1NTSW1hZ2VHZW5lcmF0 b3JWYWx1ZSogY3NzSW1hZ2VHZW5lcmF0b3JWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIGlzPENTU0lt YWdlR2VuZXJhdG9yVmFsdWU+KG1fdmFsdWUpID8gc3RhdGljX2Nhc3Q8Q1NTSW1hZ2VHZW5lcmF0 b3JWYWx1ZSo+KG1fdmFsdWUpIDogbnVsbHB0cjsgfQogICAgIENTU0N1cnNvckltYWdlVmFsdWUq IGNzc0N1cnNvckltYWdlVmFsdWUoKSBjb25zdCB7IHJldHVybiBpczxDU1NDdXJzb3JJbWFnZVZh bHVlPihtX3ZhbHVlKSA/IGRvd25jYXN0PENTU0N1cnNvckltYWdlVmFsdWU+KG1fdmFsdWUpIDog bnVsbHB0cjsgfQogCiAjaWYgRU5BQkxFKENTU19JTUFHRV9TRVQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHTGVuZ3RoLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdMZW5n dGguY3BwCmluZGV4IDU1NjQ2ODRhNzRjN2E3NzgxODIyMGRiNjdhYTgwNmIzYmNkY2IxMWQuLjUw YzQzMDRhY2I2ZGE2NmNiY2M5NGU3Y2ZkMzcxNzA1NmI1ZDkwZTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdMZW5ndGguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdM ZW5ndGguY3BwCkBAIC0yODEsNyArMjgxLDcgQEAgdm9pZCBTVkdMZW5ndGg6OmNvbnZlcnRUb1Nw ZWNpZmllZFVuaXRzKHVuc2lnbmVkIHNob3J0IHR5cGUsIGNvbnN0IFNWR0xlbmd0aENvbnQKICAg ICBtX3VuaXQgPSBvcmlnaW5hbFVuaXRBbmRUeXBlOwogfQogCi1TVkdMZW5ndGggU1ZHTGVuZ3Ro Ojpmcm9tQ1NTUHJpbWl0aXZlVmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWUmIHZhbHVlKQorU1ZHTGVu Z3RoIFNWR0xlbmd0aDo6ZnJvbUNTU1ByaW1pdGl2ZVZhbHVlKGNvbnN0IENTU1ByaW1pdGl2ZVZh bHVlJiB2YWx1ZSkKIHsKICAgICBTVkdMZW5ndGhUeXBlIHN2Z1R5cGU7CiAgICAgc3dpdGNoICh2 YWx1ZS5wcmltaXRpdmVUeXBlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9T VkdMZW5ndGguaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdMZW5ndGguaAppbmRleCBhMTc5ZDc4 ZTEyOTMzZjg2MWJhYTZlZTM1MmIyYThiMzAzMmJkNGY4Li5iZWE5NjQ5MDE2MjAxYWJmMTdhNWFi YmRjMGE1NzFkYzNkYTNiYTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHTGVu Z3RoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0xlbmd0aC5oCkBAIC05OCw3ICs5OCw3 IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuICFtX3ZhbHVlSW5TcGVjaWZpZWRVbml0czsKICAg ICB9CiAKLSAgICBzdGF0aWMgU1ZHTGVuZ3RoIGZyb21DU1NQcmltaXRpdmVWYWx1ZShDU1NQcmlt aXRpdmVWYWx1ZSYpOworICAgIHN0YXRpYyBTVkdMZW5ndGggZnJvbUNTU1ByaW1pdGl2ZVZhbHVl KGNvbnN0IENTU1ByaW1pdGl2ZVZhbHVlJik7CiAgICAgc3RhdGljIFJlZjxDU1NQcmltaXRpdmVW YWx1ZT4gdG9DU1NQcmltaXRpdmVWYWx1ZShjb25zdCBTVkdMZW5ndGgmKTsKICAgICBzdGF0aWMg U1ZHTGVuZ3RoTW9kZSBsZW5ndGhNb2RlRm9yQW5pbWF0ZWRMZW5ndGhBdHRyaWJ1dGUoY29uc3Qg UXVhbGlmaWVkTmFtZSYpOwogCg==