129043 2014-02-19 08:40:53 -0800 Rename border/padding/margin width/height to horizontal/vertical extent on RenderBoxModelObject 2014-02-20 11:56:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue oldest_to_newest 982353 0 bjonesbe 2014-02-19 08:40:53 -0800 Rename border/padding/margin width/height to horizontal/vertical extent on RenderBoxModelObject 982354 1 224634 bjonesbe 2014-02-19 08:46:28 -0800 Created attachment 224634 Patch 982902 2 224634 hyatt 2014-02-20 11:22:41 -0800 Comment on attachment 224634 Patch r=me 982922 3 224634 commit-queue 2014-02-20 11:56:01 -0800 Comment on attachment 224634 Patch Clearing flags on attachment: 224634 Committed r164441: <http://trac.webkit.org/changeset/164441> 982923 4 commit-queue 2014-02-20 11:56:02 -0800 All reviewed patches have been landed. Closing bug. 224634 2014-02-19 08:46:28 -0800 2014-02-20 11:56:01 -0800 Patch bug-129043-20140219083943.patch text/plain 32974 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE3ZjQwNGFkNWFjMmE2 NTkzZjEwNWExMWMzZGRiNjhiN2YwNTFjMS4uMjA2NzhkMmY1NTc4MGI5ODkxYmRjYmYzYTA4OTQ1 OWYwMzkzYzAyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDc1IEBACiAyMDE0LTAyLTE5ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIFJlbmFtZSBib3JkZXIv cGFkZGluZy9tYXJnaW4gd2lkdGgvaGVpZ2h0IHRvIGhvcml6b250YWwvdmVydGljYWwgZXh0ZW50 IG9uIFJlbmRlckJveE1vZGVsT2JqZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjkwNDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVc2luZyBob3Jpem9udGFsIGV4dGVudCBpbnN0ZWFkIG9mIHdpZHRo IGFuZCB2ZXJ0aWNhbCBleHRlbnQgaW5zdGVhZAorICAgICAgICBvZiBoZWlnaHQgbWFrZXMgaXQg bW9yZSBvYnZpb3VzIHRoYXQgdGhlc2UgYXJlIG1lYXN1cmVtZW50cyBvZiBib3RoCisgICAgICAg IGJvcmRlci9tYXJnaW4vcGFkZGluZyBzaWRlcywgbm90IGp1c3Qgb25lLgorCisgICAgICAgIEFz IERhdmlkIEh5YXR0IHB1dCBpdDogIkkgZGlzbGlrZSB1c2luZyB0ZXJtcyBsaWtlICd3aWR0aCcg c2luY2UgaXQKKyAgICAgICAgY291bGQgYmUgY29uZnVzZWQgd2l0aCB0aGUgYWN0dWFsIGJvcmRl ci13aWR0aCBDU1MgbmFtZSwgaS5lLiwgYQorICAgICAgICBwZXJzb24gbmV3IHRvIHRoaXMgY29k ZSB3b3VsZCB0aGluayB0aGUgbWV0aG9kIHdhcyByZXR1cm5pbmcgdGhlIHBpeGVsCisgICAgICAg IHdpZHRoIG9mIGEgc2luZ2xlIGJvcmRlci4iCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBi ZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBodG1sL0hUTUxBcHBsZXRFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxBcHBsZXRFbGVtZW50Ojp1cGRhdGVXaWRnZXQpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrRmxvdzo6Y2hlY2tGbG9hdHNJbkNsZWFuTGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnJlcGFpbnRMYXllclJl Y3RzRm9ySW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpwb3NpdGlvbkZvclBv aW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojpob3Jpem9udGFsQm9yZGVyRXh0ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0Ojp2ZXJ0aWNhbEJvcmRl ckV4dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6dmVydGlj YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1v ZGVsT2JqZWN0Ojpob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6dmVydGljYWxNYXJnaW5FeHRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6Omhvcml6b250YWxNYXJnaW5FeHRl bnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRI b3Jpem9udGFsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveDo6bGF5b3V0VmVydGljYWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZpZWxkc2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpZWxkc2V0Ojpjb21w dXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZp bGVVcGxvYWRDb250cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpbGVVcGxvYWRD b250cm9sOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp YmxlQm94Ojpjcm9zc0F4aXNNYXJnaW5FeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nRXh0ZW50Rm9yQ2hp bGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVOZXh0Rmxl eExpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVySW5saW5lOjpsb2NhbENhcmV0UmVjdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJJbmxpbmU6OmdlbmVyYXRlQ3VsbGVkTGluZUJveFJlY3RzKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnJlc2l6ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHA6CisgICAgICAgIChSZW5k ZXJNZW51TGlzdDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2Ny b2xsYmFyOjp0cmFja1BpZWNlUmVjdFdpdGhNYXJnaW5zKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyU2xpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNsaWRlcjo6Y29tcHV0 ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6Y29tcHV0 ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNp bmdsZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9saW5lL0xpbmVMYXlvdXRTdGF0ZS5o OgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRXaXRoUmVjdDo6RmxvYXRXaXRoUmVjdCk6CisgICAg ICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2hhcGVJbmZvPFJlbmRlclR5cGU+OjpzZXRSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSk6CisgICAg ICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclNWR1Jvb3Q6OnVwZGF0ZUNhY2hlZEJvdW5kYXJpZXMpOgorCisyMDE0LTAyLTE5ICBC ZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCiAgICAgICAgIFtDU1MgU2hhcGVz XSBzaGFwZS1vdXRzaWRlIGRvZXMgbm90IHByb3Blcmx5IGhhbmRsZSBkaWZmZXJlbnQgd3JpdGlu ZyBtb2RlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI4NjMxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFwcGxldEVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKaW5kZXgg NjUzMWQzZDcwYjU4NjQxMGRmZWE3ZmFmNjVmYzdmNjVlMjc3OTlmOC4uN2FmYWJkNGZkYjkwZTVm YjM1MDI2OGViZmFlMzU2YzBlMWQ3YjdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBw bGV0RWxlbWVudC5jcHAKQEAgLTExNCw5ICsxMTQsOSBAQCB2b2lkIEhUTUxBcHBsZXRFbGVtZW50 Ojp1cGRhdGVXaWRnZXQoUGx1Z2luQ3JlYXRpb25PcHRpb24gcGx1Z2luQ3JlYXRpb25PcHRpb24p CiAgICAgUmVuZGVyRW1iZWRkZWRPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyRW1iZWRkZWRPYmpl Y3QoKTsKIAogICAgIExheW91dFVuaXQgY29udGVudFdpZHRoID0gcmVuZGVyZXItPnN0eWxlKCku d2lkdGgoKS5pc0ZpeGVkKCkgPyBMYXlvdXRVbml0KHJlbmRlcmVyLT5zdHlsZSgpLndpZHRoKCku dmFsdWUoKSkgOgotICAgICAgICByZW5kZXJlci0+d2lkdGgoKSAtIHJlbmRlcmVyLT5ib3JkZXJB bmRQYWRkaW5nV2lkdGgoKTsKKyAgICAgICAgcmVuZGVyZXItPndpZHRoKCkgLSByZW5kZXJlci0+ aG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBMYXlvdXRVbml0IGNvbnRl bnRIZWlnaHQgPSByZW5kZXJlci0+c3R5bGUoKS5oZWlnaHQoKS5pc0ZpeGVkKCkgPyBMYXlvdXRV bml0KHJlbmRlcmVyLT5zdHlsZSgpLmhlaWdodCgpLnZhbHVlKCkpIDoKLSAgICAgICAgcmVuZGVy ZXItPmhlaWdodCgpIC0gcmVuZGVyZXItPmJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKTsKKyAgICAg ICAgcmVuZGVyZXItPmhlaWdodCgpIC0gcmVuZGVyZXItPnZlcnRpY2FsQm9yZGVyQW5kUGFkZGlu Z0V4dGVudCgpOwogCiAgICAgVmVjdG9yPFN0cmluZz4gcGFyYW1OYW1lczsKICAgICBWZWN0b3I8 U3RyaW5nPiBwYXJhbVZhbHVlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JPdmVybGF5LmNwcAppbmRleCAzNGNkNWE0ZTMwYzliYThmNjY5ZDVkZDMzNjllNzcwZjQ0NThj ZjU5Li5iYWRiNDNmMmYwMWEzYjUwZDVkNDk4MGNhNTIyNzFiMGFlNGRiMDQ0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC0xNjQsNyArMTY0 LDcgQEAgc3RhdGljIHZvaWQgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChSZW5kZXJPYmplY3QqIHJl bmRlcmVyLCBSZW5kZXJSZWdpb24qIHJlZ2lvbiwKICAgICAgICAgICAgICAgICBwYWRkaW5nQm94 LndpZHRoKCkgLSByZW5kZXJJbmxpbmUtPnBhZGRpbmdMZWZ0KCkgLSByZW5kZXJJbmxpbmUtPnBh ZGRpbmdSaWdodCgpLCBwYWRkaW5nQm94LmhlaWdodCgpIC0gcmVuZGVySW5saW5lLT5wYWRkaW5n VG9wKCkgLSByZW5kZXJJbmxpbmUtPnBhZGRpbmdCb3R0b20oKSk7CiAgICAgICAgICAgICAvLyBJ Z25vcmUgbWFyZ2luVG9wIGFuZCBtYXJnaW5Cb3R0b20gZm9yIGlubGluZXMuCiAgICAgICAgICAg ICBtYXJnaW5Cb3ggPSBMYXlvdXRSZWN0KGJvcmRlckJveC54KCkgLSByZW5kZXJJbmxpbmUtPm1h cmdpbkxlZnQoKSwgYm9yZGVyQm94LnkoKSwKLSAgICAgICAgICAgICAgICBib3JkZXJCb3gud2lk dGgoKSArIHJlbmRlcklubGluZS0+bWFyZ2luV2lkdGgoKSwgYm9yZGVyQm94LmhlaWdodCgpKTsK KyAgICAgICAgICAgICAgICBib3JkZXJCb3gud2lkdGgoKSArIHJlbmRlcklubGluZS0+aG9yaXpv bnRhbE1hcmdpbkV4dGVudCgpLCBib3JkZXJCb3guaGVpZ2h0KCkpOwogICAgICAgICB9CiAKICAg ICAgICAgRmxvYXRRdWFkIGFic0NvbnRlbnRRdWFkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCA2OWFjNTUzZjA4NGZkZmU5 Mzc4MWM4ZWMwZGQ4MzQ2MDBiOGU5NDcyLi5kMGU3NTZkNzliMTMyZGYwYTJjN2VhMDQ3ZmI3M2I0 ZTgyMzYxMjU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcApAQCAtMTcyMCw3ICsxNzIwLDcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zs b3c6OmNoZWNrRmxvYXRzSW5DbGVhbkxpbmUoUm9vdElubGluZUJveCogbGluZSwgVmVjdG9yPEZs b2F0V2kKICAgICBmb3IgKGF1dG8gaXQgPSBjbGVhbkxpbmVGbG9hdHMtPmJlZ2luKCksIGVuZCA9 IGNsZWFuTGluZUZsb2F0cy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBSZW5k ZXJCb3gqIGZsb2F0aW5nQm94ID0gKml0OwogICAgICAgICBmbG9hdGluZ0JveC0+bGF5b3V0SWZO ZWVkZWQoKTsKLSAgICAgICAgTGF5b3V0U2l6ZSBuZXdTaXplKGZsb2F0aW5nQm94LT53aWR0aCgp ICsgZmxvYXRpbmdCb3gtPm1hcmdpbldpZHRoKCksIGZsb2F0aW5nQm94LT5oZWlnaHQoKSArIGZs b2F0aW5nQm94LT5tYXJnaW5IZWlnaHQoKSk7CisgICAgICAgIExheW91dFNpemUgbmV3U2l6ZShm bG9hdGluZ0JveC0+d2lkdGgoKSArIGZsb2F0aW5nQm94LT5ob3Jpem9udGFsTWFyZ2luRXh0ZW50 KCksIGZsb2F0aW5nQm94LT5oZWlnaHQoKSArIGZsb2F0aW5nQm94LT52ZXJ0aWNhbE1hcmdpbkV4 dGVudCgpKTsKICAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oZmxvYXRJ bmRleCA8IGZsb2F0cy5zaXplKCkpOwogICAgICAgICBpZiAoJmZsb2F0c1tmbG9hdEluZGV4XS5v YmplY3QgIT0gZmxvYXRpbmdCb3gpIHsKICAgICAgICAgICAgIGVuY291bnRlcmVkTmV3RmxvYXQg PSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBjYWY5OTQ2 MWNiYmU1NDEzNzJlMjMwZmNmNzJjMjg3MzRjOGI1ZjE4Li4wNDk5ZTdhZDMwOTYyNTkyZWQ3NWY2 MjA4OTIzMmMzNjM4MWNkYjEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cApAQCAtMTU4Miw4ICsxNTgyLDggQEAgYm9vbCBSZW5kZXJCb3g6OnJlcGFpbnRMYXllclJlY3Rz Rm9ySW1hZ2UoV3JhcHBlZEltYWdlUHRyIGltYWdlLCBjb25zdCBGaWxsTGF5ZXIKIAogICAgICAg ICAgICAgICAgICAgICByZW5kZXJlclJlY3QgPSBMYXlvdXRSZWN0KC1sYXllclJlbmRlcmVyLT5t YXJnaW5MZWZ0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAtbGF5ZXJSZW5kZXJlci0+bWFy Z2luVG9wKCksCi0gICAgICAgICAgICAgICAgICAgICAgICBzdGQ6Om1heChsYXllclJlbmRlcmVy LT53aWR0aCgpICsgbGF5ZXJSZW5kZXJlci0+bWFyZ2luV2lkdGgoKSArIGxheWVyUmVuZGVyZXIt PmJvcmRlckxlZnQoKSArIGxheWVyUmVuZGVyZXItPmJvcmRlclJpZ2h0KCksIHJ3KSwKLSAgICAg ICAgICAgICAgICAgICAgICAgIHN0ZDo6bWF4KGxheWVyUmVuZGVyZXItPmhlaWdodCgpICsgbGF5 ZXJSZW5kZXJlci0+bWFyZ2luSGVpZ2h0KCkgKyBsYXllclJlbmRlcmVyLT5ib3JkZXJUb3AoKSAr IGxheWVyUmVuZGVyZXItPmJvcmRlckJvdHRvbSgpLCByaCkpOworICAgICAgICAgICAgICAgICAg ICAgICAgc3RkOjptYXgobGF5ZXJSZW5kZXJlci0+d2lkdGgoKSArIGxheWVyUmVuZGVyZXItPmhv cml6b250YWxNYXJnaW5FeHRlbnQoKSArIGxheWVyUmVuZGVyZXItPmJvcmRlckxlZnQoKSArIGxh eWVyUmVuZGVyZXItPmJvcmRlclJpZ2h0KCksIHJ3KSwKKyAgICAgICAgICAgICAgICAgICAgICAg IHN0ZDo6bWF4KGxheWVyUmVuZGVyZXItPmhlaWdodCgpICsgbGF5ZXJSZW5kZXJlci0+dmVydGlj YWxNYXJnaW5FeHRlbnQoKSArIGxheWVyUmVuZGVyZXItPmJvcmRlclRvcCgpICsgbGF5ZXJSZW5k ZXJlci0+Ym9yZGVyQm90dG9tKCksIHJoKSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgICAgICAgICAgbGF5ZXJSZW5kZXJlciA9IHRoaXM7CiAgICAgICAgICAgICAgICAg ICAgIHJlbmRlcmVyUmVjdCA9IGJvcmRlckJveFJlY3QoKTsKQEAgLTQxMTYsOCArNDExNiw4IEBA IFZpc2libGVQb3NpdGlvbiBSZW5kZXJCb3g6OnBvc2l0aW9uRm9yUG9pbnQoY29uc3QgTGF5b3V0 UG9pbnQmIHBvaW50KQogICAgICAgICByZXR1cm4gY3JlYXRlVmlzaWJsZVBvc2l0aW9uKG5vblBz ZXVkb0VsZW1lbnQoKSA/IGZpcnN0UG9zaXRpb25Jbk9yQmVmb3JlTm9kZShub25Qc2V1ZG9FbGVt ZW50KCkpIDogUG9zaXRpb24oKSk7CiAKICAgICBpZiAoaXNUYWJsZSgpICYmIG5vblBzZXVkb0Vs ZW1lbnQoKSkgewotICAgICAgICBMYXlvdXRVbml0IHJpZ2h0ID0gY29udGVudFdpZHRoKCkgKyBi b3JkZXJBbmRQYWRkaW5nV2lkdGgoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBib3R0b20gPSBjb250 ZW50SGVpZ2h0KCkgKyBib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCk7CisgICAgICAgIExheW91dFVu aXQgcmlnaHQgPSBjb250ZW50V2lkdGgoKSArIGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCk7CisgICAgICAgIExheW91dFVuaXQgYm90dG9tID0gY29udGVudEhlaWdodCgpICsgdmVy dGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgICAgIAogICAgICAgICBpZiAocG9p bnQueCgpIDwgMCB8fCBwb2ludC54KCkgPiByaWdodCB8fCBwb2ludC55KCkgPCAwIHx8IHBvaW50 LnkoKSA+IGJvdHRvbSkgewogICAgICAgICAgICAgaWYgKHBvaW50LngoKSA8PSByaWdodCAvIDIp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCmlu ZGV4IGMwNjA0ZTJiOTE2YmI1YmY4OGY2N2FlNmQ3N2U1YWE3MWZkMDk5OWYuLmI4MWU1NmZlNWUx ZTgxMDU3NTZlMDQzZjgwZmVlYTdiNGRiZTJmODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCkBAIC0xMTcsOCArMTE3LDggQEAgcHVibGlj OgogICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBib3JkZXJCb3R0b20oKSBjb25zdCB7IHJldHVybiBz dHlsZSgpLmJvcmRlckJvdHRvbVdpZHRoKCk7IH0KICAgICB2aXJ0dWFsIExheW91dFVuaXQgYm9y ZGVyTGVmdCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuYm9yZGVyTGVmdFdpZHRoKCk7IH0KICAg ICB2aXJ0dWFsIExheW91dFVuaXQgYm9yZGVyUmlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgp LmJvcmRlclJpZ2h0V2lkdGgoKTsgfQotICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBib3JkZXJXaWR0 aCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlckxlZnQoKSArIGJvcmRlclJpZ2h0KCk7IH0KLSAgICB2 aXJ0dWFsIExheW91dFVuaXQgYm9yZGVySGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gYm9yZGVyVG9w KCkgKyBib3JkZXJCb3R0b20oKTsgfQorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBob3Jpem9udGFs Qm9yZGVyRXh0ZW50KCkgY29uc3QgeyByZXR1cm4gYm9yZGVyTGVmdCgpICsgYm9yZGVyUmlnaHQo KTsgfQorICAgIHZpcnR1YWwgTGF5b3V0VW5pdCB2ZXJ0aWNhbEJvcmRlckV4dGVudCgpIGNvbnN0 IHsgcmV0dXJuIGJvcmRlclRvcCgpICsgYm9yZGVyQm90dG9tKCk7IH0KICAgICB2aXJ0dWFsIExh eW91dFVuaXQgYm9yZGVyQmVmb3JlKCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS5ib3JkZXJCZWZv cmVXaWR0aCgpOyB9CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGJvcmRlckFmdGVyKCkgY29uc3Qg eyByZXR1cm4gc3R5bGUoKS5ib3JkZXJBZnRlcldpZHRoKCk7IH0KICAgICB2aXJ0dWFsIExheW91 dFVuaXQgYm9yZGVyU3RhcnQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmJvcmRlclN0YXJ0V2lk dGgoKTsgfQpAQCAtMTI4LDggKzEyOCw4IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmdCZWZvcmUoKSBjb25zdCB7IHJldHVybiBib3JkZXJCZWZvcmUoKSArIHBhZGRp bmdCZWZvcmUoKTsgfQogICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0FmdGVyKCkgY29u c3QgeyByZXR1cm4gYm9yZGVyQWZ0ZXIoKSArIHBhZGRpbmdBZnRlcigpOyB9CiAKLSAgICBMYXlv dXRVbml0IGJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSBjb25zdCB7IHJldHVybiBib3JkZXJUb3Ao KSArIGJvcmRlckJvdHRvbSgpICsgcGFkZGluZ1RvcCgpICsgcGFkZGluZ0JvdHRvbSgpOyB9Ci0g ICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nV2lkdGgoKSBjb25zdCB7IHJldHVybiBib3Jk ZXJMZWZ0KCkgKyBib3JkZXJSaWdodCgpICsgcGFkZGluZ0xlZnQoKSArIHBhZGRpbmdSaWdodCgp OyB9CisgICAgTGF5b3V0VW5pdCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSBjb25z dCB7IHJldHVybiBib3JkZXJUb3AoKSArIGJvcmRlckJvdHRvbSgpICsgcGFkZGluZ1RvcCgpICsg cGFkZGluZ0JvdHRvbSgpOyB9CisgICAgTGF5b3V0VW5pdCBob3Jpem9udGFsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlckxlZnQoKSArIGJvcmRlclJpZ2h0KCkg KyBwYWRkaW5nTGVmdCgpICsgcGFkZGluZ1JpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gYm9yZGVyQW5kUGFkZGlu Z0JlZm9yZSgpICsgYm9yZGVyQW5kUGFkZGluZ0FmdGVyKCk7IH0KICAgICBMYXlvdXRVbml0IGJv cmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBib3JkZXJTdGFydCgp ICsgYm9yZGVyRW5kKCkgKyBwYWRkaW5nU3RhcnQoKSArIHBhZGRpbmdFbmQoKTsgfQogICAgIExh eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gc3R5 bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xl ZnQoKSA6IGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpOyB9CkBAIC0xNTIsOCArMTUyLDggQEAg cHVibGljOgogICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBtYXJnaW5BZnRlcihjb25zdCBSZW5kZXJT dHlsZSogb3RoZXJTdHlsZSA9IDApIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIExheW91dFVuaXQg bWFyZ2luU3RhcnQoY29uc3QgUmVuZGVyU3R5bGUqIG90aGVyU3R5bGUgPSAwKSBjb25zdCA9IDA7 CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IG1hcmdpbkVuZChjb25zdCBSZW5kZXJTdHlsZSogb3Ro ZXJTdHlsZSA9IDApIGNvbnN0ID0gMDsKLSAgICBMYXlvdXRVbml0IG1hcmdpbkhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIG1hcmdpblRvcCgpICsgbWFyZ2luQm90dG9tKCk7IH0KLSAgICBMYXlvdXRV bml0IG1hcmdpbldpZHRoKCkgY29uc3QgeyByZXR1cm4gbWFyZ2luTGVmdCgpICsgbWFyZ2luUmln aHQoKTsgfQorICAgIExheW91dFVuaXQgdmVydGljYWxNYXJnaW5FeHRlbnQoKSBjb25zdCB7IHJl dHVybiBtYXJnaW5Ub3AoKSArIG1hcmdpbkJvdHRvbSgpOyB9CisgICAgTGF5b3V0VW5pdCBob3Jp em9udGFsTWFyZ2luRXh0ZW50KCkgY29uc3QgeyByZXR1cm4gbWFyZ2luTGVmdCgpICsgbWFyZ2lu UmlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNhbEhlaWdodCgpIGNvbnN0IHsg cmV0dXJuIG1hcmdpbkJlZm9yZSgpICsgbWFyZ2luQWZ0ZXIoKTsgfQogICAgIExheW91dFVuaXQg bWFyZ2luTG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbWFyZ2luU3RhcnQoKSArIG1hcmdp bkVuZCgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJE ZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggN2ZhODQ3ZTlkYTcyYTBiOGE3MTJmYzE4 NTg4ZTY5ZmMzZmRlYjUwNy4uMDdkMWJiMzI0Yjg0MmI1NWI2MGJlNTAyZGY1YjA2NzAzN2QxYTBh NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTQ0Myw3ICs0NDMsNyBAQCB2b2lkIFJlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29sIHJlbGF5b3V0Q2hpbGRy ZW4pCiAgICAgICAgICAgICAgICAgaWYgKGFzY2VudCA9PSAtMSkKICAgICAgICAgICAgICAgICAg ICAgYXNjZW50ID0gY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPm1hcmdpbkJvdHRvbSgpOwogICAg ICAgICAgICAgICAgIGFzY2VudCArPSBjaGlsZC0+bWFyZ2luVG9wKCk7Ci0gICAgICAgICAgICAg ICAgTGF5b3V0VW5pdCBkZXNjZW50ID0gKGNoaWxkLT5oZWlnaHQoKSArIGNoaWxkLT5tYXJnaW5I ZWlnaHQoKSkgLSBhc2NlbnQ7CisgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBkZXNjZW50ID0g KGNoaWxkLT5oZWlnaHQoKSArIGNoaWxkLT52ZXJ0aWNhbE1hcmdpbkV4dGVudCgpKSAtIGFzY2Vu dDsKIAogICAgICAgICAgICAgICAgIC8vIFVwZGF0ZSBvdXIgbWF4aW11bSBhc2NlbnQuCiAgICAg ICAgICAgICAgICAgbWF4QXNjZW50ID0gc3RkOjptYXgobWF4QXNjZW50LCBhc2NlbnQpOwpAQCAt NDU1LDcgKzQ1NSw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRI b3Jpem9udGFsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAgICAgICAgICBzZXRI ZWlnaHQoc3RkOjptYXgoeVBvcyArIG1heEFzY2VudCArIG1heERlc2NlbnQsIGhlaWdodCgpKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgc2V0SGVp Z2h0KHN0ZDo6bWF4KGhlaWdodCgpLCB5UG9zICsgY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPm1h cmdpbkhlaWdodCgpKSk7CisgICAgICAgICAgICAgICAgc2V0SGVpZ2h0KHN0ZDo6bWF4KGhlaWdo dCgpLCB5UG9zICsgY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPnZlcnRpY2FsTWFyZ2luRXh0ZW50 KCkpKTsKICAgICAgICAgfQogICAgICAgICBBU1NFUlQoY2hpbGRJbmRleCA9PSBjaGlsZExheW91 dERlbHRhcy5zaXplKCkpOwogCkBAIC01MTQsNyArNTE0LDcgQEAgdm9pZCBSZW5kZXJEZXByZWNh dGVkRmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWxCb3goYm9vbCByZWxheW91dENoaWxkcmVu KQogICAgICAgICAgICAgTGF5b3V0VW5pdCBjaGlsZFkgPSB5UG9zOwogICAgICAgICAgICAgc3dp dGNoIChzdHlsZSgpLmJveEFsaWduKCkpIHsKICAgICAgICAgICAgICAgICBjYXNlIEJDRU5URVI6 Ci0gICAgICAgICAgICAgICAgICAgIGNoaWxkWSArPSBjaGlsZC0+bWFyZ2luVG9wKCkgKyBzdGQ6 Om1heDxMYXlvdXRVbml0PigwLCAoY29udGVudEhlaWdodCgpIC0gKGNoaWxkLT5oZWlnaHQoKSAr IGNoaWxkLT5tYXJnaW5IZWlnaHQoKSkpIC8gMik7CisgICAgICAgICAgICAgICAgICAgIGNoaWxk WSArPSBjaGlsZC0+bWFyZ2luVG9wKCkgKyBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCAoY29udGVu dEhlaWdodCgpIC0gKGNoaWxkLT5oZWlnaHQoKSArIGNoaWxkLT52ZXJ0aWNhbE1hcmdpbkV4dGVu dCgpKSkgLyAyKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAg Y2FzZSBCQkFTRUxJTkU6IHsKICAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnQg PSBjaGlsZC0+Zmlyc3RMaW5lQmFzZWxpbmUoKTsKQEAgLTc2MCw3ICs3NjAsNyBAQCB2b2lkIFJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0VmVydGljYWxCb3goYm9vbCByZWxheW91 dENoaWxkcmVuKQogICAgICAgICAgICAgc3dpdGNoIChzdHlsZSgpLmJveEFsaWduKCkpIHsKICAg ICAgICAgICAgICAgICBjYXNlIEJDRU5URVI6CiAgICAgICAgICAgICAgICAgY2FzZSBCQkFTRUxJ TkU6IC8vIEJhc2VsaW5lIGp1c3QgbWFwcyB0byBjZW50ZXIgZm9yIHZlcnRpY2FsIGJveGVzCi0g ICAgICAgICAgICAgICAgICAgIGNoaWxkWCArPSBjaGlsZC0+bWFyZ2luTGVmdCgpICsgc3RkOjpt YXg8TGF5b3V0VW5pdD4oMCwgKGNvbnRlbnRXaWR0aCgpIC0gKGNoaWxkLT53aWR0aCgpICsgY2hp bGQtPm1hcmdpbldpZHRoKCkpKSAvIDIpOworICAgICAgICAgICAgICAgICAgICBjaGlsZFggKz0g Y2hpbGQtPm1hcmdpbkxlZnQoKSArIHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIChjb250ZW50V2lk dGgoKSAtIChjaGlsZC0+d2lkdGgoKSArIGNoaWxkLT5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkp KSAvIDIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNl IEJFTkQ6CiAgICAgICAgICAgICAgICAgICAgIGlmICghc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKCkpCkBAIC05ODIsNyArOTgyLDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGli bGVCb3g6OmFwcGx5TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5b3V0 KE1hcmtPbmx5VGhpcyk7Ci0gICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50 SGVpZ2h0KG5ld0hlaWdodCAtIGNoaWxkLT5ib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkpOworICAg ICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodChuZXdIZWlnaHQgLSBj aGlsZC0+dmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogICAgICAgICBjaGlsZC0+ bGF5b3V0SWZOZWVkZWQoKTsKIAogICAgICAgICAvLyBGSVhNRTogRm9yIG5vdyBkb24ndCBzdXBw b3J0IFJUTC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGaWVs ZHNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmllbGRzZXQuY3BwCmlu ZGV4IGE4NDRlNDMyNTg3NGM1M2Y2MjNlNjhhNzk2MGRjYTQyYjk4OWVkZjAuLmM3MGI1YTNjMTNm NjI3YzhlMjBjZDMzOWFkMjIxYzU2ODAwNTM4NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGaWVsZHNldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZpZWxkc2V0LmNwcApAQCAtNTQsNyArNTQsNyBAQCB2b2lkIFJlbmRlckZpZWxk c2V0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgICAgIGlmIChsZWdlbmRN YXJnaW5SaWdodC5pc0ZpeGVkKCkpCiAgICAgICAgICAgICBsZWdlbmRNaW5XaWR0aCArPSBsZWdl bmRNYXJnaW5SaWdodC52YWx1ZSgpOwogCi0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGxlZ2VuZE1pbldpZHRo ICsgYm9yZGVyQW5kUGFkZGluZ1dpZHRoKCkpOworICAgICAgICBtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IHN0ZDo6bWF4KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBsZWdlbmRNaW5X aWR0aCArIGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250 cm9sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJv bC5jcHAKaW5kZXggOTgxNjQ5NjEwN2ZkMGMwNjZhNTQ5Zjk5MmQxZTMxOTcyNmQyNDNjOS4uNzY4 ZDE4OWY1ZTRiMTYxZDYzYmQ4OWYxZDg5MmJhYTQ3OTQ1ZmNlNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250cm9sLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwCkBAIC0yMzks NyArMjM5LDcgQEAgdm9pZCBSZW5kZXJGaWxlVXBsb2FkQ29udHJvbDo6Y29tcHV0ZVByZWZlcnJl ZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0 ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNh bFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCkubWF4V2lkdGgoKS52YWx1ZSgpKSk7CiAgICAgfQog Ci0gICAgaW50IHRvQWRkID0gYm9yZGVyQW5kUGFkZGluZ1dpZHRoKCk7CisgICAgaW50IHRvQWRk ID0gaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCAr PSB0b0FkZDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKaW5kZXggOWZiZmJlYmFkZTdkZDEwYjRhYWM5ZjY3N2IxN2MwMGJhZmQ4MjRkYy4uOTU3 ZTQ5ZmNmNTE4YmEzYmUzOGJiNzI4YmVhOTRiZjhkNjBhMDVkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC02MzQsNyArNjM0LDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlTWFyZ2luQWZ0ZXJGb3JDaGls ZChSZW5kZXJCb3gmIGNoaWxkKSBjb24KIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 Y3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsK LSAgICByZXR1cm4gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQubWFyZ2luSGVpZ2h0KCkgOiBj aGlsZC5tYXJnaW5XaWR0aCgpOworICAgIHJldHVybiBpc0hvcml6b250YWxGbG93KCkgPyBjaGls ZC52ZXJ0aWNhbE1hcmdpbkV4dGVudCgpIDogY2hpbGQuaG9yaXpvbnRhbE1hcmdpbkV4dGVudCgp OwogfQogCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNTY3JvbGxiYXJF eHRlbnQoKSBjb25zdApAQCAtNjU3LDcgKzY1Nyw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6 OnNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgTGF5 CiAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQm9yZGVyQW5kUGFkZGlu Z0V4dGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGlz SG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdXaWR0aCgpIDogY2hpbGQu Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpOworICAgIHJldHVybiBpc0hvcml6b250YWxGbG93KCkg PyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGlj YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyRmxleGli bGVCb3g6Om1haW5BeGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCkg Y29uc3QKQEAgLTkwMSw3ICs5MDEsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl TmV4dEZsZXhMaW5lKE9yZGVyZWRGbGV4SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbgogCiAgICAg ICAgIExheW91dFVuaXQgY2hpbGRNYWluQXhpc0V4dGVudCA9IHByZWZlcnJlZE1haW5BeGlzQ29u dGVudEV4dGVudEZvckNoaWxkKCpjaGlsZCwgaGFzSW5maW5pdGVMaW5lTGVuZ3RoKTsKICAgICAg ICAgTGF5b3V0VW5pdCBjaGlsZE1haW5BeGlzTWFyZ2luQm94RXh0ZW50ID0gbWFpbkF4aXNCb3Jk ZXJBbmRQYWRkaW5nRXh0ZW50Rm9yQ2hpbGQoKmNoaWxkKSArIGNoaWxkTWFpbkF4aXNFeHRlbnQ7 Ci0gICAgICAgIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hFeHRlbnQgKz0gaXNIb3Jpem9udGFsRmxv dygpID8gY2hpbGQtPm1hcmdpbldpZHRoKCkgOiBjaGlsZC0+bWFyZ2luSGVpZ2h0KCk7CisgICAg ICAgIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hFeHRlbnQgKz0gaXNIb3Jpem9udGFsRmxvdygpID8g Y2hpbGQtPmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGNoaWxkLT52ZXJ0aWNhbE1hcmdpbkV4 dGVudCgpOwogCiAgICAgICAgIGlmIChpc011bHRpbGluZSgpICYmIHByZWZlcnJlZE1haW5BeGlz RXh0ZW50ICsgY2hpbGRNYWluQXhpc01hcmdpbkJveEV4dGVudCA+IGxpbmVCcmVha0xlbmd0aCAm JiBsaW5lSGFzSW5GbG93SXRlbSkKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCBlNDUzNTQwN2NmNTYzZTI5YWQzM2U5NjQw ZTljOGM0MzBmOTg2MDQ0Li5iN2Q2MzMyZjA5YjRlN2ZlZGM3M2MyNmI5NTMxZjg5NTAyOTk1ZGNk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtMjQ5LDcg KzI0OSw3IEBAIExheW91dFJlY3QgUmVuZGVySW5saW5lOjpsb2NhbENhcmV0UmVjdChJbmxpbmVC b3gqIGlubGluZUJveCwgaW50LCBMYXlvdXRVbml0KiBlCiAgICAgaWYgKGV4dHJhV2lkdGhUb0Vu ZE9mTGluZSkKICAgICAgICAgKmV4dHJhV2lkdGhUb0VuZE9mTGluZSA9IDA7CiAKLSAgICBMYXlv dXRSZWN0IGNhcmV0UmVjdCA9IGxvY2FsQ2FyZXRSZWN0Rm9yRW1wdHlFbGVtZW50KGJvcmRlckFu ZFBhZGRpbmdXaWR0aCgpLCAwKTsKKyAgICBMYXlvdXRSZWN0IGNhcmV0UmVjdCA9IGxvY2FsQ2Fy ZXRSZWN0Rm9yRW1wdHlFbGVtZW50KGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCks IDApOwogCiAgICAgaWYgKElubGluZUJveCogZmlyc3RCb3ggPSBmaXJzdExpbmVCb3goKSkKICAg ICAgICAgY2FyZXRSZWN0Lm1vdmVCeShyb3VuZGVkTGF5b3V0UG9pbnQoZmlyc3RCb3gtPnRvcExl ZnQoKSkpOwpAQCAtNTczLDkgKzU3Myw5IEBAIHZvaWQgUmVuZGVySW5saW5lOjpnZW5lcmF0ZUN1 bGxlZExpbmVCb3hSZWN0cyhHZW5lcmF0b3JDb250ZXh0JiB5aWVsZCwgY29uc3QgUmVuCiAgICAg ICAgICAgICAgICAgaW50IGxvZ2ljYWxUb3AgPSByb290Qm94LmxvZ2ljYWxUb3AoKSArIChyb290 Qm94LmxpbmVTdHlsZSgpLmZvbnQoKS5mb250TWV0cmljcygpLmFzY2VudCgpIC0gY29udGFpbmVy U3R5bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOwogICAgICAgICAgICAgICAgIGlu dCBsb2dpY2FsSGVpZ2h0ID0gY29udGFpbmVyU3R5bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuaGVp Z2h0KCk7CiAgICAgICAgICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbCkKLSAgICAgICAgICAgICAg ICAgICAgeWllbGQoRmxvYXRSZWN0KGN1cnJCb3gtPmlubGluZUJveFdyYXBwZXIoKS0+eCgpIC0g Y3VyckJveC0+bWFyZ2luTGVmdCgpLCBsb2dpY2FsVG9wLCBjdXJyQm94LT53aWR0aCgpICsgY3Vy ckJveC0+bWFyZ2luV2lkdGgoKSwgbG9naWNhbEhlaWdodCkpOworICAgICAgICAgICAgICAgICAg ICB5aWVsZChGbG9hdFJlY3QoY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT54KCkgLSBjdXJy Qm94LT5tYXJnaW5MZWZ0KCksIGxvZ2ljYWxUb3AsIGN1cnJCb3gtPndpZHRoKCkgKyBjdXJyQm94 LT5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCksIGxvZ2ljYWxIZWlnaHQpKTsKICAgICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHlpZWxkKEZsb2F0UmVjdChsb2dpY2FsVG9w LCBjdXJyQm94LT5pbmxpbmVCb3hXcmFwcGVyKCktPnkoKSAtIGN1cnJCb3gtPm1hcmdpblRvcCgp LCBsb2dpY2FsSGVpZ2h0LCBjdXJyQm94LT5oZWlnaHQoKSArIGN1cnJCb3gtPm1hcmdpbkhlaWdo dCgpKSk7CisgICAgICAgICAgICAgICAgICAgIHlpZWxkKEZsb2F0UmVjdChsb2dpY2FsVG9wLCBj dXJyQm94LT5pbmxpbmVCb3hXcmFwcGVyKCktPnkoKSAtIGN1cnJCb3gtPm1hcmdpblRvcCgpLCBs b2dpY2FsSGVpZ2h0LCBjdXJyQm94LT5oZWlnaHQoKSArIGN1cnJCb3gtPnZlcnRpY2FsTWFyZ2lu RXh0ZW50KCkpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChjdXJyLT5pc1Jl bmRlcklubGluZSgpKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgY2hpbGQgZG9lc24ndCBuZWVk IGxpbmUgYm94ZXMgZWl0aGVyLCB0aGVuIHdlIGNhbiByZWN1ci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDZjYjJlN2E1MTU3YzEyZDUyY2VhNjhhNWM4MDMw YmI2M2M3ZjdkMmYuLjhjYWIzZjgzOThhZjAwMTQ3YjhiOTQ1YjJjOWE1ZTEzNzAxNGIwMmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjU2NSw3ICsyNTY1 LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cmVzaXplKGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYg ZXZ0LCBjb25zdCBMYXlvdXRTaXplJiBvbGRPZmYKICAgICAgICAgICAgIHN0eWxlZEVsZW1lbnQt PnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlNYXJnaW5MZWZ0LCByZW5kZXJlci0+ bWFyZ2luTGVmdCgpIC8gem9vbUZhY3RvciwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CiAg ICAgICAgICAgICBzdHlsZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3Bl cnR5TWFyZ2luUmlnaHQsIHJlbmRlcmVyLT5tYXJnaW5SaWdodCgpIC8gem9vbUZhY3RvciwgQ1NT UHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CiAgICAgICAgIH0KLSAgICAgICAgTGF5b3V0VW5pdCBi YXNlV2lkdGggPSByZW5kZXJlci0+d2lkdGgoKSAtIChpc0JveFNpemluZ0JvcmRlciA/IExheW91 dFVuaXQoKSA6IHJlbmRlcmVyLT5ib3JkZXJBbmRQYWRkaW5nV2lkdGgoKSk7CisgICAgICAgIExh eW91dFVuaXQgYmFzZVdpZHRoID0gcmVuZGVyZXItPndpZHRoKCkgLSAoaXNCb3hTaXppbmdCb3Jk ZXIgPyBMYXlvdXRVbml0KCkgOiByZW5kZXJlci0+aG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdF eHRlbnQoKSk7CiAgICAgICAgIGJhc2VXaWR0aCA9IGJhc2VXaWR0aCAvIHpvb21GYWN0b3I7CiAg ICAgICAgIHN0eWxlZEVsZW1lbnQtPnNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlX aWR0aCwgcm91bmRUb0ludChiYXNlV2lkdGggKyBkaWZmZXJlbmNlLndpZHRoKCkpLCBDU1NQcmlt aXRpdmVWYWx1ZTo6Q1NTX1BYKTsKICAgICB9CkBAIC0yNTc2LDcgKzI1NzYsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpyZXNpemUoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldnQsIGNvbnN0IExh eW91dFNpemUmIG9sZE9mZgogICAgICAgICAgICAgc3R5bGVkRWxlbWVudC0+c2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eU1hcmdpblRvcCwgcmVuZGVyZXItPm1hcmdpblRvcCgpIC8g em9vbUZhY3RvciwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CiAgICAgICAgICAgICBzdHls ZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5TWFyZ2luQm90dG9t LCByZW5kZXJlci0+bWFyZ2luQm90dG9tKCkgLyB6b29tRmFjdG9yLCBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX1BYKTsKICAgICAgICAgfQotICAgICAgICBMYXlvdXRVbml0IGJhc2VIZWlnaHQgPSBy ZW5kZXJlci0+aGVpZ2h0KCkgLSAoaXNCb3hTaXppbmdCb3JkZXIgPyBMYXlvdXRVbml0KCkgOiBy ZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBi YXNlSGVpZ2h0ID0gcmVuZGVyZXItPmhlaWdodCgpIC0gKGlzQm94U2l6aW5nQm9yZGVyID8gTGF5 b3V0VW5pdCgpIDogcmVuZGVyZXItPnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpKTsK ICAgICAgICAgYmFzZUhlaWdodCA9IGJhc2VIZWlnaHQgLyB6b29tRmFjdG9yOwogICAgICAgICBz dHlsZWRFbGVtZW50LT5zZXRJbmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5SGVpZ2h0LCBy b3VuZFRvSW50KGJhc2VIZWlnaHQgKyBkaWZmZXJlbmNlLmhlaWdodCgpKSwgQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19QWCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxp c3RCb3guY3BwCmluZGV4IGUzYjZmZTEyMjUzMTJmOWQxOTNkOTJjODhiZTk0NTBlNzRiN2E2ZTAu LjNjMTI2MTRlOGJhNmQyZTc0YWM4ODFmODY1NzEzNjc3NTI3ZmUyZjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTIxOSw3ICsyMTksNyBAQCB2b2lk IFJlbmRlckxpc3RCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAg bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgp Lm1heFdpZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAotICAgIExheW91dFVuaXQgdG9BZGQgPSBi b3JkZXJBbmRQYWRkaW5nV2lkdGgoKTsKKyAgICBMYXlvdXRVbml0IHRvQWRkID0gaG9yaXpvbnRh bEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0 aCArPSB0b0FkZDsKICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCkBAIC0yNTMsNyArMjUzLDcgQEAgTGF5b3V0 VW5pdCBSZW5kZXJMaXN0Qm94OjpsaXN0SGVpZ2h0KCkgY29uc3QKIAogdm9pZCBSZW5kZXJMaXN0 Qm94Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0LCBMYXlvdXRVbml0IGxvZ2ljYWxU b3AsIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNvbnN0CiB7 Ci0gICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBpdGVtSGVpZ2h0KCkgKiBzaXplKCkgLSByb3dTcGFj aW5nICsgYm9yZGVyQW5kUGFkZGluZ0hlaWdodCgpOworICAgIExheW91dFVuaXQgaGVpZ2h0ID0g aXRlbUhlaWdodCgpICogc2l6ZSgpIC0gcm93U3BhY2luZyArIHZlcnRpY2FsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpOwogICAgIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoaGVpZ2h0 LCBsb2dpY2FsVG9wLCBjb21wdXRlZFZhbHVlcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCmluZGV4IGFiOWIzZGYwZmY5MzRmMzRmNTUwM2ZiOWMz M2NhNDk2NjFlODViZjMuLjMwYWE0ZWM4YzgwMDEyNzdkMjkxNTYyMTkyMWQxMzIxNjQwMTIxZWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcApAQCAtMzQ0 LDcgKzM0NCw3IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKCkKICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbiht X21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZv ckJveFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAotICAgIExh eW91dFVuaXQgdG9BZGQgPSBib3JkZXJBbmRQYWRkaW5nV2lkdGgoKTsKKyAgICBMYXlvdXRVbml0 IHRvQWRkID0gaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBtX21pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxX aWR0aCArPSB0b0FkZDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclNjcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyLmNwcAppbmRleCA0YmQ4ODdmOGY1Y2I1M2UwM2Y3ZjYyOWIyYjE5YTZkMWE4ZmJjY2I5Li5k N2VjYjlmNTQ5NjcwOGFjMGYyMDM1NmYwODNhYmNiOTU1N2ZmOWE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcApAQCAtMzI1LDEwICszMjUsMTAgQEAg SW50UmVjdCBSZW5kZXJTY3JvbGxiYXI6OnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMoU2Nyb2xs YmFyUGFydCBwYXJ0VHlwZSwgY29uc3QKICAgICBJbnRSZWN0IHJlY3QgPSBvbGRSZWN0OwogICAg IGlmIChvcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgcmVj dC5zZXRYKHJlY3QueCgpICsgcGFydFJlbmRlcmVyLT5tYXJnaW5MZWZ0KCkpOwotICAgICAgICBy ZWN0LnNldFdpZHRoKHJlY3Qud2lkdGgoKSAtIHBhcnRSZW5kZXJlci0+bWFyZ2luV2lkdGgoKSk7 CisgICAgICAgIHJlY3Quc2V0V2lkdGgocmVjdC53aWR0aCgpIC0gcGFydFJlbmRlcmVyLT5ob3Jp em9udGFsTWFyZ2luRXh0ZW50KCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHJlY3Quc2V0WShy ZWN0LnkoKSArIHBhcnRSZW5kZXJlci0+bWFyZ2luVG9wKCkpOwotICAgICAgICByZWN0LnNldEhl aWdodChyZWN0LmhlaWdodCgpIC0gcGFydFJlbmRlcmVyLT5tYXJnaW5IZWlnaHQoKSk7CisgICAg ICAgIHJlY3Quc2V0SGVpZ2h0KHJlY3QuaGVpZ2h0KCkgLSBwYXJ0UmVuZGVyZXItPnZlcnRpY2Fs TWFyZ2luRXh0ZW50KCkpOwogICAgIH0KICAgICByZXR1cm4gcmVjdDsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTbGlkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKaW5kZXggY2RkYzRiYTZhZjZkMGMwNTc1MjQ1 YjM1Y2M0ZDViNGFlZjk2YmNiYy4uMGZjNDQwYTViMWY2NjAxNzAwNWMzNWQ5MWNmOTdkOGVhYThi YTBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKQEAgLTk2 LDcgKzk2LDcgQEAgdm9pZCBSZW5kZXJTbGlkZXI6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lk dGhzKCkKICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21p blByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJv eFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAotICAgIExheW91 dFVuaXQgdG9BZGQgPSBib3JkZXJBbmRQYWRkaW5nV2lkdGgoKTsKKyAgICBMYXlvdXRVbml0IHRv QWRkID0gaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCArPSB0b0FkZDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHRDb250cm9sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29u dHJvbC5jcHAKaW5kZXggZjlmNTlkYmRkZjMyZWVhNDMxZTFlNmQ4OTZjMjFhYjkxMmVjNGU3Yy4u NjllMGZmN2Q0MTFmNDQ4ZGQwZTUxMmU1NjJjYmU4ZGEwYWRjZGY4ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCkBAIC0xNTMsOCArMTUzLDgg QEAgdm9pZCBSZW5kZXJUZXh0Q29udHJvbDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5p dCBsb2dpY2FsSGVpZ2h0LCBMYXlvdXRVbmkKICAgICBUZXh0Q29udHJvbElubmVyVGV4dEVsZW1l bnQqIGlubmVyVGV4dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKICAgICBBU1NFUlQoaW5uZXJUZXh0 KTsKICAgICBpZiAoUmVuZGVyQm94KiBpbm5lclRleHRCb3ggPSBpbm5lclRleHQtPnJlbmRlckJv eCgpKSB7Ci0gICAgICAgIExheW91dFVuaXQgbm9uQ29udGVudEhlaWdodCA9IGlubmVyVGV4dEJv eC0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpICsgaW5uZXJUZXh0Qm94LT5tYXJnaW5IZWlnaHQo KTsKLSAgICAgICAgbG9naWNhbEhlaWdodCA9IGNvbXB1dGVDb250cm9sTG9naWNhbEhlaWdodChp bm5lclRleHRCb3gtPmxpbmVIZWlnaHQodHJ1ZSwgSG9yaXpvbnRhbExpbmUsIFBvc2l0aW9uT2ZJ bnRlcmlvckxpbmVCb3hlcyksIG5vbkNvbnRlbnRIZWlnaHQpICsgYm9yZGVyQW5kUGFkZGluZ0hl aWdodCgpOworICAgICAgICBMYXlvdXRVbml0IG5vbkNvbnRlbnRIZWlnaHQgPSBpbm5lclRleHRC b3gtPnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpICsgaW5uZXJUZXh0Qm94LT52ZXJ0 aWNhbE1hcmdpbkV4dGVudCgpOworICAgICAgICBsb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUNvbnRy b2xMb2dpY2FsSGVpZ2h0KGlubmVyVGV4dEJveC0+bGluZUhlaWdodCh0cnVlLCBIb3Jpem9udGFs TGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKSwgbm9uQ29udGVudEhlaWdodCkgKyB2 ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKIAogICAgICAgICAvLyBXZSBhcmUgYWJs ZSB0byBoYXZlIGEgaG9yaXpvbnRhbCBzY3JvbGxiYXIgaWYgdGhlIG92ZXJmbG93IHN0eWxlIGlz IHNjcm9sbCwgb3IgaWYgaXRzIGF1dG8gYW5kIHRoZXJlJ3Mgbm8gd29yZCB3cmFwLgogICAgICAg ICBpZiAoKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgKHN0eWxlKCkub3ZlcmZsb3dYKCkg PT0gT1NDUk9MTCB8fCAgKHN0eWxlKCkub3ZlcmZsb3dYKCkgPT0gT0FVVE8gJiYgaW5uZXJUZXh0 LT5yZW5kZXJlcigpLT5zdHlsZSgpLm92ZXJmbG93V3JhcCgpID09IE5vcm1hbE92ZXJmbG93V3Jh cCkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENv bnRyb2xTaW5nbGVMaW5lLmNwcAppbmRleCA5OWNlMjg5YTM5MmU0MjAxOThlODc3OWViNjNiNDM0 OGU4OWIyZDA0Li42YWU3M2JhODg3ZmExNjRjZmM1MGMzNmQ5YjU2ODk1NDQyZGRiYjA2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xT aW5nbGVMaW5lLmNwcApAQCAtMTk3LDggKzE5Nyw4IEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xT aW5nbGVMaW5lOjpsYXlvdXQoKQogICAgICAgICBMYXlvdXRTaXplIGlubmVyVGV4dFNpemU7CiAg ICAgICAgIGlmIChpbm5lclRleHRSZW5kZXJlcikKICAgICAgICAgICAgIGlubmVyVGV4dFNpemUg PSBpbm5lclRleHRSZW5kZXJlci0+c2l6ZSgpOwotICAgICAgICBwbGFjZWhvbGRlckJveC0+c3R5 bGUoKS5zZXRXaWR0aChMZW5ndGgoaW5uZXJUZXh0U2l6ZS53aWR0aCgpIC0gcGxhY2Vob2xkZXJC b3gtPmJvcmRlckFuZFBhZGRpbmdXaWR0aCgpLCBGaXhlZCkpOwotICAgICAgICBwbGFjZWhvbGRl ckJveC0+c3R5bGUoKS5zZXRIZWlnaHQoTGVuZ3RoKGlubmVyVGV4dFNpemUuaGVpZ2h0KCkgLSBw bGFjZWhvbGRlckJveC0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdodCgpLCBGaXhlZCkpOworICAgICAg ICBwbGFjZWhvbGRlckJveC0+c3R5bGUoKS5zZXRXaWR0aChMZW5ndGgoaW5uZXJUZXh0U2l6ZS53 aWR0aCgpIC0gcGxhY2Vob2xkZXJCb3gtPmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50 KCksIEZpeGVkKSk7CisgICAgICAgIHBsYWNlaG9sZGVyQm94LT5zdHlsZSgpLnNldEhlaWdodChM ZW5ndGgoaW5uZXJUZXh0U2l6ZS5oZWlnaHQoKSAtIHBsYWNlaG9sZGVyQm94LT52ZXJ0aWNhbEJv cmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgRml4ZWQpKTsKICAgICAgICAgYm9vbCBuZWVkZWRMYXlv dXQgPSBwbGFjZWhvbGRlckJveC0+bmVlZHNMYXlvdXQoKTsKICAgICAgICAgYm9vbCBwbGFjZWhv bGRlckJveEhhZExheW91dCA9IHBsYWNlaG9sZGVyQm94LT5ldmVySGFkTGF5b3V0KCk7CiAgICAg ICAgIHBsYWNlaG9sZGVyQm94LT5sYXlvdXRJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUxheW91dFN0YXRlLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvbGluZS9MaW5lTGF5b3V0U3RhdGUuaAppbmRleCA0Y2Y3Mjk2YWFiODAxZGU0 MmQwYzUzYjJiZTE4NDE3ODM4NGI2NGNmLi41NDhiOThhMTkzMjc5ZmM5YWJiYTZhY2MwZmNlM2U0 ZDE4YzViZmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5l TGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lTGF5 b3V0U3RhdGUuaApAQCAtNDIsNyArNDIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdHJ1Y3Qg RmxvYXRXaXRoUmVjdCB7CiAgICAgRmxvYXRXaXRoUmVjdChSZW5kZXJCb3gmIGYpCiAgICAgICAg IDogb2JqZWN0KGYpCi0gICAgICAgICwgcmVjdChMYXlvdXRSZWN0KGYueCgpIC0gZi5tYXJnaW5M ZWZ0KCksIGYueSgpIC0gZi5tYXJnaW5Ub3AoKSwgZi53aWR0aCgpICsgZi5tYXJnaW5XaWR0aCgp LCBmLmhlaWdodCgpICsgZi5tYXJnaW5IZWlnaHQoKSkpCisgICAgICAgICwgcmVjdChMYXlvdXRS ZWN0KGYueCgpIC0gZi5tYXJnaW5MZWZ0KCksIGYueSgpIC0gZi5tYXJnaW5Ub3AoKSwgZi53aWR0 aCgpICsgZi5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCksIGYuaGVpZ2h0KCkgKyBmLnZlcnRpY2Fs TWFyZ2luRXh0ZW50KCkpKQogICAgICAgICAsIGV2ZXJIYWRMYXlvdXQoZi5ldmVySGFkTGF5b3V0 KCkpCiAgICAgewogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVJbmZvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hh cGVJbmZvLmNwcAppbmRleCAxZWI0MDJkNTU3MmUwZDBiMzEyOTY0ZmNjMTFkMDYyNzg3YWRkNjMx Li45MTE3MGQ2NDVjZjYzYTM2NmQ2YTkzZDI1MmEyZmEwZDZlYWMyZTZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwCkBAIC00OSwyMyArNDksMjMg QEAgdm9pZCBTaGFwZUluZm88UmVuZGVyVHlwZT46OnNldFJlZmVyZW5jZUJveExvZ2ljYWxTaXpl KExheW91dFNpemUgbmV3UmVmZXJlbmNlQm8KICAgICBzd2l0Y2ggKHJlZmVyZW5jZUJveCgpKSB7 CiAgICAgY2FzZSBNYXJnaW5Cb3g6CiAgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9k ZSkKLSAgICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXplLmV4cGFuZChtX3JlbmRl cmVyLm1hcmdpbldpZHRoKCksIG1fcmVuZGVyZXIubWFyZ2luSGVpZ2h0KCkpOworICAgICAgICAg ICAgbmV3UmVmZXJlbmNlQm94TG9naWNhbFNpemUuZXhwYW5kKG1fcmVuZGVyZXIuaG9yaXpvbnRh bE1hcmdpbkV4dGVudCgpLCBtX3JlbmRlcmVyLnZlcnRpY2FsTWFyZ2luRXh0ZW50KCkpOwogICAg ICAgICBlbHNlCi0gICAgICAgICAgICBuZXdSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZS5leHBhbmQo bV9yZW5kZXJlci5tYXJnaW5IZWlnaHQoKSwgbV9yZW5kZXJlci5tYXJnaW5XaWR0aCgpKTsKKyAg ICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXplLmV4cGFuZChtX3JlbmRlcmVyLnZl cnRpY2FsTWFyZ2luRXh0ZW50KCksIG1fcmVuZGVyZXIuaG9yaXpvbnRhbE1hcmdpbkV4dGVudCgp KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBCb3JkZXJCb3g6CiAgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgUGFkZGluZ0JveDoKICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KQotICAgICAgICAgICAgbmV3UmVmZXJlbmNlQm94TG9naWNhbFNpemUuc2hyaW5rKG1fcmVuZGVy ZXIuYm9yZGVyV2lkdGgoKSwgbV9yZW5kZXJlci5ib3JkZXJIZWlnaHQoKSk7CisgICAgICAgICAg ICBuZXdSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZS5zaHJpbmsobV9yZW5kZXJlci5ob3Jpem9udGFs Qm9yZGVyRXh0ZW50KCksIG1fcmVuZGVyZXIudmVydGljYWxCb3JkZXJFeHRlbnQoKSk7CiAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXplLnNocmluayht X3JlbmRlcmVyLmJvcmRlckhlaWdodCgpLCBtX3JlbmRlcmVyLmJvcmRlcldpZHRoKCkpOworICAg ICAgICAgICAgbmV3UmVmZXJlbmNlQm94TG9naWNhbFNpemUuc2hyaW5rKG1fcmVuZGVyZXIudmVy dGljYWxCb3JkZXJFeHRlbnQoKSwgbV9yZW5kZXJlci5ob3Jpem9udGFsQm9yZGVyRXh0ZW50KCkp OwogICAgICAgICBicmVhazsKICAgICBjYXNlIENvbnRlbnRCb3g6CiAgICAgICAgIGlmIChpc0hv cml6b250YWxXcml0aW5nTW9kZSkKLSAgICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxT aXplLnNocmluayhtX3JlbmRlcmVyLmJvcmRlckFuZFBhZGRpbmdXaWR0aCgpLCBtX3JlbmRlcmVy LmJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSk7CisgICAgICAgICAgICBuZXdSZWZlcmVuY2VCb3hM b2dpY2FsU2l6ZS5zaHJpbmsobV9yZW5kZXJlci5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4 dGVudCgpLCBtX3JlbmRlcmVyLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpKTsKICAg ICAgICAgZWxzZQotICAgICAgICAgICAgbmV3UmVmZXJlbmNlQm94TG9naWNhbFNpemUuc2hyaW5r KG1fcmVuZGVyZXIuYm9yZGVyQW5kUGFkZGluZ0hlaWdodCgpLCBtX3JlbmRlcmVyLmJvcmRlckFu ZFBhZGRpbmdXaWR0aCgpKTsKKyAgICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXpl LnNocmluayhtX3JlbmRlcmVyLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBtX3Jl bmRlcmVyLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogICAgICAgICBicmVh azsKICAgICBjYXNlIEZpbGw6CiAgICAgY2FzZSBTdHJva2U6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAppbmRleCA2Y2M4YjlkNDBhODU0MWZlNjEy MWZiNzQwMWE5MmJlN2FjMzFlYmM1Li4zMWIxNzhhZThmOGFjZTg4MWNjZGQzN2EwNDQ0ODIzYzgw MTYxZWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jvb3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9v dC5jcHAKQEAgLTM4OSw3ICszODksNyBAQCB2b2lkIFJlbmRlclNWR1Jvb3Q6OnVwZGF0ZUNhY2hl ZEJvdW5kYXJpZXMoKQogewogICAgIFNWR1JlbmRlclN1cHBvcnQ6OmNvbXB1dGVDb250YWluZXJC b3VuZGluZ0JveGVzKCp0aGlzLCBtX29iamVjdEJvdW5kaW5nQm94LCBtX29iamVjdEJvdW5kaW5n Qm94VmFsaWQsIG1fc3Ryb2tlQm91bmRpbmdCb3gsIG1fcmVwYWludEJvdW5kaW5nQm94RXhjbHVk aW5nU2hhZG93KTsKICAgICBTVkdSZW5kZXJTdXBwb3J0OjppbnRlcnNlY3RSZXBhaW50UmVjdFdp dGhSZXNvdXJjZXMoKnRoaXMsIG1fcmVwYWludEJvdW5kaW5nQm94RXhjbHVkaW5nU2hhZG93KTsK LSAgICBtX3JlcGFpbnRCb3VuZGluZ0JveEV4Y2x1ZGluZ1NoYWRvdy5pbmZsYXRlKGJvcmRlckFu ZFBhZGRpbmdXaWR0aCgpKTsKKyAgICBtX3JlcGFpbnRCb3VuZGluZ0JveEV4Y2x1ZGluZ1NoYWRv dy5pbmZsYXRlKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogCiAgICAgbV9y ZXBhaW50Qm91bmRpbmdCb3ggPSBtX3JlcGFpbnRCb3VuZGluZ0JveEV4Y2x1ZGluZ1NoYWRvdzsK ICAgICBTVkdSZW5kZXJTdXBwb3J0OjppbnRlcnNlY3RSZXBhaW50UmVjdFdpdGhTaGFkb3dzKCp0 aGlzLCBtX3JlcGFpbnRCb3VuZGluZ0JveCk7Cg==