116747 2013-05-24 16:36:21 -0700 Remove using namespace std from Mac WebKit1 2013-05-24 16:52:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 893505 0 andersca 2013-05-24 16:36:21 -0700 Remove using namespace std from Mac WebKit1 893506 1 202865 andersca 2013-05-24 16:37:45 -0700 Created attachment 202865 Patch 893511 2 andersca 2013-05-24 16:52:03 -0700 Committed r150668: <http://trac.webkit.org/changeset/150668> 202865 2013-05-24 16:37:45 -0700 2013-05-24 16:45:23 -0700 Patch bug-116747-20130524163629.patch text/plain 25744 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMDdkMDI1Y2Yw NWE0MGY2ZTg1ODc3MjcwNTIxZTI5ZTRhMTg5NDI4MS4uMzM4NTU4MzQ0ZmRiNjdlNjgzNDE3ZGM4 NzlmM2Q1ZjJkZTFlZDIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU3IEBACiAyMDEz LTA1LTI0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg UmVtb3ZlIHVzaW5nIG5hbWVzcGFjZSBzdGQgZnJvbSBNYWMgV2ViS2l0MQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2NzQ3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGV4cGxpY2l0IHN0ZDo6IHF1 YWxpZmllcnMgaW5zdGVhZC4KKworICAgICAgICAqIEhpc3RvcnkvQmluYXJ5UHJvcGVydHlMaXN0 LmNwcDoKKyAgICAgICAgKEludGVnZXJBcnJheTo6ZGVsZXRlZFZhbHVlU2l6ZSk6CisgICAgICAg IChCaW5hcnlQcm9wZXJ0eUxpc3RQbGFuOjppbnZhbGlkT2JqZWN0UmVmZXJlbmNlKToKKyAgICAg ICAgKGJ5dGVzTmVlZGVkKToKKyAgICAgICAgKiBIaXN0b3J5L1dlYkhpc3RvcnkubW06CisgICAg ICAgICgtW1dlYkhpc3RvcnlQcml2YXRlIG9yZGVyZWRMYXN0VmlzaXRlZERheXNdKToKKyAgICAg ICAgKFdlYkhpc3RvcnlXcml0ZXI6OldlYkhpc3RvcnlXcml0ZXIpOgorICAgICAgICAqIEhpc3Rv cnkvV2ViSGlzdG9yeUl0ZW0ubW06CisgICAgICAgICgtW1dlYkhpc3RvcnlJdGVtIGluaXRGcm9t RGljdGlvbmFyeVJlcHJlc2VudGF0aW9uOl0pOgorICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL05l dHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1 Z2luSG9zdE1hbmFnZXI6Omluc3RhbnRpYXRlUGx1Z2luKToKKyAgICAgICAgKiBQbHVnaW5zL0hv c3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RQcm94eS5tbToKKyAgICAgICAgKiBQbHVnaW5zL0hvc3Rl ZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6TG9jYWxPYmplY3RNYXA6OmlkRm9yT2JqZWN0KToKKyAg ICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Ojp3aGVlbEV2ZW50KToK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpwcmludCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6c25hcHNob3QpOgor ICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmxvYWRVUkwpOgor ICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmNyZWF0ZUJpbmRp bmdzSW5zdGFuY2UpOgorICAgICAgICAqIFBsdWdpbnMvSG9zdGVkL1Byb3h5SW5zdGFuY2UubW06 CisgICAgICAgIChXZWJLaXQ6OlByb3h5SW5zdGFuY2U6Omludm9rZSk6CisgICAgICAgIChXZWJL aXQ6OlByb3h5SW5zdGFuY2U6OnN1cHBvcnRzSW52b2tlRGVmYXVsdE1ldGhvZCk6CisgICAgICAg IChXZWJLaXQ6OlByb3h5SW5zdGFuY2U6OnN1cHBvcnRzQ29uc3RydWN0KToKKyAgICAgICAgKFdl YktpdDo6UHJveHlJbnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChXZWJLaXQ6 OlByb3h5SW5zdGFuY2U6Om1ldGhvZE5hbWVkKToKKyAgICAgICAgKFdlYktpdDo6UHJveHlJbnN0 YW5jZTo6ZmllbGROYW1lZCk6CisgICAgICAgIChXZWJLaXQ6OlByb3h5SW5zdGFuY2U6OmZpZWxk VmFsdWUpOgorICAgICAgICAoV2ViS2l0OjpQcm94eUluc3RhbmNlOjpzZXRGaWVsZFZhbHVlKToK KyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tOgorICAgICAgICAoLVtX ZWJCYXNlUGx1Z2luUGFja2FnZSBzdXBwb3J0c0V4dGVuc2lvbjpdKToKKyAgICAgICAgKC1bV2Vi QmFzZVBsdWdpblBhY2thZ2UgTUlNRVR5cGVGb3JFeHRlbnNpb246XSk6CisgICAgICAgICogUGx1 Z2lucy9XZWJOZXRzY2FwZVBsdWdpblN0cmVhbS5tbToKKyAgICAgICAgKFdlYk5ldHNjYXBlUGx1 Z2luU3RyZWFtOjpkZWxpdmVyRGF0YSk6CisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBs dWdpblZpZXcubW06CisgICAgICAgIChQbHVnaW5UaW1lcjo6c3RhcnQpOgorICAgICAgICAoLVtX ZWJOZXRzY2FwZVBsdWdpblZpZXcgX3Bvc3RVUkw6dGFyZ2V0OmxlbjpidWY6ZmlsZTpub3RpZnlE YXRhOnNlbmROb3RpZmljYXRpb246YWxsb3dIZWFkZXJzOl0pOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAqIFdlYlZpZXcvV2ViRnJh bWUubW06CisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1bV2Vi SFRNTFZpZXcgX2FkanVzdGVkQm90dG9tT2ZQYWdlV2l0aFRvcDpib3R0b206bGltaXQ6XSk6Cisg ICAgICAgICogV2ViVmlldy9XZWJUZXh0Q29tcGxldGlvbkNvbnRyb2xsZXIubW06CisgICAgICAg ICgtW1dlYlRleHRDb21wbGV0aW9uQ29udHJvbGxlciBfcGxhY2VQb3B1cFdpbmRvdzpdKToKKwor MjAxMy0wNS0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAg ICAgIE1vdmUgaGlzdG9yeSBwcm9wZXJ0eSBsaXN0IHdyaXRlciB0byBXZWJLaXQKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjc0NgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L0JpbmFyeVByb3BlcnR5TGlzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L0JpbmFyeVByb3BlcnR5TGlzdC5jcHAKaW5kZXggMDk5 YWZhYTkyNGZmMGYyM2Q4NjBlZDcxNmRhNmVmNTdkYmEyZTZjMi4uZTI4ZWI3MDU4NGU5YWMxODcy MzkxODNkMjhjZTBjNGZmMzJlOTNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvSGlz dG9yeS9CaW5hcnlQcm9wZXJ0eUxpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rv cnkvQmluYXJ5UHJvcGVydHlMaXN0LmNwcApAQCAtMzAsOCArMzAsNiBAQAogI2luY2x1ZGUgPHd0 Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgogCi11c2luZyBu YW1lc3BhY2Ugc3RkOwotCiBzdGF0aWMgY29uc3Qgc2l6ZV90IGhlYWRlclNpemUgPSA4Owogc3Rh dGljIGNvbnN0IHNpemVfdCB0cmFpbGVyU2l6ZSA9IDMyOwogCkBAIC02Miw3ICs2MCw3IEBAIHB1 YmxpYzoKICAgICBzaXplX3Qgc2l6ZSgpIGNvbnN0IHsgQVNTRVJUKCFpc0RlbGV0ZWRWYWx1ZSgp KTsgcmV0dXJuIG1fc2l6ZTsgfQogCiBwcml2YXRlOgotICAgIHN0YXRpYyBzaXplX3QgZGVsZXRl ZFZhbHVlU2l6ZSgpIHsgcmV0dXJuIG51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpOyB9Cisg ICAgc3RhdGljIHNpemVfdCBkZWxldGVkVmFsdWVTaXplKCkgeyByZXR1cm4gc3RkOjpudW1lcmlj X2xpbWl0czxzaXplX3Q+OjptYXgoKTsgfQogCiAgICAgZnJpZW5kIGJvb2wgb3BlcmF0b3I9PShj b25zdCBJbnRlZ2VyQXJyYXkmLCBjb25zdCBJbnRlZ2VyQXJyYXkmKTsKIApAQCAtMTM4LDcgKzEz Niw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB3cml0ZVN0cmluZ09iamVjdChjb25zdCBTdHJpbmcm KTsKICAgICB2b2lkIHdyaXRlU3RyaW5nT2JqZWN0KGNvbnN0IGNoYXIqKTsKIAotICAgIHN0YXRp YyBPYmplY3RSZWZlcmVuY2UgaW52YWxpZE9iamVjdFJlZmVyZW5jZSgpIHsgcmV0dXJuIG51bWVy aWNfbGltaXRzPE9iamVjdFJlZmVyZW5jZT46Om1heCgpOyB9CisgICAgc3RhdGljIE9iamVjdFJl ZmVyZW5jZSBpbnZhbGlkT2JqZWN0UmVmZXJlbmNlKCkgeyByZXR1cm4gc3RkOjpudW1lcmljX2xp bWl0czxPYmplY3RSZWZlcmVuY2U+OjptYXgoKTsgfQogCiAgICAgdHlwZWRlZiBIYXNoTWFwPElu dGVnZXJBcnJheSwgT2JqZWN0UmVmZXJlbmNlLCBJbnRlZ2VyQXJyYXlIYXNoLCBJbnRlZ2VyQXJy YXlIYXNoVHJhaXRzPiBJbnRlZ2VyQXJyYXlNYXA7CiAKQEAgLTQxNCw3ICs0MTIsNyBAQCBzdGF0 aWMgaW50IGJ5dGVzTmVlZGVkKHNpemVfdCBjb3VudCkKIHsKICAgICBBU1NFUlQoY291bnQpOwog ICAgIGludCBieXRlc05lZWRlZCA9IDE7Ci0gICAgZm9yIChzaXplX3QgbWFzayA9IG51bWVyaWNf bGltaXRzPHNpemVfdD46Om1heCgpIDw8IDg7IGNvdW50ICYgbWFzazsgbWFzayA8PD0gOCkKKyAg ICBmb3IgKHNpemVfdCBtYXNrID0gc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSA8 PCA4OyBjb3VudCAmIG1hc2s7IG1hc2sgPDw9IDgpCiAgICAgICAgICsrYnl0ZXNOZWVkZWQ7CiAg ICAgcmV0dXJuIGJ5dGVzTmVlZGVkOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv SGlzdG9yeS9XZWJIaXN0b3J5Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0 b3J5Lm1tCmluZGV4IGUwOGJmYWQzZjJjMGE3ZWQzZDM0MzA4NThmYTM5MDc5MjllNGMyZDcuLmUw Mzc4Yjc2NzlkNTVmYmJjMTdmYzkwN2YzZWQzNTgxYWU0ODM1YmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9IaXN0b3J5L1dlYkhpc3RvcnkubW0KQEAgLTM3LDcgKzM3LDYgQEAKICNpbXBvcnQgPFdlYkNv cmUvUGFnZUdyb3VwLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNw YWNlIHN0ZDsKIAogdHlwZWRlZiBpbnQ2NF90IFdlYkhpc3RvcnlEYXRlS2V5OwogdHlwZWRlZiBI YXNoTWFwPFdlYkhpc3RvcnlEYXRlS2V5LCBSZXRhaW5QdHI8TlNNdXRhYmxlQXJyYXk+ID4gRGF0 ZVRvRW50cmllc01hcDsKQEAgLTQ0NCw3ICs0NDMsNyBAQCBzdGF0aWMgaW5saW5lIFdlYkhpc3Rv cnlEYXRlS2V5IGRhdGVLZXkoTlNUaW1lSW50ZXJ2YWwgZGF0ZSkKICAgICAgICAgZm9yIChEYXRl VG9FbnRyaWVzTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IF9lbnRyaWVzQnlEYXRlLT5iZWdpbigp OyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgICAgICBkYXlzQXNUaW1lSW50ZXJ2YWxzLmFwcGVu ZChpdC0+a2V5KTsKIAotICAgICAgICBzb3J0KGRheXNBc1RpbWVJbnRlcnZhbHMuYmVnaW4oKSwg ZGF5c0FzVGltZUludGVydmFscy5lbmQoKSk7CisgICAgICAgIHN0ZDo6c29ydChkYXlzQXNUaW1l SW50ZXJ2YWxzLmJlZ2luKCksIGRheXNBc1RpbWVJbnRlcnZhbHMuZW5kKCkpOwogICAgICAgICBz aXplX3QgY291bnQgPSBkYXlzQXNUaW1lSW50ZXJ2YWxzLnNpemUoKTsKICAgICAgICAgX29yZGVy ZWRMYXN0VmlzaXRlZERheXMgPSBbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aENhcGFj aXR5OmNvdW50XTsKICAgICAgICAgZm9yIChpbnQgaSA9IGNvdW50IC0gMTsgaSA+PSAwOyBpLS0p IHsKQEAgLTkwMCw3ICs4OTksNyBAQCBXZWJIaXN0b3J5V3JpdGVyOjpXZWJIaXN0b3J5V3JpdGVy KERhdGVUb0VudHJpZXNNYXAqIGVudHJpZXNCeURhdGUpCiAgICAgRGF0ZVRvRW50cmllc01hcDo6 Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9lbnRyaWVzQnlEYXRlLT5lbmQoKTsKICAgICBmb3IgKERh dGVUb0VudHJpZXNNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9lbnRyaWVzQnlEYXRlLT5iZWdp bigpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIG1fZGF0ZUtleXMuYXBwZW5kKGl0LT5rZXkp OwotICAgIHNvcnQobV9kYXRlS2V5cy5iZWdpbigpLCBtX2RhdGVLZXlzLmVuZCgpKTsKKyAgICBz dGQ6OnNvcnQobV9kYXRlS2V5cy5iZWdpbigpLCBtX2RhdGVLZXlzLmVuZCgpKTsKIH0KIAogdm9p ZCBXZWJIaXN0b3J5V3JpdGVyOjp3cml0ZUhpc3RvcnlJdGVtcyhCaW5hcnlQcm9wZXJ0eUxpc3RP YmplY3RTdHJlYW0mIHN0cmVhbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rv cnkvV2ViSGlzdG9yeUl0ZW0ubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3Rv cnlJdGVtLm1tCmluZGV4IDI4Mjc4ZjhiNzVhMDllMTA1N2NmN2U0MWY5MTQ5MTFlNTdjZTE0Nzku LmNjZWJhMGI2YjIwYjY4Y2MxM2FlMzM1ZWRmZTcyYmQxY2IyYjg1ODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0KKysrIGIvU291cmNlL1dl YktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQpAQCAtNzMsNyArNzMsNiBAQCBzdGF0 aWMgTlNTdHJpbmcgKndlZWtseVZpc2l0Q291bnRLZXkgPSBAIlciOyAvLyBzaG9ydCBrZXkgdG8g c2F2ZSBzcGFjZQogTlNTdHJpbmcgKldlYkhpc3RvcnlJdGVtQ2hhbmdlZE5vdGlmaWNhdGlvbiA9 IEAiV2ViSGlzdG9yeUl0ZW1DaGFuZ2VkTm90aWZpY2F0aW9uIjsKIAogdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7Ci11c2luZyBuYW1lc3BhY2Ugc3RkOwogCiB0eXBlZGVmIEhhc2hNYXA8SGlzdG9y eUl0ZW0qLCBXZWJIaXN0b3J5SXRlbSo+IEhpc3RvcnlJdGVtTWFwOwogCkBAIC0zNzUsOSArMzc0 LDkgQEAgV2ViSGlzdG9yeUl0ZW0gKmtpdChIaXN0b3J5SXRlbSogaXRlbSkKIAogICAgICAgICAv LyBEYWlseSBhbmQgd2Vla2x5IGNvdW50cyA8IDAgYXJlIGVycm9ycyBpbiB0aGUgZGF0YSByZWFk IGZyb20gZGlzaywgc28gcmVzZXQgdG8gMC4KICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBjb3JlRGFpbHlDb3VudHMuc2l6ZSgpOyArK2kpCi0gICAgICAgICAgICBjb3JlRGFpbHlDb3Vu dHNbaV0gPSBtYXgoW1tkYWlseUNvdW50cyBfd2Via2l0X251bWJlckF0SW5kZXg6aV0gaW50VmFs dWVdLCAwKTsKKyAgICAgICAgICAgIGNvcmVEYWlseUNvdW50c1tpXSA9IHN0ZDo6bWF4KFtbZGFp bHlDb3VudHMgX3dlYmtpdF9udW1iZXJBdEluZGV4OmldIGludFZhbHVlXSwgMCk7CiAgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29yZVdlZWtseUNvdW50cy5zaXplKCk7ICsraSkKLSAg ICAgICAgICAgIGNvcmVXZWVrbHlDb3VudHNbaV0gPSBtYXgoW1t3ZWVrbHlDb3VudHMgX3dlYmtp dF9udW1iZXJBdEluZGV4OmldIGludFZhbHVlXSwgMCk7CisgICAgICAgICAgICBjb3JlV2Vla2x5 Q291bnRzW2ldID0gc3RkOjptYXgoW1t3ZWVrbHlDb3VudHMgX3dlYmtpdF9udW1iZXJBdEluZGV4 OmldIGludFZhbHVlXSwgMCk7CiAgICAgCiAgICAgICAgIGNvcmUoX3ByaXZhdGUpLT5hZG9wdFZp c2l0Q291bnRzKGNvcmVEYWlseUNvdW50cywgY29yZVdlZWtseUNvdW50cyk7CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5I b3N0TWFuYWdlci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBl UGx1Z2luSG9zdE1hbmFnZXIubW0KaW5kZXggZThjZWFiOWFhNjI2YjBiOGU5ZjViY2M4ZGQ3NjI4 MTQxMjViYmU3OS4uZWRmZWNiMTgxZGE2ZTNhNDZiZWJiYWU2N2E3MDMyNzJhNjRiMWFlMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5I b3N0TWFuYWdlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRz Y2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1tCkBAIC00NCw3ICs0NCw2IEBAIGV4dGVybiAiQyIgewog I2ltcG9ydCAiV2ViS2l0UGx1Z2luSG9zdC5oIgogfQogCi11c2luZyBuYW1lc3BhY2Ugc3RkOwog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtMjY4LDcg KzI2Nyw3IEBAIFBhc3NSZWZQdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5PiBOZXRzY2Fw ZVBsdWdpbkhvc3RNYW5hZ2VyOjppbnN0YW50aWF0ZVBsCiAgICAgICAgIGtyID0gX1dLUEhJbnN0 YW50aWF0ZVBsdWdpbihob3N0UHJveHktPnBvcnQoKSwgcmVxdWVzdElELCAodWludDhfdCopW2Rh dGEgYnl0ZXNdLCBbZGF0YSBsZW5ndGhdLCBpbnN0YW5jZS0+cGx1Z2luSUQoKSk7CiAgICAgfQog Ci0gICAgYXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpJbnN0YW50aWF0ZVBs dWdpblJlcGx5PiByZXBseSA9IGluc3RhbmNlLT53YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5J bnN0YW5jZVByb3h5OjpJbnN0YW50aWF0ZVBsdWdpblJlcGx5PihyZXF1ZXN0SUQpOworICAgIHN0 ZDo6YXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpJbnN0YW50aWF0ZVBsdWdp blJlcGx5PiByZXBseSA9IGluc3RhbmNlLT53YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0 YW5jZVByb3h5OjpJbnN0YW50aWF0ZVBsdWdpblJlcGx5PihyZXF1ZXN0SUQpOwogICAgIGlmICgh cmVwbHkuZ2V0KCkgfHwgcmVwbHktPm1fcmVzdWx0Q29kZSAhPSBLRVJOX1NVQ0NFU1MpIHsKICAg ICAgICAgaW5zdGFuY2UtPmNsZWFudXAoKTsKICAgICAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RQcm94 eS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9z dFByb3h5Lm1tCmluZGV4IGE2Nzg1NGM2NTk0MjczYWM3YmE0NTQ2YTc3YmU0ZjA0MWY1MGNiYTAu LjFiOGUyZTM0NzNiZmE3ODVkOTg3ZWFjMWFjOTdlNGI4YzA4YzQwOTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdFByb3h5Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9z dFByb3h5Lm1tCkBAIC00NSw3ICs0NSw2IEBAIGV4dGVybiAiQyIgewogI2ltcG9ydCAiV2ViS2l0 UGx1Z2luQ2xpZW50U2VydmVyLmgiCiB9CiAKLXVzaW5nIG5hbWVzcGFjZSBzdGQ7CiB1c2luZyBu YW1lc3BhY2UgSlNDOwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94 eS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eS5tbQppbmRleCBiMDRkZDE3YWJlNGI1MmE0NDRmMjY1OTU2ZTk5YTA2YzI2NjU4 MDIyLi4wOGZjZTVkN2UwYTdkZTUyM2IxZTMzMWExYmU1Njc5NjIwOTg2ODNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkluc3RhbmNl UHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQ bHVnaW5JbnN0YW5jZVByb3h5Lm1tCkBAIC03Myw3ICs3Myw2IEBAIGV4dGVybiAiQyIgewogCiB1 c2luZyBuYW1lc3BhY2UgSlNDOwogdXNpbmcgbmFtZXNwYWNlIEpTQzo6QmluZGluZ3M7Ci11c2lu ZyBuYW1lc3BhY2Ugc3RkOwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewpAQCAtMTUyLDcgKzE1MSw3IEBAIHVpbnQzMl90IE5ldHNjYXBlUGx1Z2luSW5zdGFu Y2VQcm94eTo6TG9jYWxPYmplY3RNYXA6OmlkRm9yT2JqZWN0KFZNJiB2bSwgSlNPYmplCiAgICAg fSB3aGlsZSAoIW1fb2JqZWN0SURDb3VudGVyIHx8IG1fb2JqZWN0SURDb3VudGVyID09IHN0YXRp Y19jYXN0PHVpbnQzMl90PigtMSkgfHwgbV9pZFRvSlNPYmplY3RNYXAuY29udGFpbnMob2JqZWN0 SUQpKTsKIAogICAgIG1faWRUb0pTT2JqZWN0TWFwLnNldChvYmplY3RJRCwgU3Ryb25nPEpTT2Jq ZWN0Pih2bSwgb2JqZWN0KSk7Ci0gICAgbV9qc09iamVjdFRvSURNYXAuc2V0KG9iamVjdCwgbWFr ZV9wYWlyKG9iamVjdElELCAxKSk7CisgICAgbV9qc09iamVjdFRvSURNYXAuc2V0KG9iamVjdCwg c3RkOjptYWtlX3BhaXIob2JqZWN0SUQsIDEpKTsKIAogICAgIHJldHVybiBvYmplY3RJRDsKIH0K QEAgLTQ4Myw3ICs0ODIsNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6d2hl ZWxFdmVudChOU1ZpZXcgKnBsdWdpblZpZXcsIE5TRXZlbnQgKmV2ZW50KQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHBsdWdpblBvaW50LngsIHBsdWdpblBvaW50LnksIFtldmVu dCBidXR0b25OdW1iZXJdLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbZXZl bnQgZGVsdGFYXSwgW2V2ZW50IGRlbHRhWV0sIFtldmVudCBkZWx0YVpdKTsKICAgICAKLSAgICBh dXRvX3B0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4gcmVwbHkg PSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+ KHJlcXVlc3RJRCk7CisgICAgc3RkOjphdXRvX3B0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHk6OkJvb2xlYW5SZXBseT4gcmVwbHkgPSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0 YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+KHJlcXVlc3RJRCk7CiAgICAgaWYgKCFyZXBseS5nZXQo KSB8fCAhcmVwbHktPm1fcmVzdWx0KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCkBAIC00 OTUsNyArNDk0LDcgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnByaW50KENH Q29udGV4dFJlZiBjb250ZXh0LCB1bnNpZ25lZCB3aWR0aCwgdW4KICAgICB1aW50MzJfdCByZXF1 ZXN0SUQgPSBuZXh0UmVxdWVzdElEKCk7CiAgICAgX1dLUEhQbHVnaW5JbnN0YW5jZVByaW50KG1f cGx1Z2luSG9zdFByb3h5LT5wb3J0KCksIG1fcGx1Z2luSUQsIHJlcXVlc3RJRCwgd2lkdGgsIGhl aWdodCk7CiAgICAgCi0gICAgYXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpC b29sZWFuQW5kRGF0YVJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk6OkJvb2xlYW5BbmREYXRhUmVwbHk+KHJlcXVlc3RJRCk7CisgICAgc3RkOjph dXRvX3B0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5BbmREYXRhUmVwbHk+ IHJlcGx5ID0gd2FpdEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVh bkFuZERhdGFSZXBseT4ocmVxdWVzdElEKTsKICAgICBpZiAoIXJlcGx5LmdldCgpIHx8ICFyZXBs eS0+bV9yZXR1cm5WYWx1ZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC01MTgsNyArNTE3LDcgQEAg dm9pZCBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNuYXBzaG90KENHQ29udGV4dFJlZiBj b250ZXh0LCB1bnNpZ25lZCB3aWR0aCwKICAgICB1aW50MzJfdCByZXF1ZXN0SUQgPSBuZXh0UmVx dWVzdElEKCk7CiAgICAgX1dLUEhQbHVnaW5JbnN0YW5jZVNuYXBzaG90KG1fcGx1Z2luSG9zdFBy b3h5LT5wb3J0KCksIG1fcGx1Z2luSUQsIHJlcXVlc3RJRCwgd2lkdGgsIGhlaWdodCk7CiAgICAg Ci0gICAgYXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuQW5kRGF0 YVJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6 OkJvb2xlYW5BbmREYXRhUmVwbHk+KHJlcXVlc3RJRCk7CisgICAgc3RkOjphdXRvX3B0cjxOZXRz Y2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5BbmREYXRhUmVwbHk+IHJlcGx5ID0gd2Fp dEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhbkFuZERhdGFSZXBs eT4ocmVxdWVzdElEKTsKICAgICBpZiAoIXJlcGx5LmdldCgpIHx8ICFyZXBseS0+bV9yZXR1cm5W YWx1ZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC01OTYsNyArNTk1LDcgQEAgTlBFcnJvciBOZXRz Y2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmxvYWRVUkwoY29uc3QgY2hhciogdXJsLCBjb25zdCBj aGFyKiB0YXJnZXQKICAgICAgICAgICAgICAgICAgICAgTlNTdHJpbmcgKmNvbnRlbnRMZW5ndGgg PSBbaGVhZGVyIG9iamVjdEZvcktleTpAIkNvbnRlbnQtTGVuZ3RoIl07CiAKICAgICAgICAgICAg ICAgICAgICAgaWYgKGNvbnRlbnRMZW5ndGgpCi0gICAgICAgICAgICAgICAgICAgICAgICBkYXRh TGVuZ3RoID0gbWluKHN0YXRpY19jYXN0PHVuc2lnbmVkPihbY29udGVudExlbmd0aCBpbnRWYWx1 ZV0pLCBkYXRhTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFMZW5ndGggPSBz dGQ6Om1pbihzdGF0aWNfY2FzdDx1bnNpZ25lZD4oW2NvbnRlbnRMZW5ndGggaW50VmFsdWVdKSwg ZGF0YUxlbmd0aCk7CiAgICAgICAgICAgICAgICAgICAgIFtoZWFkZXIgcmVtb3ZlT2JqZWN0Rm9y S2V5OkAiQ29udGVudC1MZW5ndGgiXTsKIAogICAgICAgICAgICAgICAgICAgICBpZiAoW2hlYWRl ciBjb3VudF0gPiAwKQpAQCAtMTQyMyw3ICsxNDIyLDcgQEAgUGFzc1JlZlB0cjxJbnN0YW5jZT4g TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpjcmVhdGVCaW5kaW5nc0luc3RhbmNlKFBhc3NS ZWYKICAgICBpZiAoX1dLUEhHZXRTY3JpcHRhYmxlTlBPYmplY3QobV9wbHVnaW5Ib3N0UHJveHkt PnBvcnQoKSwgbV9wbHVnaW5JRCwgcmVxdWVzdElEKSAhPSBLRVJOX1NVQ0NFU1MpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgYXV0b19wdHI8R2V0U2NyaXB0YWJsZU5QT2JqZWN0UmVwbHk+IHJl cGx5ID0gd2FpdEZvclJlcGx5PEdldFNjcmlwdGFibGVOUE9iamVjdFJlcGx5PihyZXF1ZXN0SUQp OworICAgIHN0ZDo6YXV0b19wdHI8R2V0U2NyaXB0YWJsZU5QT2JqZWN0UmVwbHk+IHJlcGx5ID0g d2FpdEZvclJlcGx5PEdldFNjcmlwdGFibGVOUE9iamVjdFJlcGx5PihyZXF1ZXN0SUQpOwogICAg IGlmICghcmVwbHkuZ2V0KCkpCiAgICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9Qcm94eUluc3RhbmNlLm1tIGIvU291cmNlL1dl YktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvUHJveHlJbnN0YW5jZS5tbQppbmRleCAyY2Y1ZjdjMjdm NDUxODk2NmQxZjRkMTdkNjJiZjRiNjk0YTQ2OTY0Li45OTFkYzgyYzlhMjkyMzhhMWIzZTBlMjI1 NjIzMmQ0MTJlYmEyZjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL0hv c3RlZC9Qcm94eUluc3RhbmNlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvSG9z dGVkL1Byb3h5SW5zdGFuY2UubW0KQEAgLTQzLDcgKzQzLDYgQEAgZXh0ZXJuICJDIiB7CiAKIHVz aW5nIG5hbWVzcGFjZSBKU0M7CiB1c2luZyBuYW1lc3BhY2UgSlNDOjpCaW5kaW5nczsKLXVzaW5n IG5hbWVzcGFjZSBzdGQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdl YktpdCB7CkBAIC0xNjMsNyArMTYyLDcgQEAgSlNWYWx1ZSBQcm94eUluc3RhbmNlOjppbnZva2Uo SlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEludm9rZVR5cGUgdHlwZSwgdWludDY0X3QgaWQKICAgICAg ICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAgICAgfQogICAgIAotICAgIGF1dG9fcHRyPE5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhbkFuZERhdGFSZXBseT4gcmVwbHkgPSB3YWl0 Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuQW5kRGF0YVJlcGx5 PihyZXF1ZXN0SUQpOworICAgIHN0ZDo6YXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVBy b3h5OjpCb29sZWFuQW5kRGF0YVJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBs dWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5BbmREYXRhUmVwbHk+KHJlcXVlc3RJRCk7CiAgICAg TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Ojptb3ZlR2xvYmFsRXhjZXB0aW9uVG9FeGVjU3Rh dGUoZXhlYyk7CiAKICAgICBpZiAobV9pbnN0YW5jZVByb3h5KSB7CkBAIC0yNDIsNyArMjQxLDcg QEAgYm9vbCBQcm94eUluc3RhbmNlOjpzdXBwb3J0c0ludm9rZURlZmF1bHRNZXRob2QoKSBjb25z dAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX29iamVjdElE KSAhPSBLRVJOX1NVQ0NFU1MpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKLSAgICBhdXRv X3B0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4gcmVwbHkgPSB3 YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+KHJl cXVlc3RJRCk7CisgICAgc3RkOjphdXRvX3B0cjxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6 OkJvb2xlYW5SZXBseT4gcmVwbHkgPSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5j ZVByb3h5OjpCb29sZWFuUmVwbHk+KHJlcXVlc3RJRCk7CiAgICAgaWYgKHJlcGx5LmdldCgpICYm IHJlcGx5LT5tX3Jlc3VsdCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIApAQCAtMjY2 LDcgKzI2NSw3IEBAIGJvb2wgUHJveHlJbnN0YW5jZTo6c3VwcG9ydHNDb25zdHJ1Y3QoKSBjb25z dAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fb2JqZWN0SUQpICE9 IEtFUk5fU1VDQ0VTUykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIGF1dG9fcHRy PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhblJlcGx5PiByZXBseSA9IHdhaXRG b3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4ocmVxdWVz dElEKTsKKyAgICBzdGQ6OmF1dG9fcHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9v bGVhblJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHk6OkJvb2xlYW5SZXBseT4ocmVxdWVzdElEKTsKICAgICBpZiAocmVwbHkuZ2V0KCkgJiYgcmVw bHktPm1fcmVzdWx0KQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgCkBAIC0zMjAsNyAr MzE5LDcgQEAgdm9pZCBQcm94eUluc3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSog ZXhlYywgUHJvcGVydHlOYW1lQXJyYXkmIG5hbWVBcnIKICAgICBpZiAoX1dLUEhOUE9iamVjdEVu dW1lcmF0ZShtX2luc3RhbmNlUHJveHktPmhvc3RQcm94eSgpLT5wb3J0KCksIG1faW5zdGFuY2VQ cm94eS0+cGx1Z2luSUQoKSwgcmVxdWVzdElELCBtX29iamVjdElEKSAhPSBLRVJOX1NVQ0NFU1Mp CiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBhdXRvX3B0cjxOZXRzY2FwZVBsdWdpbkluc3Rh bmNlUHJveHk6OkJvb2xlYW5BbmREYXRhUmVwbHk+IHJlcGx5ID0gd2FpdEZvclJlcGx5PE5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhbkFuZERhdGFSZXBseT4ocmVxdWVzdElEKTsK KyAgICBzdGQ6OmF1dG9fcHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhbkFu ZERhdGFSZXBseT4gcmVwbHkgPSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVBy b3h5OjpCb29sZWFuQW5kRGF0YVJlcGx5PihyZXF1ZXN0SUQpOwogICAgIE5ldHNjYXBlUGx1Z2lu SW5zdGFuY2VQcm94eTo6bW92ZUdsb2JhbEV4Y2VwdGlvblRvRXhlY1N0YXRlKGV4ZWMpOwogICAg IGlmICghcmVwbHkuZ2V0KCkgfHwgIXJlcGx5LT5tX3JldHVyblZhbHVlKQogICAgICAgICByZXR1 cm47CkBAIC0zNjcsNyArMzY2LDcgQEAgTWV0aG9kKiBQcm94eUluc3RhbmNlOjptZXRob2ROYW1l ZChQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1fb2JqZWN0SUQsIG1ldGhvZE5hbWUpICE9IEtFUk5fU1VDQ0VTUykKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgCi0gICAgYXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpC b29sZWFuUmVwbHk+IHJlcGx5ID0gd2FpdEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eTo6Qm9vbGVhblJlcGx5PihyZXF1ZXN0SUQpOworICAgIHN0ZDo6YXV0b19wdHI8TmV0c2Nh cGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+IHJlcGx5ID0gd2FpdEZvclJlcGx5 PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhblJlcGx5PihyZXF1ZXN0SUQpOwog ICAgIGlmICghcmVwbHkuZ2V0KCkpCiAgICAgICAgIHJldHVybiAwOwogCkBAIC00MDQsNyArNDAz LDcgQEAgRmllbGQqIFByb3h5SW5zdGFuY2U6OmZpZWxkTmFtZWQoUHJvcGVydHlOYW1lIHByb3Bl cnR5TmFtZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fb2JqZWN0SUQsIGlk ZW50aWZpZXIpICE9IEtFUk5fU1VDQ0VTUykKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCi0gICAg YXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuUmVwbHk+IHJlcGx5 ID0gd2FpdEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhblJlcGx5 PihyZXF1ZXN0SUQpOworICAgIHN0ZDo6YXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVBy b3h5OjpCb29sZWFuUmVwbHk+IHJlcGx5ID0gd2FpdEZvclJlcGx5PE5ldHNjYXBlUGx1Z2luSW5z dGFuY2VQcm94eTo6Qm9vbGVhblJlcGx5PihyZXF1ZXN0SUQpOwogICAgIGlmICghcmVwbHkuZ2V0 KCkpCiAgICAgICAgIHJldHVybiAwOwogICAgIApAQCAtNDMxLDcgKzQzMCw3IEBAIEpTQzo6SlNW YWx1ZSBQcm94eUluc3RhbmNlOjpmaWVsZFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgRmll bGQqIGZpZWxkKSBjb25zCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX29iamVj dElELCBzZXJ2ZXJJZGVudGlmaWVyKSAhPSBLRVJOX1NVQ0NFU1MpCiAgICAgICAgIHJldHVybiBq c1VuZGVmaW5lZCgpOwogICAgIAotICAgIGF1dG9fcHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eTo6Qm9vbGVhbkFuZERhdGFSZXBseT4gcmVwbHkgPSB3YWl0Rm9yUmVwbHk8TmV0c2NhcGVQ bHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuQW5kRGF0YVJlcGx5PihyZXF1ZXN0SUQpOworICAg IHN0ZDo6YXV0b19wdHI8TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpCb29sZWFuQW5kRGF0 YVJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6 OkJvb2xlYW5BbmREYXRhUmVwbHk+KHJlcXVlc3RJRCk7CiAgICAgTmV0c2NhcGVQbHVnaW5JbnN0 YW5jZVByb3h5Ojptb3ZlR2xvYmFsRXhjZXB0aW9uVG9FeGVjU3RhdGUoZXhlYyk7CiAgICAgaWYg KCFyZXBseS5nZXQoKSB8fCAhcmVwbHktPm1fcmV0dXJuVmFsdWUpCiAgICAgICAgIHJldHVybiBq c1VuZGVmaW5lZCgpOwpAQCAtNDYxLDcgKzQ2MCw3IEBAIHZvaWQgUHJveHlJbnN0YW5jZTo6c2V0 RmllbGRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEZpZWxkKiBmaWVsZCwgSlNWYWx1ZSB2 CiAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykKICAgICAgICAgcmV0dXJuOwogICAgIAotICAg IGF1dG9fcHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Qm9vbGVhblJlcGx5PiByZXBs eSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OkJvb2xlYW5SZXBs eT4ocmVxdWVzdElEKTsKKyAgICBzdGQ6OmF1dG9fcHRyPE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eTo6Qm9vbGVhblJlcGx5PiByZXBseSA9IHdhaXRGb3JSZXBseTxOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk6OkJvb2xlYW5SZXBseT4ocmVxdWVzdElEKTsKICAgICBOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6Om1vdmVHbG9iYWxFeGNlcHRpb25Ub0V4ZWNTdGF0ZShleGVjKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFj a2FnZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2Uu bW0KaW5kZXggMTk4NGEwYjUxNWNkNmEwNDIwOTI3YzZhNmJmYjMyZjc5ZDZjNTM3MS4uYTdiMzll NWZlZTA1NGQzNmVhNDZmMzkxZGFhZDIyYzYxOGZkYWU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCkBAIC02MCw3ICs2MCw2IEBA CiAtIChOU0FycmF5ICopX3dlYl9sb3dlcmNhc2VTdHJpbmdzOwogQGVuZDsKIAotdXNpbmcgbmFt ZXNwYWNlIHN0ZDsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBAaW1wbGVtZW50YXRpb24g V2ViQmFzZVBsdWdpblBhY2thZ2UKQEAgLTMxMCw3ICszMDksNyBAQCBzdGF0aWMgTlNTdHJpbmcg KnBhdGhCeVJlc29sdmluZ1N5bWxpbmtzQW5kQWxpYXNlcyhOU1N0cmluZyAqdGhlUGF0aCkKICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBsdWdpbkluZm8ubWltZXMuc2l6ZSgpOyArK2kpIHsK ICAgICAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGV4dGVuc2lvbnMgPSBwbHVnaW5JbmZvLm1p bWVzW2ldLmV4dGVuc2lvbnM7CiAKLSAgICAgICAgaWYgKGZpbmQoZXh0ZW5zaW9ucy5iZWdpbigp LCBleHRlbnNpb25zLmVuZCgpLCBleHRlbnNpb24pICE9IGV4dGVuc2lvbnMuZW5kKCkpCisgICAg ICAgIGlmIChzdGQ6OmZpbmQoZXh0ZW5zaW9ucy5iZWdpbigpLCBleHRlbnNpb25zLmVuZCgpLCBl eHRlbnNpb24pICE9IGV4dGVuc2lvbnMuZW5kKCkpCiAgICAgICAgICAgICByZXR1cm4gWUVTOwog ICAgIH0KIApAQCAtMzM3LDcgKzMzNiw3IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aEJ5UmVzb2x2 aW5nU3ltbGlua3NBbmRBbGlhc2VzKE5TU3RyaW5nICp0aGVQYXRoKQogICAgICAgICBjb25zdCBN aW1lQ2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZvID0gcGx1Z2luSW5mby5taW1lc1tpXTsKICAgICAg ICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGV4dGVuc2lvbnMgPSBtaW1lQ2xhc3NJbmZvLmV4dGVu c2lvbnM7CiAKLSAgICAgICAgaWYgKGZpbmQoZXh0ZW5zaW9ucy5iZWdpbigpLCBleHRlbnNpb25z LmVuZCgpLCBleHRlbnNpb24pICE9IGV4dGVuc2lvbnMuZW5kKCkpCisgICAgICAgIGlmIChzdGQ6 OmZpbmQoZXh0ZW5zaW9ucy5iZWdpbigpLCBleHRlbnNpb25zLmVuZCgpLCBleHRlbnNpb24pICE9 IGV4dGVuc2lvbnMuZW5kKCkpCiAgICAgICAgICAgICByZXR1cm4gbWltZUNsYXNzSW5mby50eXBl OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRz Y2FwZVBsdWdpblN0cmVhbS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2Nh cGVQbHVnaW5TdHJlYW0ubW0KaW5kZXggNGMzMjZhNjQ2NzVmZWRjOTUwZDRjZDBjMTE0NjZhMWZj ZWNlMWJkZS4uNjY0Y2Q4NzJjNDJiNDE0M2QwOTkyNGZjZjA4MWZlMWVkZTA4OTY4ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblN0cmVhbS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luU3RyZWFt Lm1tCkBAIC01NCw3ICs1NCw2IEBACiAjaW1wb3J0IDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogI2RlZmluZSBX RUJfUkVBU09OX05PTkUgLTEKIApAQCAtNTIzLDcgKzUyMiw3IEBAIHZvaWQgV2ViTmV0c2NhcGVQ bHVnaW5TdHJlYW06OmRlbGl2ZXJEYXRhKCkKICAgICAgICAgICAgICAgICBtX2RlbGl2ZXJEYXRh VGltZXIuc3RhcnRPbmVTaG90KDApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICBkZWxpdmVyeUJ5dGVzID0gbWluKGRlbGl2ZXJ5Qnl0ZXMsIHRvdGFs Qnl0ZXMgLSB0b3RhbEJ5dGVzRGVsaXZlcmVkKTsKKyAgICAgICAgICAgIGRlbGl2ZXJ5Qnl0ZXMg PSBzdGQ6Om1pbihkZWxpdmVyeUJ5dGVzLCB0b3RhbEJ5dGVzIC0gdG90YWxCeXRlc0RlbGl2ZXJl ZCk7CiAgICAgICAgICAgICBOU0RhdGEgKnN1YmRhdGEgPSBbbV9kZWxpdmVyeURhdGEuZ2V0KCkg c3ViZGF0YVdpdGhSYW5nZTpOU01ha2VSYW5nZSh0b3RhbEJ5dGVzRGVsaXZlcmVkLCBkZWxpdmVy eUJ5dGVzKV07CiAgICAgICAgICAgICBQbHVnaW5TdG9wRGVmZXJyZXIgZGVmZXJyZXIobV9wbHVn aW5WaWV3LmdldCgpKTsKICAgICAgICAgICAgIGRlbGl2ZXJ5Qnl0ZXMgPSBtX3BsdWdpbkZ1bmNz LT53cml0ZShtX3BsdWdpbiwgJm1fc3RyZWFtLCBtX29mZnNldCwgW3N1YmRhdGEgbGVuZ3RoXSwg KHZvaWQgKilbc3ViZGF0YSBieXRlc10pOwpAQCAtNTMyLDcgKzUzMSw3IEBAIHZvaWQgV2ViTmV0 c2NhcGVQbHVnaW5TdHJlYW06OmRlbGl2ZXJEYXRhKCkKICAgICAgICAgICAgICAgICBjYW5jZWxM b2FkQW5kRGVzdHJveVN0cmVhbVdpdGhFcnJvcihwbHVnaW5DYW5jZWxsZWRDb25uZWN0aW9uRXJy b3IoKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgZGVsaXZlcnlCeXRlcyA9IG1pbjxpbnQzMl90PihkZWxpdmVyeUJ5dGVzLCBbc3ViZGF0YSBs ZW5ndGhdKTsKKyAgICAgICAgICAgIGRlbGl2ZXJ5Qnl0ZXMgPSBzdGQ6Om1pbjxpbnQzMl90Pihk ZWxpdmVyeUJ5dGVzLCBbc3ViZGF0YSBsZW5ndGhdKTsKICAgICAgICAgICAgIG1fb2Zmc2V0ICs9 IGRlbGl2ZXJ5Qnl0ZXM7CiAgICAgICAgICAgICB0b3RhbEJ5dGVzRGVsaXZlcmVkICs9IGRlbGl2 ZXJ5Qnl0ZXM7CiAgICAgICAgICAgICBMT0coUGx1Z2lucywgIk5QUF9Xcml0ZSByZXNwb25zZVVS TD0lQCBieXRlcz0lZCB0b3RhbC1kZWxpdmVyZWQ9JWQvJWQiLCBtX3Jlc3BvbnNlVVJMLmdldCgp LCBkZWxpdmVyeUJ5dGVzLCBtX29mZnNldCwgbV9zdHJlYW0uZW5kKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5WaWV3Lm1tIGIvU291cmNl L1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KaW5kZXggZmQ3YzRi YmVjMWM2YzlhNDhjM2M5YjdiNTg4MzZkZDY5MzkzOWYzMi4uYmNhZmNhYWJiN2MzNDBmMzc1MTZh ZWM0NjIxNTVkNDUyYzQ5NDYxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lu cy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lu cy9XZWJOZXRzY2FwZVBsdWdpblZpZXcubW0KQEAgLTkxLDcgKzkxLDYgQEAgc3RhdGljIGNvbnN0 IGludCBXS05WU2lsdmVybGlnaHRGdWxsc2NyZWVuUGVyZm9ybWFuY2VJc3N1ZUZpeGVkID0gNzI4 ODU0NjsgLyogVFIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2Ug V2ViS2l0OwotdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogc3RhdGljIGlubGluZSBib29sIGlzRHJh d2luZ01vZGVsUXVpY2tEcmF3KE5QRHJhd2luZ01vZGVsIGRyYXdpbmdNb2RlbCkKIHsKQEAgLTEz Niw3ICsxMzUsNyBAQCBwdWJsaWM6CiAgICAgICAgIGRvdWJsZSB0aW1lSW50ZXJ2YWwgPSBtX2lu dGVydmFsIC8gMTAwMC4wOwogICAgICAgICAKICAgICAgICAgaWYgKHRocm90dGxlKQotICAgICAg ICAgICAgdGltZUludGVydmFsID0gbWF4KHRpbWVJbnRlcnZhbCwgVGhyb3R0bGVkVGltZXJJbnRl cnZhbCk7CisgICAgICAgICAgICB0aW1lSW50ZXJ2YWwgPSBzdGQ6Om1heCh0aW1lSW50ZXJ2YWws IFRocm90dGxlZFRpbWVySW50ZXJ2YWwpOwogICAgICAgICAKICAgICAgICAgaWYgKG1fcmVwZWF0 KQogICAgICAgICAgICAgc3RhcnRSZXBlYXRpbmcodGltZUludGVydmFsKTsKQEAgLTE4NTEsNyAr MTg1MCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBnZXROUFJlY3QoY29uc3QgTlNSZWN0JiBuciwg TlBSZWN0JiBucHIpCiAgICAgICAgICAgICAgICAgTlNTdHJpbmcgKmNvbnRlbnRMZW5ndGggPSBb aGVhZGVyIG9iamVjdEZvcktleTpAIkNvbnRlbnQtTGVuZ3RoIl07CiAKICAgICAgICAgICAgICAg ICBpZiAoY29udGVudExlbmd0aCAhPSBuaWwpCi0gICAgICAgICAgICAgICAgICAgIGRhdGFMZW5n dGggPSBtaW48dW5zaWduZWQ+KFtjb250ZW50TGVuZ3RoIGludFZhbHVlXSwgZGF0YUxlbmd0aCk7 CisgICAgICAgICAgICAgICAgICAgIGRhdGFMZW5ndGggPSBzdGQ6Om1pbjx1bnNpZ25lZD4oW2Nv bnRlbnRMZW5ndGggaW50VmFsdWVdLCBkYXRhTGVuZ3RoKTsKICAgICAgICAgICAgICAgICBbaGVh ZGVyIHJlbW92ZU9iamVjdEZvcktleTpAIkNvbnRlbnQtTGVuZ3RoIl07CiAKICAgICAgICAgICAg ICAgICBpZiAoW2hlYWRlciBjb3VudF0gPiAwKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IDJlNzMx ODZiN2E4YjBiY2VhN2M1ZjMwNzJmMTQxNjNmODRmNjM0NWIuLmU5NWNkMTQzYjAxZTM1NTUyODA1 Yjc0NmNkM2JlMWQ3MjMzN2E3ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCkBAIC0xNDAsNyArMTQwLDYg QEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwotdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogLy8gRm9yIGJhY2t3YXJkcyBjb21wYXRpYmlsaXR5 IHdpdGggb2xkZXIgV2ViS2l0IHBsdWctaW5zLgogTlNTdHJpbmcgKldlYlBsdWdpbkJhc2VVUkxL ZXkgPSBAIldlYlBsdWdpbkJhc2VVUkwiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJGcmFtZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUu bW0KaW5kZXggZGVlYTk2YjY2MzExODY3OTRmY2RmMmEzMWI5Y2ZkMGI2YWVjM2JjMC4uMTJiOWZi YzE5MTc2ZDYyYjYxNGViNTgyM2FkOThhNTU1MzU0ZmE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkZyYW1lLm1tCkBAIC0xMDQsNyArMTA0LDYgQEAKICNpbXBvcnQgPHJ1bnRpbWUvSlND SlNWYWx1ZS5oPgogI2ltcG9ydCA8d3RmL0N1cnJlbnRUaW1lLmg+CiAKLXVzaW5nIG5hbWVzcGFj ZSBzdGQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCmluZGV4IDJkMzI2 M2M5N2QxZDNlZmFhMWFjZTJkZmJiYmM0YTBjZjQyMTM0MjguLjU4NDhiOWRkMGY2Y2ZjODNkNmZj Y2I2MjMzYjkyNmExYmU0ZmE1NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1M Vmlldy5tbQpAQCAtMTM4LDcgKzEzOCw2IEBACiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVz aW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiB1c2luZyBuYW1lc3BhY2UgV1RGOwotdXNpbmcgbmFt ZXNwYWNlIHN0ZDsKIAogQGludGVyZmFjZSBXZWJNZW51VGFyZ2V0IDogTlNPYmplY3QgewogICAg IFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxlciogX21lbnVDb250cm9sbGVyOwpAQCAtMjIx NSw3ICsyMjE0LDcgQEAgc3RhdGljIGJvb2wgbW91c2VFdmVudElzUGFydE9mQ2xpY2tPckRyYWco TlNFdmVudCAqZXZlbnQpCiAjaWZkZWYgX19MUDY0X18KICAgICAvLyBJZiB0aGUgbmV3IGJvdHRv bSBpcyBlcXVhbCB0byB0aGUgb2xkIGJvdHRvbSAod2hlbiBib3RoIGFyZSB0cmVhdGVkIGFzIGZs b2F0cyksIHdlIGp1c3QgcmV0dXJuIHRoZSBvcmlnaW5hbAogICAgIC8vIGJvdHRvbS4gVGhpcyBw cmV2ZW50cyByb3VuZGluZyBlcnJvcnMgdGhhdCBjYW4gb2NjdXIgd2hlbiBjb252ZXJ0aW5nIG5l d0JvdHRvbSB0byBhIGRvdWJsZS4KLSAgICBpZiAoZmFicyhzdGF0aWNfY2FzdDxmbG9hdD4oYm90 dG9tKSAtIG5ld0JvdHRvbSkgPD0gbnVtZXJpY19saW1pdHM8ZmxvYXQ+OjplcHNpbG9uKCkpIAor ICAgIGlmIChmYWJzKHN0YXRpY19jYXN0PGZsb2F0Pihib3R0b20pIC0gbmV3Qm90dG9tKSA8PSBz dGQ6Om51bWVyaWNfbGltaXRzPGZsb2F0Pjo6ZXBzaWxvbigpKSAKICAgICAgICAgcmV0dXJuIGJv dHRvbTsKICAgICBlbHNlCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVGV4dENvbXBsZXRpb25Db250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJUZXh0Q29tcGxldGlvbkNvbnRyb2xsZXIubW0KaW5kZXggZjhmMWNkM2Y3ZmFj Y2M2OGUzMTk0NDM5ODRiZGQ0NzFkN2FlOWQ5NC4uZGJmNDhhZWUzNjFjZDI5MjUwMjI5NWRjNTU0 NGU4MjI3MmFjZTJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJU ZXh0Q29tcGxldGlvbkNvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJUZXh0Q29tcGxldGlvbkNvbnRyb2xsZXIubW0KQEAgLTQxLDcgKzQxLDYgQEAKIEBlbmQK IAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2luZyBuYW1lc3BhY2Ugc3RkOwogCiAvLyBU aGlzIGNsYXNzIGhhbmRsZXMgdGhlIGNvbXBsZXRlOiBvcGVyYXRpb24uCiAvLyBJdCBjb3VudHMg b24gaXRzIGhvc3QgdmlldyB0byBjYWxsIGVuZFJldmVydGluZ0NoYW5nZTogd2hlbmV2ZXIgdGhl IGN1cnJlbnQgY29tcGxldGlvbiBuZWVkcyB0byBiZSBhYm9ydGVkLgpAQCAtMTQ4LDggKzE0Nyw4 IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAgICAgICAgIG1heFdpZHRoID0gY2VpbGYoW05TU2Ny b2xsVmlldyBmcmFtZVNpemVGb3JDb250ZW50U2l6ZTpOU01ha2VTaXplKG1heFdpZHRoLCAxMDAu MGYpIGhhc0hvcml6b250YWxTY3JvbGxlcjpOTyBoYXNWZXJ0aWNhbFNjcm9sbGVyOllFUyBib3Jk ZXJUeXBlOk5TTm9Cb3JkZXJdLndpZHRoKTsKICAgICAgICAgbWF4V2lkdGggPSBjZWlsZihbTlNX aW5kb3cgZnJhbWVSZWN0Rm9yQ29udGVudFJlY3Q6TlNNYWtlUmVjdCgwLjBmLCAwLjBmLCBtYXhX aWR0aCwgMTAwLjBmKSBzdHlsZU1hc2s6TlNCb3JkZXJsZXNzV2luZG93TWFza10uc2l6ZS53aWR0 aCk7CiAgICAgICAgIG1heFdpZHRoICs9IDUuMGY7Ci0gICAgICAgIHdpbmRvd0ZyYW1lLnNpemUu d2lkdGggPSBtYXgobWF4V2lkdGgsIHdpbmRvd0ZyYW1lLnNpemUud2lkdGgpOwotICAgICAgICBt YXhXaWR0aCA9IG1pbjxDR0Zsb2F0Pig0MDAsIHdpbmRvd0ZyYW1lLnNpemUud2lkdGgpOworICAg ICAgICB3aW5kb3dGcmFtZS5zaXplLndpZHRoID0gc3RkOjptYXgobWF4V2lkdGgsIHdpbmRvd0Zy YW1lLnNpemUud2lkdGgpOworICAgICAgICBtYXhXaWR0aCA9IHN0ZDo6bWluPENHRmxvYXQ+KDQw MCwgd2luZG93RnJhbWUuc2l6ZS53aWR0aCk7CiAgICAgfQogICAgIFtfcG9wdXBXaW5kb3cgc2V0 RnJhbWU6d2luZG93RnJhbWUgZGlzcGxheTpOT107CiAgICAgCg==