122576 2013-10-09 15:04:53 -0700 [CSS Shapes] Stacked floats with shape-outside should allow inline content to interact with the non-outermost float 2014-01-17 13:07:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior P2 Normal --- 98664 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 938091 0 bjonesbe 2013-10-09 15:04:53 -0700 See example 5 in http://dev.w3.org/csswg/css-shapes-1/#relation-to-box-model-and-float-behavior Right now, the content will only intrude into the outermost float, it should be able to pass through it to a previous float if there is no shape in the way. 969204 1 221482 bjonesbe 2014-01-17 12:21:32 -0800 Created attachment 221482 Patch 969208 2 221482 hyatt 2014-01-17 12:27:38 -0800 Comment on attachment 221482 Patch r=me 969230 3 221482 commit-queue 2014-01-17 13:07:35 -0800 Comment on attachment 221482 Patch Clearing flags on attachment: 221482 Committed r162217: <http://trac.webkit.org/changeset/162217> 969231 4 commit-queue 2014-01-17 13:07:37 -0800 All reviewed patches have been landed. Closing bug. 221482 2014-01-17 12:21:32 -0800 2014-01-17 13:07:35 -0800 Patch bug-122576-20140117122130.patch text/plain 29250 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTE5NjlhYTcyMWQwNTBm OWUzMTY5MDkyMDkwYjdkNTQ5NWZkNTk5Yy4uYTYwODhiNWI5NmYzNjIyOGVmNjA1MTkwOTI3NjZm NTE1YjFjYThmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE0LTAxLTE3ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBT dGFja2VkIGZsb2F0cyB3aXRoIHNoYXBlLW91dHNpZGUgc2hvdWxkIGFsbG93IGlubGluZSBjb250 ZW50IHRvIGludGVyYWN0IHdpdGggdGhlIG5vbi1vdXRlcm1vc3QgZmxvYXQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjU3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaW5saW5lIGNvbnRlbnQg aW50ZXJhY3Qgd2l0aCBzdGFja2VkIGZsb2F0cyB3aXRoIHNoYXBlLW91dHNpZGUKKyAgICAgICAg cGVyIHRoZSBzcGVjLiBUaGlzIG1lYW5zIHRoYXQgY29udGVudCBjYW4gaW50ZXJhY3Qgd2l0aCBm bG9hdHMgb24gdGhlCisgICAgICAgIGxpbmUgdGhhdCBhcmUgbm90IHRoZSBvdXRlcm1vc3QgZmxv YXQuCisKKyAgICAgICAgVGhpcyByZWZhY3RvcnMgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlciBp bnRvIGEgc3VwZXJjbGFzcyBhbmQgdHdvCisgICAgICAgIHN1YmNsYXNzZXM6IG9uZSBhZGFwdG9y IGZvciBkZXRlcm1pbmluZyB0aGUgb2Zmc2V0IGZvciBmbG9hdCBsYXlvdXQsCisgICAgICAgIGFu ZCBvbmUgZm9yIGRldGVybWluaW5nIHRoZSBvZmZzZXQgZm9yIGlubGluZSBsYXlvdXQuCisKKyAg ICAgICAgVGhlIGxvZ2ljIGluIExpbmVXaWR0aDo6c2hyaW5rQXZhaWxhYmxlV2lkdGhGb3JOZXdG bG9hdElmTmVlZGVkIGhhcworICAgICAgICBiZWVuIHVwZGF0ZWQgdG8gaGFuZGxlIHN0YWNrZWQg ZmxvYXRzIHdpdGggc2hhcGUtb3V0c2lkZSBwcm9wZXJseSBhbmQKKyAgICAgICAgaGFzIGJlZW4g Y29uc2lkZXJhYmx5IHNpbXBsaWZpZWQgaW4gdGhlIHByb2Nlc3MuIEl0IHdhcyBwcmV2aW91c2x5 CisgICAgICAgIGRvaW5nIGEgd2hvbGUgYnVuY2ggb2YgdW5uZWNlc3Nhcnkgd29yay4KKworICAg ICAgICBUZXN0czogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMtc3RhY2tlZC0wMDAuaHRtbAorICAgICAgICAgICAgICAgZmFzdC9zaGFwZXMvc2hh cGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDEuaHRtbAor ICAgICAgICAgICAgICAgZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDIuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL0Zsb2F0 aW5nT2JqZWN0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlRmxvYXRPZmZzZXRBZGFw dGVyOjp+Q29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcik6CisgICAgICAgIChXZWJDb3JlOjpDb21w dXRlRmxvYXRPZmZzZXRGb3JGbG9hdExheW91dEFkYXB0ZXI6OkNvbXB1dGVGbG9hdE9mZnNldEZv ckZsb2F0TGF5b3V0QWRhcHRlcik6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlRmxvYXRPZmZz ZXRGb3JGbG9hdExheW91dEFkYXB0ZXI6On5Db21wdXRlRmxvYXRPZmZzZXRGb3JGbG9hdExheW91 dEFkYXB0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZUZsb2F0T2Zmc2V0Rm9yTGluZUxh eW91dEFkYXB0ZXI6OkNvbXB1dGVGbG9hdE9mZnNldEZvckxpbmVMYXlvdXRBZGFwdGVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbXB1dGVGbG9hdE9mZnNldEZvckxpbmVMYXlvdXRBZGFwdGVyOjp+ Q29tcHV0ZUZsb2F0T2Zmc2V0Rm9yTGluZUxheW91dEFkYXB0ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6RmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsTGVmdE9mZnNldEZvclBvc2l0aW9uaW5nRmxvYXQp OgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsUmlnaHRPZmZzZXRG b3JQb3NpdGlvbmluZ0Zsb2F0KToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0aW5nT2JqZWN0czo6 bG9naWNhbExlZnRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRpbmdPYmplY3RzOjps b2dpY2FsUmlnaHRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZUZsb2F0T2Zmc2V0 Rm9yRmxvYXRMYXlvdXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+Ojp1cGRhdGVP ZmZzZXRJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlRmxvYXRPZmZzZXRGb3JG bG9hdExheW91dEFkYXB0ZXI8RmxvYXRpbmdPYmplY3Q6OkZsb2F0UmlnaHQ+Ojp1cGRhdGVPZmZz ZXRJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlRmxvYXRPZmZzZXRGb3JGbG9h dExheW91dEFkYXB0ZXI8RmxvYXRUeXBlVmFsdWU+OjpoZWlnaHRSZW1haW5pbmcpOgorICAgICAg ICAoV2ViQ29yZTo6c2hhcGVJbmZvRm9yRmxvYXQpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0 ZUZsb2F0T2Zmc2V0Rm9yTGluZUxheW91dEFkYXB0ZXI8RmxvYXRpbmdPYmplY3Q6OkZsb2F0TGVm dD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVGbG9h dE9mZnNldEZvckxpbmVMYXlvdXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdFJpZ2h0Pjo6 dXBkYXRlT2Zmc2V0SWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9saW5lL0xpbmVXaWR0 aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJsZVdpZHRo Rm9yTmV3RmxvYXRJZk5lZWRlZCk6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91 dHNpZGVJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYXBlT3V0c2lkZUluZm86OnVwZGF0 ZURlbHRhc0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9zaGFw ZXMvU2hhcGVPdXRzaWRlSW5mby5oOgorCiAyMDE0LTAxLTE3ICBBbGJlcnRvIEdhcmNpYSAgPGJl cnRvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gV2ViS2l0R3RrL3Rlc3Rjb3B5YW5kcGFz dGUgZmFpbHMgaW4gZGVidWcgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9h dGluZ09iamVjdHMuY3BwCmluZGV4IDliZjQ3Y2E3ZjNiNTQ0OGY3OTMwMDc1MzZjODFkNDNjYThh NDFkNzcuLjExMjY5MzUzNDg3MzA5OWY4ODA0Y2Y3NmYwMTcwYjA1Y2MwNjk5MjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwCkBAIC0xMzMsMTYgKzEz MywxNiBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAorICAgIHZpcnR1YWwgfkNvbXB1dGVGbG9h dE9mZnNldEFkYXB0ZXIoKSB7IH0KKwogICAgIExheW91dFVuaXQgbG93VmFsdWUoKSBjb25zdCB7 IHJldHVybiBtX2xpbmVUb3A7IH0KICAgICBMYXlvdXRVbml0IGhpZ2hWYWx1ZSgpIGNvbnN0IHsg cmV0dXJuIG1fbGluZUJvdHRvbTsgfQogICAgIHZvaWQgY29sbGVjdElmTmVlZGVkKGNvbnN0IElu dGVydmFsVHlwZSYpOwogCiAgICAgTGF5b3V0VW5pdCBvZmZzZXQoKSBjb25zdCB7IHJldHVybiBt X29mZnNldDsgfQotICAgIExheW91dFVuaXQgc2hhcGVPZmZzZXQoKSBjb25zdDsKLSAgICBMYXlv dXRVbml0IGhlaWdodFJlbWFpbmluZygpIGNvbnN0OwogCi1wcml2YXRlOgotICAgIGJvb2wgdXBk YXRlT2Zmc2V0SWZOZWVkZWQoY29uc3QgRmxvYXRpbmdPYmplY3QqKTsKK3Byb3RlY3RlZDoKKyAg ICB2aXJ0dWFsIGJvb2wgdXBkYXRlT2Zmc2V0SWZOZWVkZWQoY29uc3QgRmxvYXRpbmdPYmplY3Qq KSA9IDA7CiAKICAgICBjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIG1fcmVuZGVyZXI7CiAgICAgTGF5 b3V0VW5pdCBtX2xpbmVUb3A7CkBAIC0xNTEsNiArMTUxLDM2IEBAIHByaXZhdGU6CiAgICAgY29u c3QgRmxvYXRpbmdPYmplY3QqIG1fb3V0ZXJtb3N0RmxvYXQ7CiB9OwogCit0ZW1wbGF0ZSA8Rmxv YXRpbmdPYmplY3Q6OlR5cGUgRmxvYXRUeXBlVmFsdWU+CitjbGFzcyBDb21wdXRlRmxvYXRPZmZz ZXRGb3JGbG9hdExheW91dEFkYXB0ZXIgOiBwdWJsaWMgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRl cjxGbG9hdFR5cGVWYWx1ZT4geyAKK3B1YmxpYzoKKyAgICBDb21wdXRlRmxvYXRPZmZzZXRGb3JG bG9hdExheW91dEFkYXB0ZXIoY29uc3QgUmVuZGVyQmxvY2tGbG93JiByZW5kZXJlciwgTGF5b3V0 VW5pdCBsaW5lVG9wLCBMYXlvdXRVbml0IGxpbmVCb3R0b20sIExheW91dFVuaXQgb2Zmc2V0KQor ICAgICAgICA6IENvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI8RmxvYXRUeXBlVmFsdWU+KHJlbmRl cmVyLCBsaW5lVG9wLCBsaW5lQm90dG9tLCBvZmZzZXQpCisgICAgeworICAgIH0KKworICAgIHZp cnR1YWwgfkNvbXB1dGVGbG9hdE9mZnNldEZvckZsb2F0TGF5b3V0QWRhcHRlcigpIHsgfQorCisg ICAgTGF5b3V0VW5pdCBoZWlnaHRSZW1haW5pbmcoKSBjb25zdDsKKworcHJvdGVjdGVkOgorICAg IHZpcnR1YWwgYm9vbCB1cGRhdGVPZmZzZXRJZk5lZWRlZChjb25zdCBGbG9hdGluZ09iamVjdCop IG92ZXJyaWRlIGZpbmFsOworfTsKKwordGVtcGxhdGUgPEZsb2F0aW5nT2JqZWN0OjpUeXBlIEZs b2F0VHlwZVZhbHVlPgorY2xhc3MgQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yTGluZUxheW91dEFkYXB0 ZXIgOiBwdWJsaWMgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9hdFR5cGVWYWx1ZT4gewor cHVibGljOgorICAgIENvbXB1dGVGbG9hdE9mZnNldEZvckxpbmVMYXlvdXRBZGFwdGVyKGNvbnN0 IFJlbmRlckJsb2NrRmxvdyYgcmVuZGVyZXIsIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5p dCBsaW5lQm90dG9tLCBMYXlvdXRVbml0IG9mZnNldCkKKyAgICAgICAgOiBDb21wdXRlRmxvYXRP ZmZzZXRBZGFwdGVyPEZsb2F0VHlwZVZhbHVlPihyZW5kZXJlciwgbGluZVRvcCwgbGluZUJvdHRv bSwgb2Zmc2V0KQorICAgIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIH5Db21wdXRlRmxvYXRPZmZz ZXRGb3JMaW5lTGF5b3V0QWRhcHRlcigpIHsgfQorCitwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCBi b29sIHVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZsb2F0aW5nT2JqZWN0Kikgb3ZlcnJpZGUg ZmluYWw7Cit9OworCiBjbGFzcyBGaW5kTmV4dEZsb2F0TG9naWNhbEJvdHRvbUFkYXB0ZXIgewog cHVibGljOgogICAgIHR5cGVkZWYgRmxvYXRpbmdPYmplY3RJbnRlcnZhbCBJbnRlcnZhbFR5cGU7 CkBAIC0zNTcsNDUgKzM4Nyw5IEBAIGlubGluZSBjb25zdCBGbG9hdGluZ09iamVjdFRyZWUmIEZs b2F0aW5nT2JqZWN0czo6cGxhY2VkRmxvYXRzVHJlZSgpCiAgICAgcmV0dXJuIG1fcGxhY2VkRmxv YXRzVHJlZTsKIH0KIAotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotc3RhdGljIGlubGluZSBTaGFw ZU91dHNpZGVJbmZvKiBzaGFwZUluZm9Gb3JGbG9hdChjb25zdCBGbG9hdGluZ09iamVjdCogZmxv YXRpbmdPYmplY3QsIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgY29udGFpbmluZ0Jsb2NrLCBMYXlv dXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRvbSkKLXsKLSAgICBpZiAoZmxvYXRp bmdPYmplY3QpIHsKLSAgICAgICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9 IGZsb2F0aW5nT2JqZWN0LT5yZW5kZXJlcigpLnNoYXBlT3V0c2lkZUluZm8oKSkgewotICAgICAg ICAgICAgc2hhcGVPdXRzaWRlLT51cGRhdGVEZWx0YXNGb3JDb250YWluaW5nQmxvY2tMaW5lKGNv bnRhaW5pbmdCbG9jaywgKmZsb2F0aW5nT2JqZWN0LCBsaW5lVG9wLCBsaW5lQm90dG9tIC0gbGlu ZVRvcCk7Ci0gICAgICAgICAgICByZXR1cm4gc2hhcGVPdXRzaWRlOwotICAgICAgICB9Ci0gICAg fQotCi0gICAgcmV0dXJuIG51bGxwdHI7Ci19Ci0jZW5kaWYKLQotdGVtcGxhdGU8PgotaW5saW5l IExheW91dFVuaXQgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6Rmxv YXRMZWZ0Pjo6c2hhcGVPZmZzZXQoKSBjb25zdAotewotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQot ICAgIGlmIChTaGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGUgPSBzaGFwZUluZm9Gb3JGbG9h dChtX291dGVybW9zdEZsb2F0LCBtX3JlbmRlcmVyLCBtX2xpbmVUb3AsIG1fbGluZUJvdHRvbSkp Ci0gICAgICAgIHJldHVybiBtX29mZnNldCArIHNoYXBlT3V0c2lkZS0+cmlnaHRNYXJnaW5Cb3hE ZWx0YSgpOwotI2VuZGlmCi0KLSAgICByZXR1cm4gbV9vZmZzZXQ7Ci19Ci0KLXRlbXBsYXRlPD4K LWlubGluZSBMYXlvdXRVbml0IENvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI8RmxvYXRpbmdPYmpl Y3Q6OkZsb2F0UmlnaHQ+OjpzaGFwZU9mZnNldCgpIGNvbnN0Ci17Ci0jaWYgRU5BQkxFKENTU19T SEFQRVMpCi0gICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IHNoYXBlSW5m b0ZvckZsb2F0KG1fb3V0ZXJtb3N0RmxvYXQsIG1fcmVuZGVyZXIsIG1fbGluZVRvcCwgbV9saW5l Qm90dG9tKSkKLSAgICAgICAgcmV0dXJuIG1fb2Zmc2V0ICsgc2hhcGVPdXRzaWRlLT5sZWZ0TWFy Z2luQm94RGVsdGEoKTsKLSNlbmRpZgotCi0gICAgcmV0dXJuIG1fb2Zmc2V0OwotfQotCiBMYXlv dXRVbml0IEZsb2F0aW5nT2JqZWN0czo6bG9naWNhbExlZnRPZmZzZXRGb3JQb3NpdGlvbmluZ0Zs b2F0KExheW91dFVuaXQgZml4ZWRPZmZzZXQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0 VW5pdCAqaGVpZ2h0UmVtYWluaW5nKQogewotICAgIENvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI8 RmxvYXRpbmdPYmplY3Q6OkZsb2F0TGVmdD4gYWRhcHRlcihtX3JlbmRlcmVyLCBsb2dpY2FsVG9w LCBsb2dpY2FsVG9wLCBmaXhlZE9mZnNldCk7CisgICAgQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yRmxv YXRMYXlvdXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+IGFkYXB0ZXIobV9yZW5k ZXJlciwgbG9naWNhbFRvcCwgbG9naWNhbFRvcCwgZml4ZWRPZmZzZXQpOwogICAgIHBsYWNlZEZs b2F0c1RyZWUoKS5hbGxPdmVybGFwc1dpdGhBZGFwdGVyKGFkYXB0ZXIpOwogCiAgICAgaWYgKGhl aWdodFJlbWFpbmluZykKQEAgLTQwNiw3ICs0MDAsNyBAQCBMYXlvdXRVbml0IEZsb2F0aW5nT2Jq ZWN0czo6bG9naWNhbExlZnRPZmZzZXRGb3JQb3NpdGlvbmluZ0Zsb2F0KExheW91dFVuaXQgZml4 ZQogCiBMYXlvdXRVbml0IEZsb2F0aW5nT2JqZWN0czo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yUG9z aXRpb25pbmdGbG9hdChMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBMYXlvdXRVbml0IGxvZ2ljYWxU b3AsIExheW91dFVuaXQgKmhlaWdodFJlbWFpbmluZykKIHsKLSAgICBDb21wdXRlRmxvYXRPZmZz ZXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdFJpZ2h0PiBhZGFwdGVyKG1fcmVuZGVyZXIs IGxvZ2ljYWxUb3AsIGxvZ2ljYWxUb3AsIGZpeGVkT2Zmc2V0KTsKKyAgICBDb21wdXRlRmxvYXRP ZmZzZXRGb3JGbG9hdExheW91dEFkYXB0ZXI8RmxvYXRpbmdPYmplY3Q6OkZsb2F0UmlnaHQ+IGFk YXB0ZXIobV9yZW5kZXJlciwgbG9naWNhbFRvcCwgbG9naWNhbFRvcCwgZml4ZWRPZmZzZXQpOwog ICAgIHBsYWNlZEZsb2F0c1RyZWUoKS5hbGxPdmVybGFwc1dpdGhBZGFwdGVyKGFkYXB0ZXIpOwog CiAgICAgaWYgKGhlaWdodFJlbWFpbmluZykKQEAgLTQxNywyMiArNDExLDIyIEBAIExheW91dFVu aXQgRmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsUmlnaHRPZmZzZXRGb3JQb3NpdGlvbmluZ0Zsb2F0 KExheW91dFVuaXQgZml4CiAKIExheW91dFVuaXQgRmxvYXRpbmdPYmplY3RzOjpsb2dpY2FsTGVm dE9mZnNldChMYXlvdXRVbml0IGZpeGVkT2Zmc2V0LCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExh eW91dFVuaXQgbG9naWNhbEhlaWdodCkKIHsKLSAgICBDb21wdXRlRmxvYXRPZmZzZXRBZGFwdGVy PEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+IGFkYXB0ZXIobV9yZW5kZXJlciwgbG9naWNhbFRv cCwgbG9naWNhbFRvcCArIGxvZ2ljYWxIZWlnaHQsIGZpeGVkT2Zmc2V0KTsKKyAgICBDb21wdXRl RmxvYXRPZmZzZXRGb3JMaW5lTGF5b3V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0 PiBhZGFwdGVyKG1fcmVuZGVyZXIsIGxvZ2ljYWxUb3AsIGxvZ2ljYWxUb3AgKyBsb2dpY2FsSGVp Z2h0LCBmaXhlZE9mZnNldCk7CiAgICAgcGxhY2VkRmxvYXRzVHJlZSgpLmFsbE92ZXJsYXBzV2l0 aEFkYXB0ZXIoYWRhcHRlcik7CiAKLSAgICByZXR1cm4gYWRhcHRlci5zaGFwZU9mZnNldCgpOwor ICAgIHJldHVybiBhZGFwdGVyLm9mZnNldCgpOwogfQogCiBMYXlvdXRVbml0IEZsb2F0aW5nT2Jq ZWN0czo6bG9naWNhbFJpZ2h0T2Zmc2V0KExheW91dFVuaXQgZml4ZWRPZmZzZXQsIExheW91dFVu aXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KQogewotICAgIENvbXB1dGVG bG9hdE9mZnNldEFkYXB0ZXI8RmxvYXRpbmdPYmplY3Q6OkZsb2F0UmlnaHQ+IGFkYXB0ZXIobV9y ZW5kZXJlciwgbG9naWNhbFRvcCwgbG9naWNhbFRvcCArIGxvZ2ljYWxIZWlnaHQsIGZpeGVkT2Zm c2V0KTsKKyAgICBDb21wdXRlRmxvYXRPZmZzZXRGb3JMaW5lTGF5b3V0QWRhcHRlcjxGbG9hdGlu Z09iamVjdDo6RmxvYXRSaWdodD4gYWRhcHRlcihtX3JlbmRlcmVyLCBsb2dpY2FsVG9wLCBsb2dp Y2FsVG9wICsgbG9naWNhbEhlaWdodCwgZml4ZWRPZmZzZXQpOwogICAgIHBsYWNlZEZsb2F0c1Ry ZWUoKS5hbGxPdmVybGFwc1dpdGhBZGFwdGVyKGFkYXB0ZXIpOwogCi0gICAgcmV0dXJuIHN0ZDo6 bWluKGZpeGVkT2Zmc2V0LCBhZGFwdGVyLnNoYXBlT2Zmc2V0KCkpOworICAgIHJldHVybiBzdGQ6 Om1pbihmaXhlZE9mZnNldCwgYWRhcHRlci5vZmZzZXQoKSk7CiB9CiAKIHRlbXBsYXRlPD4KLWlu bGluZSBib29sIENvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI8RmxvYXRpbmdPYmplY3Q6OkZsb2F0 TGVmdD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGlu Z09iamVjdCkKK2lubGluZSBib29sIENvbXB1dGVGbG9hdE9mZnNldEZvckZsb2F0TGF5b3V0QWRh cHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0Pjo6dXBkYXRlT2Zmc2V0SWZOZWVkZWQoY29u c3QgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0KQogewogICAgIExheW91dFVuaXQgbG9n aWNhbFJpZ2h0ID0gbV9yZW5kZXJlci5sb2dpY2FsUmlnaHRGb3JGbG9hdChmbG9hdGluZ09iamVj dCk7CiAgICAgaWYgKGxvZ2ljYWxSaWdodCA+IG1fb2Zmc2V0KSB7CkBAIC00NDMsNyArNDM3LDcg QEAgaW5saW5lIGJvb2wgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6 RmxvYXRMZWZ0Pjo6dXBkYXRlT2Zmc2V0SWYKIH0KIAogdGVtcGxhdGU8PgotaW5saW5lIGJvb2wg Q29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRSaWdodD46OnVw ZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCkK K2lubGluZSBib29sIENvbXB1dGVGbG9hdE9mZnNldEZvckZsb2F0TGF5b3V0QWRhcHRlcjxGbG9h dGluZ09iamVjdDo6RmxvYXRSaWdodD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZsb2F0 aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCkKIHsKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0 ID0gbV9yZW5kZXJlci5sb2dpY2FsTGVmdEZvckZsb2F0KGZsb2F0aW5nT2JqZWN0KTsKICAgICBp ZiAobG9naWNhbExlZnQgPCBtX29mZnNldCkgewpAQCAtNDU0LDYgKzQ0OCwxMiBAQCBpbmxpbmUg Ym9vbCBDb21wdXRlRmxvYXRPZmZzZXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdFJpZ2h0 Pjo6dXBkYXRlT2Zmc2V0SQogfQogCiB0ZW1wbGF0ZSA8RmxvYXRpbmdPYmplY3Q6OlR5cGUgRmxv YXRUeXBlVmFsdWU+CitMYXlvdXRVbml0IENvbXB1dGVGbG9hdE9mZnNldEZvckZsb2F0TGF5b3V0 QWRhcHRlcjxGbG9hdFR5cGVWYWx1ZT46OmhlaWdodFJlbWFpbmluZygpIGNvbnN0Cit7CisgICAg cmV0dXJuIHRoaXMtPm1fb3V0ZXJtb3N0RmxvYXQgPyB0aGlzLT5tX3JlbmRlcmVyLmxvZ2ljYWxC b3R0b21Gb3JGbG9hdCh0aGlzLT5tX291dGVybW9zdEZsb2F0KSAtIHRoaXMtPm1fbGluZVRvcCA6 IExheW91dFVuaXQoMSk7Cit9CisKK3RlbXBsYXRlIDxGbG9hdGluZ09iamVjdDo6VHlwZSBGbG9h dFR5cGVWYWx1ZT4KIGlubGluZSB2b2lkIENvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI8RmxvYXRU eXBlVmFsdWU+Ojpjb2xsZWN0SWZOZWVkZWQoY29uc3QgSW50ZXJ2YWxUeXBlJiBpbnRlcnZhbCkK IHsKICAgICBjb25zdCBGbG9hdGluZ09iamVjdCogZmxvYXRpbmdPYmplY3QgPSBpbnRlcnZhbC5k YXRhKCk7CkBAIC00NjksMTAgKzQ2OSw1OCBAQCBpbmxpbmUgdm9pZCBDb21wdXRlRmxvYXRPZmZz ZXRBZGFwdGVyPEZsb2F0VHlwZVZhbHVlPjo6Y29sbGVjdElmTmVlZGVkKGNvbnN0IEludAogICAg ICAgICBtX291dGVybW9zdEZsb2F0ID0gZmxvYXRpbmdPYmplY3Q7CiB9CiAKLXRlbXBsYXRlIDxG bG9hdGluZ09iamVjdDo6VHlwZSBGbG9hdFR5cGVWYWx1ZT4KLUxheW91dFVuaXQgQ29tcHV0ZUZs b2F0T2Zmc2V0QWRhcHRlcjxGbG9hdFR5cGVWYWx1ZT46OmhlaWdodFJlbWFpbmluZygpIGNvbnN0 CisjaWYgRU5BQkxFKENTU19TSEFQRVMpCitzdGF0aWMgaW5saW5lIFNoYXBlT3V0c2lkZUluZm8q IHNoYXBlSW5mb0ZvckZsb2F0KGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCwg Y29uc3QgUmVuZGVyQmxvY2tGbG93JiBjb250YWluaW5nQmxvY2ssIExheW91dFVuaXQgbGluZVRv cCwgTGF5b3V0VW5pdCBsaW5lQm90dG9tKQoreworICAgIGlmIChmbG9hdGluZ09iamVjdCkgewor ICAgICAgICBpZiAoU2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlID0gZmxvYXRpbmdPYmpl Y3QtPnJlbmRlcmVyKCkuc2hhcGVPdXRzaWRlSW5mbygpKSB7CisgICAgICAgICAgICBzaGFwZU91 dHNpZGUtPnVwZGF0ZURlbHRhc0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUoY29udGFpbmluZ0Jsb2Nr LCAqZmxvYXRpbmdPYmplY3QsIGxpbmVUb3AsIGxpbmVCb3R0b20gLSBsaW5lVG9wKTsKKyAgICAg ICAgICAgIHJldHVybiBzaGFwZU91dHNpZGU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1 cm4gbnVsbHB0cjsKK30KKyNlbmRpZgorCit0ZW1wbGF0ZTw+CitpbmxpbmUgYm9vbCBDb21wdXRl RmxvYXRPZmZzZXRGb3JMaW5lTGF5b3V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0 Pjo6dXBkYXRlT2Zmc2V0SWZOZWVkZWQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2Jq ZWN0KQoreworICAgIExheW91dFVuaXQgbG9naWNhbFJpZ2h0ID0gbV9yZW5kZXJlci5sb2dpY2Fs UmlnaHRGb3JGbG9hdChmbG9hdGluZ09iamVjdCk7CisjaWYgRU5BQkxFKENTU19TSEFQRVMpCisg ICAgaWYgKFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZSA9IHNoYXBlSW5mb0ZvckZsb2F0 KGZsb2F0aW5nT2JqZWN0LCBtX3JlbmRlcmVyLCBtX2xpbmVUb3AsIG1fbGluZUJvdHRvbSkpIHsK KyAgICAgICAgaWYgKCFzaGFwZU91dHNpZGUtPmxpbmVPdmVybGFwc1NoYXBlKCkpCisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgbG9naWNhbFJpZ2h0ICs9IHNoYXBlT3V0c2lk ZS0+cmlnaHRNYXJnaW5Cb3hEZWx0YSgpOworICAgIH0KKyNlbmRpZgorICAgIGlmIChsb2dpY2Fs UmlnaHQgPiBtX29mZnNldCkgeworICAgICAgICBtX29mZnNldCA9IGxvZ2ljYWxSaWdodDsKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQorCit0ZW1w bGF0ZTw+CitpbmxpbmUgYm9vbCBDb21wdXRlRmxvYXRPZmZzZXRGb3JMaW5lTGF5b3V0QWRhcHRl cjxGbG9hdGluZ09iamVjdDo6RmxvYXRSaWdodD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0 IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCkKIHsKLSAgICByZXR1cm4gbV9vdXRlcm1v c3RGbG9hdCA/IG1fcmVuZGVyZXIubG9naWNhbEJvdHRvbUZvckZsb2F0KG1fb3V0ZXJtb3N0Rmxv YXQpIC0gbV9saW5lVG9wIDogTGF5b3V0VW5pdCgxKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0ID0gbV9yZW5kZXJlci5sb2dpY2FsTGVmdEZvckZsb2F0KGZsb2F0aW5nT2JqZWN0KTsKKyNp ZiBFTkFCTEUoQ1NTX1NIQVBFUykKKyAgICBpZiAoU2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRz aWRlID0gc2hhcGVJbmZvRm9yRmxvYXQoZmxvYXRpbmdPYmplY3QsIG1fcmVuZGVyZXIsIG1fbGlu ZVRvcCwgbV9saW5lQm90dG9tKSkgeworICAgICAgICBpZiAoIXNoYXBlT3V0c2lkZS0+bGluZU92 ZXJsYXBzU2hhcGUoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBsb2dp Y2FsTGVmdCArPSBzaGFwZU91dHNpZGUtPmxlZnRNYXJnaW5Cb3hEZWx0YSgpOworICAgIH0KKyNl bmRpZgorICAgIGlmIChsb2dpY2FsTGVmdCA8IG1fb2Zmc2V0KSB7CisgICAgICAgIG1fb2Zmc2V0 ID0gbG9naWNhbExlZnQ7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIHJldHVy biBmYWxzZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZVdpZHRoLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9saW5lL0xpbmVXaWR0aC5jcHAKaW5kZXggN2QxYTA3MmFmNzE1ZDQ3NzZhMzdmODM0 YzI2YWVlN2U0NDFmMGQ3Ny4uN2ZmYTIwNzE1N2U2OGMwMGE2OWNjMzc1MWI0MDYzN2M5OWJjNTY4 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZVdpZHRoLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lV2lkdGguY3BwCkBAIC0x MDAsNTQgKzEwMCwzOCBAQCB2b2lkIExpbmVXaWR0aDo6c2hyaW5rQXZhaWxhYmxlV2lkdGhGb3JO ZXdGbG9hdElmTmVlZGVkKEZsb2F0aW5nT2JqZWN0KiBuZXdGbG9hdAogICAgICAgICByZXR1cm47 CiAKICNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICAvLyBXaGVuIGZsb2F0cyB3aXRoIHNoYXBl IG91dHNpZGUgYXJlIHN0YWNrZWQsIHRoZSBmbG9hdHMgYXJlIHBvc2l0aW9uZWQgYmFzZWQgb24g dGhlIG1hcmdpbiBib3ggb2YgdGhlIGZsb2F0LAotICAgIC8vIG5vdCB0aGUgc2hhcGUncyBjb250 b3VyLiBTaW5jZSB3ZSBjb21wdXRlZCB0aGUgd2lkdGggYmFzZWQgb24gdGhlIHNoYXBlIGNvbnRv dXIgd2hlbiB3ZSBhZGRlZCB0aGUgZmxvYXQsCi0gICAgLy8gd2hlbiB3ZSBhZGQgYSBzdWJzZXF1 ZW50IGZsb2F0IG9uIHRoZSBzYW1lIGxpbmUsIHdlIG5lZWQgdG8gdW5kbyB0aGUgc2hhcGUgZGVs dGEgaW4gb3JkZXIgdG8gcG9zaXRpb24KLSAgICAvLyBiYXNlZCBvbiB0aGUgbWFyZ2luIGJveC4g SW4gb3JkZXIgdG8gZG8gdGhpcywgd2UgbmVlZCB0byB3YWxrIGJhY2sgdGhyb3VnaCB0aGUgZmxv YXRpbmcgb2JqZWN0IGxpc3QgdG8gZmluZAotICAgIC8vIHRoZSBmaXJzdCBwcmV2aW91cyBmbG9h dCB0aGF0IGlzIG9uIHRoZSBzYW1lIHNpZGUgYXMgb3VyIG5ld0Zsb2F0LgotICAgIFNoYXBlT3V0 c2lkZUluZm8qIHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mbyA9IG51bGxwdHI7Ci0gICAgY29uc3Qg RmxvYXRpbmdPYmplY3RTZXQmIGZsb2F0aW5nT2JqZWN0U2V0ID0gbV9ibG9jay5tX2Zsb2F0aW5n T2JqZWN0cy0+c2V0KCk7Ci0gICAgYXV0byBpdCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwot ICAgIGF1dG8gYmVnaW4gPSBmbG9hdGluZ09iamVjdFNldC5iZWdpbigpOwotICAgIExheW91dFVu aXQgbGluZUhlaWdodCA9IG1fYmxvY2subGluZUhlaWdodChtX2lzRmlyc3RMaW5lLCBtX2Jsb2Nr LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGlu ZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKTsKLSAgICBmb3IgKC0taXQ7IGl0ICE9IGJl Z2luOyAtLWl0KSB7Ci0gICAgICAgIEZsb2F0aW5nT2JqZWN0KiBwcmV2aW91c0Zsb2F0ID0gaXQt PmdldCgpOwotICAgICAgICBpZiAocHJldmlvdXNGbG9hdCAhPSBuZXdGbG9hdCAmJiBwcmV2aW91 c0Zsb2F0LT50eXBlKCkgPT0gbmV3RmxvYXQtPnR5cGUoKSkgewotICAgICAgICAgICAgcHJldmlv dXNTaGFwZU91dHNpZGVJbmZvID0gcHJldmlvdXNGbG9hdC0+cmVuZGVyZXIoKS5zaGFwZU91dHNp ZGVJbmZvKCk7Ci0gICAgICAgICAgICBpZiAocHJldmlvdXNTaGFwZU91dHNpZGVJbmZvKQotICAg ICAgICAgICAgICAgIHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mby0+dXBkYXRlRGVsdGFzRm9yQ29u dGFpbmluZ0Jsb2NrTGluZShtX2Jsb2NrLCAqcHJldmlvdXNGbG9hdCwgbV9ibG9jay5sb2dpY2Fs SGVpZ2h0KCksIGxpbmVIZWlnaHQpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAg ICB9Ci0KICAgICBTaGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGVJbmZvID0gbmV3RmxvYXQt PnJlbmRlcmVyKCkuc2hhcGVPdXRzaWRlSW5mbygpOwotICAgIGlmIChzaGFwZU91dHNpZGVJbmZv KQorICAgIGlmIChzaGFwZU91dHNpZGVJbmZvKSB7CisgICAgICAgIExheW91dFVuaXQgbGluZUhl aWdodCA9IG1fYmxvY2subGluZUhlaWdodChtX2lzRmlyc3RMaW5lLCBtX2Jsb2NrLmlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRp b25PZkludGVyaW9yTGluZUJveGVzKTsKICAgICAgICAgc2hhcGVPdXRzaWRlSW5mby0+dXBkYXRl RGVsdGFzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShtX2Jsb2NrLCAqbmV3RmxvYXQsIG1fYmxvY2su bG9naWNhbEhlaWdodCgpLCBsaW5lSGVpZ2h0KTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGlmIChu ZXdGbG9hdC0+dHlwZSgpID09IEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQpIHsKICAgICAgICAg ZmxvYXQgbmV3TGVmdCA9IG1fYmxvY2subG9naWNhbFJpZ2h0Rm9yRmxvYXQobmV3RmxvYXQpOwot I2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgICAgICBpZiAocHJldmlvdXNTaGFwZU91dHNpZGVJ bmZvKQotICAgICAgICAgICAgbmV3TGVmdCAtPSBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8tPnJp Z2h0TWFyZ2luQm94RGVsdGEoKTsKLSAgICAgICAgaWYgKHNoYXBlT3V0c2lkZUluZm8pCi0gICAg ICAgICAgICBuZXdMZWZ0ICs9IHNoYXBlT3V0c2lkZUluZm8tPnJpZ2h0TWFyZ2luQm94RGVsdGEo KTsKLSNlbmRpZgotCiAgICAgICAgIGlmIChzaG91bGRJbmRlbnRUZXh0KCkgJiYgbV9ibG9jay5z dHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKICAgICAgICAgICAgIG5ld0xlZnQgKz0g Zmxvb3JUb0ludChtX2Jsb2NrLnRleHRJbmRlbnRPZmZzZXQoKSk7CisjaWYgRU5BQkxFKENTU19T SEFQRVMpCisgICAgICAgIGlmIChzaGFwZU91dHNpZGVJbmZvKSB7CisgICAgICAgICAgICBpZiAo c2hhcGVPdXRzaWRlSW5mby0+bGluZU92ZXJsYXBzU2hhcGUoKSkKKyAgICAgICAgICAgICAgICBu ZXdMZWZ0ICs9IHNoYXBlT3V0c2lkZUluZm8tPnJpZ2h0TWFyZ2luQm94RGVsdGEoKTsKKyAgICAg ICAgICAgIGVsc2UgLy8gSWYgdGhlIGxpbmUgZG9lc24ndCBvdmVybGFwIHRoZSBzaGFwZSwgdGhl biB3ZSBuZWVkIHRvIGFjdCBhcyBpZiB0aGlzIGZsb2F0IGRpZG4ndCBleGlzdC4KKyAgICAgICAg ICAgICAgICBuZXdMZWZ0ID0gbV9sZWZ0OworICAgICAgICB9CisjZW5kaWYKICAgICAgICAgbV9s ZWZ0ID0gc3RkOjptYXg8ZmxvYXQ+KG1fbGVmdCwgbmV3TGVmdCk7CiAgICAgfSBlbHNlIHsKICAg ICAgICAgZmxvYXQgbmV3UmlnaHQgPSBtX2Jsb2NrLmxvZ2ljYWxMZWZ0Rm9yRmxvYXQobmV3Rmxv YXQpOwotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotICAgICAgICBpZiAocHJldmlvdXNTaGFwZU91 dHNpZGVJbmZvKQotICAgICAgICAgICAgbmV3UmlnaHQgLT0gcHJldmlvdXNTaGFwZU91dHNpZGVJ bmZvLT5sZWZ0TWFyZ2luQm94RGVsdGEoKTsKLSAgICAgICAgaWYgKHNoYXBlT3V0c2lkZUluZm8p Ci0gICAgICAgICAgICBuZXdSaWdodCArPSBzaGFwZU91dHNpZGVJbmZvLT5sZWZ0TWFyZ2luQm94 RGVsdGEoKTsKLSNlbmRpZgotCiAgICAgICAgIGlmIChzaG91bGRJbmRlbnRUZXh0KCkgJiYgIW1f YmxvY2suc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCiAgICAgICAgICAgICBuZXdS aWdodCAtPSBmbG9vclRvSW50KG1fYmxvY2sudGV4dEluZGVudE9mZnNldCgpKTsKKyNpZiBFTkFC TEUoQ1NTX1NIQVBFUykKKyAgICAgICAgaWYgKHNoYXBlT3V0c2lkZUluZm8pIHsKKyAgICAgICAg ICAgIGlmIChzaGFwZU91dHNpZGVJbmZvLT5saW5lT3ZlcmxhcHNTaGFwZSgpKQorICAgICAgICAg ICAgICAgIG5ld1JpZ2h0ICs9IHNoYXBlT3V0c2lkZUluZm8tPmxlZnRNYXJnaW5Cb3hEZWx0YSgp OworICAgICAgICAgICAgZWxzZSAvLyBJZiB0aGUgbGluZSBkb2Vzbid0IG92ZXJsYXAgdGhlIHNo YXBlLCB0aGVuIHdlIG5lZWQgdG8gYWN0IGFzIGlmIHRoaXMgZmxvYXQgZGlkbid0IGV4aXN0Lgor ICAgICAgICAgICAgICAgIG5ld1JpZ2h0ID0gbV9yaWdodDsKKyAgICAgICAgfQorI2VuZGlmCiAg ICAgICAgIG1fcmlnaHQgPSBzdGQ6Om1pbjxmbG9hdD4obV9yaWdodCwgbmV3UmlnaHQpOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91 dHNpZGVJbmZvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRz aWRlSW5mby5jcHAKaW5kZXggOThmYjdhMDVlYmUxYjc5NjEyMDhkODY0ZWM2NjdlNzM5NzgxODAz OC4uZGNmYTJiZjMzMjdhYWY2MjQzMWZmMWM2ODM1Nzc3ZjE3MGQyZjNkYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCkBA IC03OSwxOSArNzksMTcgQEAgdm9pZCBTaGFwZU91dHNpZGVJbmZvOjp1cGRhdGVEZWx0YXNGb3JD b250YWluaW5nQmxvY2tMaW5lKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYKIAogICAgICAgICAgICAg ICAgIExheW91dFVuaXQgcmF3UmlnaHRNYXJnaW5Cb3hEZWx0YSA9IHNlZ21lbnRzLmxhc3QoKS5s b2dpY2FsUmlnaHQgLSBjb250YWluaW5nQmxvY2subG9naWNhbFdpZHRoRm9yQ2hpbGQobV9yZW5k ZXJlcikgLSBjb250YWluaW5nQmxvY2subWFyZ2luRW5kRm9yQ2hpbGQobV9yZW5kZXJlcik7CiAg ICAgICAgICAgICAgICAgbV9yaWdodE1hcmdpbkJveERlbHRhID0gY2xhbXBUbzxMYXlvdXRVbml0 PihyYXdSaWdodE1hcmdpbkJveERlbHRhLCAtZmxvYXRNYXJnaW5Cb3hXaWR0aCwgTGF5b3V0VW5p dCgpKTsKKyAgICAgICAgICAgICAgICBtX2xpbmVPdmVybGFwc1NoYXBlID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICAv LyBMaW5lcyB0aGF0IGRvIG5vdCBvdmVybGFwIHRoZSBzaGFwZSBzaG91bGQgYWN0IGFzIGlmIHRo ZSBmbG9hdAogICAgICAgICAvLyB3YXNuJ3QgdGhlcmUgZm9yIGxheW91dCBwdXJwb3Nlcy4gU28g d2Ugc2V0IHRoZSBkZWx0YXMgdG8gcmVtb3ZlIHRoZQotICAgICAgICAvLyBlbnRpcmUgd2lkdGgg b2YgdGhlIGZsb2F0LiAKLSAgICAgICAgLy8gRklYTUU6IFRoZSBsYXRlc3QgQ1NTIFNoYXBlcyBz cGVjIHNheXMgdGhhdCBpbiB0aGlzIGNhc2UsIHRoZQotICAgICAgICAvLyBjb250ZW50IHNob3Vs ZCBpbnRlcmFjdCB3aXRoIHByZXZpb3VzbHkgc3RhY2tlZCBmbG9hdHMgb24gdGhlIGxpbmUKLSAg ICAgICAgLy8gYXMgaWYgdGhpcyBvdXRlcm1vc3QgZmxvYXQgZGlkIG5vdCBleGlzdC4gUGVyaGFw cyBvYnZpb3VzbHksIHRoaXMKLSAgICAgICAgLy8gc29sdXRpb24gY2Fubm90IGRvIHRoYXQsIGFu ZCB3aWxsIGJlIHJldmlzdGVkIHdpdGggYnVnIDEyMjU3Ni4KKyAgICAgICAgLy8gZW50aXJlIHdp ZHRoIG9mIHRoZSBmbG9hdAogICAgICAgICBtX2xlZnRNYXJnaW5Cb3hEZWx0YSA9IGZsb2F0TWFy Z2luQm94V2lkdGg7CiAgICAgICAgIG1fcmlnaHRNYXJnaW5Cb3hEZWx0YSA9IC1mbG9hdE1hcmdp bkJveFdpZHRoOworICAgICAgICBtX2xpbmVPdmVybGFwc1NoYXBlID0gZmFsc2U7CiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0 c2lkZUluZm8uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRl SW5mby5oCmluZGV4IDAyNTVhOGY5YWNlNjM2MDdmYjJmYTMwNTA2ZDkzODI5MDc0MGM5NTYuLjli ZGYxYTI4MGNlZTc4ZTZmNWZlYjk1YjgzNzAyZGI3OTZhOTVmMmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oCkBAIC00NSw2ICs0 NSw3IEBAIGNsYXNzIFNoYXBlT3V0c2lkZUluZm8gZmluYWwgOiBwdWJsaWMgU2hhcGVJbmZvPFJl bmRlckJveD4sIHB1YmxpYyBNYXBwZWRJbmZvPFJlCiBwdWJsaWM6CiAgICAgU2hhcGVPdXRzaWRl SW5mbyhjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyKQogICAgICAgICA6IFNoYXBlSW5mbzxSZW5k ZXJCb3g+KHJlbmRlcmVyKQorICAgICAgICAsIG1fbGluZU92ZXJsYXBzU2hhcGUoZmFsc2UpCiAg ICAgewogICAgIH0KIApAQCAtNTIsNiArNTMsNyBAQCBwdWJsaWM6CiAKICAgICBMYXlvdXRVbml0 IGxlZnRNYXJnaW5Cb3hEZWx0YSgpIGNvbnN0IHsgcmV0dXJuIG1fbGVmdE1hcmdpbkJveERlbHRh OyB9CiAgICAgTGF5b3V0VW5pdCByaWdodE1hcmdpbkJveERlbHRhKCkgY29uc3QgeyByZXR1cm4g bV9yaWdodE1hcmdpbkJveERlbHRhOyB9CisgICAgYm9vbCBsaW5lT3ZlcmxhcHNTaGFwZSgpIGNv bnN0IHsgcmV0dXJuIG1fbGluZU92ZXJsYXBzU2hhcGU7IH0KIAogICAgIHZvaWQgdXBkYXRlRGVs dGFzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShjb25zdCBSZW5kZXJCbG9ja0Zsb3cmLCBjb25zdCBG bG9hdGluZ09iamVjdCYsIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0 KTsKIApAQCAtODQsNiArODYsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgbV9sZWZ0TWFy Z2luQm94RGVsdGE7CiAgICAgTGF5b3V0VW5pdCBtX3JpZ2h0TWFyZ2luQm94RGVsdGE7CiAgICAg TGF5b3V0VW5pdCBtX2xpbmVUb3A7CisgICAgYm9vbCBtX2xpbmVPdmVybGFwc1NoYXBlOwogfTsK IAogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDg1MGFhNDQyZjBiMmE5YTFhOTM2MjI0YjQ0ZjY1MTk1ZWJlODc2ZjQuLmE3 YWZlZjdjZTEyYTIyMTkwNDJkNWUwMTUwZDE3ODNhMDkwYTdkNjkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MCBAQAorMjAxNC0wMS0xNyAgQmVtIEpvbmVzLUJleSAgPGJqb25lc2JlQGFkb2JlLmNvbT4KKwor ICAgICAgICBbQ1NTIFNoYXBlc10gU3RhY2tlZCBmbG9hdHMgd2l0aCBzaGFwZS1vdXRzaWRlIHNo b3VsZCBhbGxvdyBpbmxpbmUgY29udGVudCB0byBpbnRlcmFjdCB3aXRoIHRoZSBub24tb3V0ZXJt b3N0IGZsb2F0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjI1NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUZXN0cyBmb3Igc2hhcGUtb3V0c2lkZSBvbiBzdGFja2VkIGZsb2F0cyBhbmQgaW50ZXJhY3Rp b24gd2l0aCBpbmxpbmUKKyAgICAgICAgY29udGVudC4KKworICAgICAgICAqIGZhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAwLWV4 cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUt ZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAwLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxv YXRzLXN0YWNrZWQtMDAxLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAx Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAyLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUt ZmxvYXRzLXN0YWNrZWQtMDAyLmh0bWw6IEFkZGVkLgorCiAyMDE0LTAxLTE3ICBNaWNoYcWCIFBh a3XFgmEgdmVsIFJ1dGthICA8bS5wYWt1bGFAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBFRkwgZ2FyZGVuaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFja2VkLTAwMC1leHBl Y3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDAtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li40YmM4MDc4OTQ2MTVjZWUxZGIyZGJhMzQ0MGRmNjA2NWMxNzA3ZDllCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUt b3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDAtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE5IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHdpZHRoOiAyMDBw eDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGZvbnQ6IDEwMHB4LzEgQWhlbSwgc2Fucy1zZXJp ZjsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBtYXJnaW4tYm90dG9tOiA1MHB4 OworICAgIGNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8cD5JZiB0d28g ZmxvYXRzIGFmZmVjdCB0aGUgc2FtZSBsaW5lIGFuZCB0aGUgbG9uZ2VyIGZsb2F0IGhhcyBhIHNo YXBlIHRoYXQgbWFrZXMgaXQgc2hvcnQsIHRoZW4gdGhlIG90aGVyIGZsb2F0IHNob3VsZCBiZSBy ZXNwZWN0ZWQgYXMgdGhlIG9mZnNldCBmb3IgdGhlIGxpbmUuPC9wPgorICAgIDxwPllvdSBzaG91 bGQgc2VlIHR3byBncmVlbiByZWN0YW5nZXMuIFRoZXJlIHNob3VsZCBiZSBubyByZWQuPC9wPgor ICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0i Y29udGFpbmVyIj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0 YWNrZWQtMDAwLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZs b2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFja2VkLTAwMC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM4 ZDg0YzgwM2I2Y2E5YTc2ZWM3NTVhMzc2M2JiNjVjNzY2YWRkYzIKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRz aWRlLWZsb2F0cy1zdGFja2VkLTAwMC5odG1sCkBAIC0wLDAgKzEsNTUgQEAKKzwhRE9DVFlQRSBo dG1sPgorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGhlaWdo dDogMTAwcHg7CisgICAgZm9udDogMTAwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgIGJhY2tn cm91bmQtY29sb3I6IHJlZDsKKyAgICBtYXJnaW4tYm90dG9tOiA1MHB4OworICAgIGNvbG9yOiBn cmVlbjsKK30KKy5mbG9hdC1sZWZ0LWxvbmcgeworICAgIG1hcmdpbi1yaWdodDogMTAwcHg7Cisg ICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogNTBweDsKKyAgICBmbG9hdDogbGVmdDsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGlu c2V0KDAgMTAwJSAwIDApOworfQorLmZsb2F0LWxlZnQtc2hvcnQgeworICAgIHdpZHRoOiAxMDBw eDsKKyAgICBoZWlnaHQ6IDUwcHg7CisgICAgZmxvYXQ6IGxlZnQ7CisgICAgYmFja2dyb3VuZC1j b2xvcjogZ3JlZW47CisgICAgY2xlYXI6IGxlZnQ7Cit9CisuZmxvYXQtcmlnaHQtbG9uZyB7Cisg ICAgbWFyZ2luLWxlZnQ6IDEwMHB4OworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDUw cHg7CisgICAgZmxvYXQ6IHJpZ2h0OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAg IC13ZWJraXQtc2hhcGUtb3V0c2lkZTogaW5zZXQoMCAwIDAgMTAwJSk7Cit9CisuZmxvYXQtcmln aHQtc2hvcnQgeworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDUwcHg7CisgICAgZmxv YXQ6IHJpZ2h0OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIGNsZWFyOiByaWdo dDsKK30KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8cD5JZiB0d28gZmxvYXRzIGFmZmVjdCB0aGUg c2FtZSBsaW5lIGFuZCB0aGUgbG9uZ2VyIGZsb2F0IGhhcyBhIHNoYXBlIHRoYXQgbWFrZXMgaXQg c2hvcnQsIHRoZW4gdGhlIG90aGVyIGZsb2F0IHNob3VsZCBiZSByZXNwZWN0ZWQgYXMgdGhlIG9m ZnNldCBmb3IgdGhlIGxpbmUuPC9wPgorICAgIDxwPllvdSBzaG91bGQgc2VlIHR3byBncmVlbiBy ZWN0YW5nZXMuIFRoZXJlIHNob3VsZCBiZSBubyByZWQuPC9wPgorICAgIDxkaXYgY2xhc3M9ImNv bnRhaW5lciI+CisgICAgICAgIDxkaXYgY2xhc3M9ImZsb2F0LWxlZnQtbG9uZyI+PC9kaXY+Cisg ICAgICAgIDxkaXYgY2xhc3M9ImZsb2F0LWxlZnQtc2hvcnQiPjwvZGl2PgorICAgICAgICBYCisg ICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIiBzdHlsZT0idGV4dC1hbGlnbjog cmlnaHQiPgorICAgICAgICA8ZGl2IGNsYXNzPSJmbG9hdC1yaWdodC1sb25nIj48L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0iZmxvYXQtcmlnaHQtc2hvcnQiPjwvZGl2PgorICAgICAgICBYCisg ICAgPC9kaXY+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFja2VkLTAwMS1leHBl Y3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDEtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5mM2Y1YjkzNWQwMzBlNWMzMDEyYWM0NmIwNjIzYzcwMDA1ZTgwNmQ3Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUt b3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDEtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE5IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHdpZHRoOiAyMDBw eDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGZvbnQ6IDEwMHB4LzEgQWhlbSwgc2Fucy1zZXJp ZjsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBtYXJnaW4tYm90dG9tOiA1MHB4 OworICAgIGNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8cD5JZiBhIHNo YXBlIG9uIGEgc3RhY2tlZCBmbG9hdCBkb2VzIG5vdCBhZmZlY3QgdGhlIGxpbmUsIHRoZW4gdGhl IGxpbmUgc2hvdWxkIGJlIGFmZmVjdGVkIGJ5IHRoZSBzaGFwZSBvbiB0aGUgcHJldmlvdXMgc3Rh Y2tlZCBmbG9hdC48L3A+CisgICAgPHA+WW91IHNob3VsZCBzZWUgdHdvIGdyZWVuIHJlY3Rhbmdl cy4gVGhlcmUgc2hvdWxkIGJlIG5vIHJlZC48L3A+CisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVy Ij4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgIDwvZGl2Pgor PC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1mbG9hdHMtc3RhY2tlZC0wMDEuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRz LXN0YWNrZWQtMDAxLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmE2NmE0NDUzZTU1MTVhN2Q5ZjU0ZTEzMTBj MTY5ZTU5ZDhjMzM1ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAxLmh0 bWwKQEAgLTAsMCArMSw1NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CisuY29udGFpbmVy IHsKKyAgICB3aWR0aDogMjAwcHg7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICBmb250OiA1MHB4 LzEgQWhlbSwgc2Fucy1zZXJpZjsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CisgICAgbWFy Z2luLWJvdHRvbTogNTBweDsKKyAgICBjb2xvcjogZ3JlZW47Cit9CisuZmxvYXQtbGVmdC1vdXRl ciB7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgZmxvYXQ6IGxl ZnQ7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgLXdlYmtpdC1zaGFwZS1vdXRz aWRlOiBpbnNldCg1MCUgMCAwIDApOworfQorLmZsb2F0LWxlZnQtaW5uZXIgeworICAgIG1hcmdp bi10b3A6IDUwcHg7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogNTBweDsKKyAgICBm bG9hdDogbGVmdDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAtd2Via2l0LXNo YXBlLW91dHNpZGU6IGluc2V0KDAgMTAwJSAwIDApOworfQorLmZsb2F0LXJpZ2h0LW91dGVyIHsK KyAgICB3aWR0aDogMTAwcHg7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICBmbG9hdDogcmlnaHQ7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRl OiBpbnNldCg1MCUgMCAwIDApOworfQorLmZsb2F0LXJpZ2h0LWlubmVyIHsKKyAgICBtYXJnaW4t dG9wOiA1MHB4OworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDUwcHg7CisgICAgZmxv YXQ6IHJpZ2h0OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIC13ZWJraXQtc2hh cGUtb3V0c2lkZTogaW5zZXQoMCAwIDAgMTAwJSk7Cit9Cis8L3N0eWxlPgorPGJvZHk+CisgICAg PHA+SWYgYSBzaGFwZSBvbiBhIHN0YWNrZWQgZmxvYXQgZG9lcyBub3QgYWZmZWN0IHRoZSBsaW5l LCB0aGVuIHRoZSBsaW5lIHNob3VsZCBiZSBhZmZlY3RlZCBieSB0aGUgc2hhcGUgb24gdGhlIHBy ZXZpb3VzIHN0YWNrZWQgZmxvYXQuPC9wPgorICAgIDxwPllvdSBzaG91bGQgc2VlIHR3byBncmVl biByZWN0YW5nZXMuIFRoZXJlIHNob3VsZCBiZSBubyByZWQuPC9wPgorICAgIDxkaXYgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgICAgIDxkaXYgY2xhc3M9ImZsb2F0LWxlZnQtaW5uZXIiPjwvZGl2 PgorICAgICAgICA8ZGl2IGNsYXNzPSJmbG9hdC1sZWZ0LW91dGVyIj48L2Rpdj4KKyAgICAgICAg WFhYWAorICAgIDwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciIgc3R5bGU9InRleHQt YWxpZ246IHJpZ2h0Ij4KKyAgICAgICAgPGRpdiBjbGFzcz0iZmxvYXQtcmlnaHQtaW5uZXIiPjwv ZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJmbG9hdC1yaWdodC1vdXRlciI+PC9kaXY+CisgICAg ICAgIFhYWFgKKyAgICA8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNr ZWQtMDAyLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRz aWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFja2VkLTAwMi1leHBlY3RlZC5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjVkYTQ0NDNkOGJmMjJlOGU1YmJlMmE4YzUxNGNlNGRjYWIzNTNkMjQKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZs b2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFja2VkLTAwMi1leHBlY3RlZC5odG1sCkBAIC0w LDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAg d2lkdGg6IDIwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgZm9udDogMTAwcHgvMSBBaGVt LCBzYW5zLXNlcmlmOworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIG1hcmdpbi1i b3R0b206IDUwcHg7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxib2R5PgorICAg IDxwPlNoYXBlcyBzaG91bGQgbm90IGFmZmFjdCBmbG9hdCBzdGFja2luZywgYnV0IHNob3VsZCBh ZmZlY3QgaW5saW5lIGNvbnRlbnQuPC9wPgorICAgIDxwPllvdSBzaG91bGQgc2VlIHR3byBncmVl biByZWN0YW5nZXMuIFRoZXJlIHNob3VsZCBiZSBubyByZWQuPC9wPgorICAgIDxkaXYgY2xhc3M9 ImNvbnRhaW5lciI+CisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KKyAg ICA8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3No YXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXN0YWNrZWQtMDAyLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRz aWRlLWZsb2F0cy1zdGFja2VkLTAwMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYzYzM3YTk5NDkwMmVmZGQ5 MzZjN2JkZmQzZWVkMDg5ZTI5ZDIwODUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zdGFj a2VkLTAwMi5odG1sCkBAIC0wLDAgKzEsNTcgQEAKKzwhRE9DVFlQRSBodG1sPgorPHN0eWxlPgor LmNvbnRhaW5lciB7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAg Zm9udDogNTBweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmVk OworICAgIG1hcmdpbi1ib3R0b206IDUwcHg7CisgICAgY29sb3I6IGdyZWVuOworfQorLmZsb2F0 LWxlZnQtaW5uZXIgeworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAg IGZsb2F0OiBsZWZ0OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIC13ZWJraXQt c2hhcGUtb3V0c2lkZTogaW5zZXQoMCA1MCUgMCAwKTsKK30KKy5mbG9hdC1sZWZ0LW91dGVyIHsK KyAgICBtYXJnaW4tcmlnaHQ6IDUwcHg7CisgICAgd2lkdGg6IDUwcHg7CisgICAgaGVpZ2h0OiAx MDBweDsKKyAgICBmbG9hdDogbGVmdDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAg ICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGluc2V0KDAgNTAlIDAgMCk7Cit9CisuZmxvYXQtcmln aHQtaW5uZXIgeworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGZs b2F0OiByaWdodDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAtd2Via2l0LXNo YXBlLW91dHNpZGU6IGluc2V0KDAgMCAwIDUwJSk7Cit9CisuZmxvYXQtcmlnaHQtb3V0ZXIgewor ICAgIG1hcmdpbi1sZWZ0OiA1MHB4OworICAgIHdpZHRoOiA1MHB4OworICAgIGhlaWdodDogMTAw cHg7CisgICAgZmxvYXQ6IHJpZ2h0OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAg IC13ZWJraXQtc2hhcGUtb3V0c2lkZTogaW5zZXQoMCAwIDAgNTAlKTsKK30KKzwvc3R5bGU+Cis8 Ym9keT4KKyAgICA8cD5TaGFwZXMgc2hvdWxkIG5vdCBhZmZhY3QgZmxvYXQgc3RhY2tpbmcsIGJ1 dCBzaG91bGQgYWZmZWN0IGlubGluZSBjb250ZW50LjwvcD4KKyAgICA8cD5Zb3Ugc2hvdWxkIHNl ZSB0d28gZ3JlZW4gcmVjdGFuZ2VzLiBUaGVyZSBzaG91bGQgYmUgbm8gcmVkLjwvcD4KKyAgICA8 ZGl2IGNsYXNzPSJjb250YWluZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJmbG9hdC1sZWZ0LWlu bmVyIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZmxvYXQtbGVmdC1vdXRlciI+PC9kaXY+ CisgICAgICAgIFg8YnIvPgorICAgICAgICBYCisgICAgPC9kaXY+CisgICAgPGRpdiBjbGFzcz0i Y29udGFpbmVyIiBzdHlsZT0idGV4dC1hbGlnbjogcmlnaHQiPgorICAgICAgICA8ZGl2IGNsYXNz PSJmbG9hdC1yaWdodC1pbm5lciI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImZsb2F0LXJp Z2h0LW91dGVyIj48L2Rpdj4KKyAgICAgICAgWDxici8+CisgICAgICAgIFgKKyAgICA8L2Rpdj4K KzwvYm9keT4K