149979 2015-10-09 17:22:46 -0700 Don't allow plug-ins to override image types for <embed> elements 2015-10-12 10:26:10 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1132053 0 andersca 2015-10-09 17:22:46 -0700 Don't allow plug-ins to override image types for <embed> elements 1132055 1 262805 andersca 2015-10-09 17:25:49 -0700 Created attachment 262805 Patch 1132349 2 andersca 2015-10-12 10:26:10 -0700 Committed r190859: <http://trac.webkit.org/changeset/190859> 262805 2015-10-09 17:25:49 -0700 2015-10-09 17:55:53 -0700 Patch bug-149979-20151009172516.patch text/plain 27754 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWMxNGEzN2Q3MmI2ZmM0 YTAxODdhZmNjNTAxZGI3YWQ0NmMxMmFmNy4uMjRiZGJiZWM5YmU2MThhNzU4M2VkYTgyODBmNTVh OTY0MDk0NmUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE1LTEwLTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgRG9uJ3QgYWxsb3cg cGx1Zy1pbnMgdG8gb3ZlcnJpZGUgaW1hZ2UgdHlwZXMgZm9yIDxlbWJlZD4gZWxlbWVudHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTk3OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3AgYWxsb3dp bmcgcGx1Zy1pbnMgdG8gdGFrZSBvdmVyIGltYWdlIHR5cGVzIGZvciA8ZW1iZWQ+IGVsZW1lbnRz LiBXZSBhbHJlYWR5IGRvIHRoaXMKKyAgICAgICAgZm9yIDxvYmplY3Q+IGVsZW1lbnRzLCBidXQg aGFkIHRvIG1ha2UgPGVtYmVkPiBlbGVtZW50cyBleGVtcHQgYmVjYXVzZSBvZiB3ZWJraXQub3Jn L2IvNDkwMTYuCisgICAgICAgIFRoZSBRdWlja1RpbWUgcGx1Zy1pbiBoYXNuJ3Qgc3VwcG9ydGVk IGltYWdlIHR5cGVzIHNpbmNlIExpb24sIHNvIHRoZXJlJ3Mgbm8gcG9pbnQgaW4ga2VlcGluZyB0 aGlzIGNvZGUgYXJvdW5kLgorCisgICAgICAgICogaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MQXBwbGV0RWxlbWVudDo6SFRNTEFwcGxldEVsZW1lbnQp OgorICAgICAgICAqIGh0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MRW1iZWRFbGVtZW50OjpIVE1MRW1iZWRFbGVtZW50KToKKyAgICAgICAgKiBodG1sL0hU TUxPYmplY3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPYmplY3RFbGVtZW50 OjpIVE1MT2JqZWN0RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MT2JqZWN0RWxlbWVu dDo6cGFyYW1ldGVyc0ZvclBsdWdpbik6CisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhU TUxQbHVnSW5JbWFnZUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkltYWdl RWxlbWVudDo6aXNJbWFnZVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkltYWdl RWxlbWVudDo6d291bGRMb2FkQXNOZXRzY2FwZVBsdWdpbik6CisgICAgICAgICogaHRtbC9IVE1M UGx1Z0luSW1hZ2VFbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VF bGVtZW50OjpzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKTogRGVsZXRlZC4KKyAgICAgICAg KiBsb2FkZXIvRW1wdHlDbGllbnRzLmg6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50Lmg6CisgICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpyZXNvdXJjZVdpbGxVc2VQbHVnaW4pOgorICAgICAgICAo V2ViQ29yZTo6U3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6U3ViZnJhbWVMb2FkZXI6OnNob3VsZFVzZVBsdWdpbik6CisgICAgICAgICogbG9hZGVyL1N1 YmZyYW1lTG9hZGVyLmg6CisKKzIwMTUtMTAtMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgaGFjayB0aGF0IGFsbG93ZWQgcGx1Zy1pbnMg dG8gYWx3YXlzIHRha2Ugb3ZlciBjZXJ0YWluIGltYWdlIGZvcm1hdHMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTk3MgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggNGQxZGM3OTY0Y2UzMmU3YWRkYjQxYjIwNmM0ZDFjYzU4MzczYTRlMC4uZWQyZmRkMDlk MjU5NGY4NWIwZDNmNTg2ZmZhYzE5ZDRjYTkzNTM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDE1LTEwLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKKyAgICAgICAgRG9uJ3QgYWxsb3cgcGx1Zy1pbnMgdG8gb3ZlcnJpZGUgaW1hZ2UgdHlw ZXMgZm9yIDxlbWJlZD4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0OTk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAg ICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTUtMTAt MDYgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBY U0xUIHdoZW4gYnVpbGRpbmcgV2ViS2l0IGZvciBpT1MgdXNpbmcgdGhlIHB1YmxpYyBpT1MgU0RL CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L3dpbi9DaGFuZ2VMb2cKaW5kZXggMWUyY2Y3YzhhYzVlYjBhMzZhNmYxNGFjNDkzZjU5YWNlYjk3 MWRiMy4uODFhNTEwOTIyZTAwODdjMTFmOGJhOTNiOTFiNjg1OGViZmVjZDliNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTEwLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgYWxsb3cgcGx1Zy1pbnMgdG8gb3Zl cnJpZGUgaW1hZ2UgdHlwZXMgZm9yIDxlbWJlZD4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTk3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENv bnRlbnRUeXBlKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5oOgorCiAyMDE1LTEwLTA2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmVwb3J0IGVycm9yIHdoZW4gbWFpbiByZXNvdXJjZSBpcyBibG9j a2VkIGJ5IGNvbnRlbnQgYmxvY2tlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDkzNzQ0NGY4MzAyNjNlYWZkZDFm NWI0NWU5NDQ1M2NiZjcyMjM3ZDEuLjIyZTdjZWJhNzA2NzNjMWI3MjM2Mzc3ZWJiNmM2NGUxMDFh ODk1MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0xMC0wOSAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGFsbG93IHBsdWct aW5zIHRvIG92ZXJyaWRlIGltYWdlIHR5cGVzIGZvciA8ZW1iZWQ+IGVsZW1lbnRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk5NzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDoKKwogMjAxNS0xMC0w OSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgV0tXZWJWaWV3IG5l ZWRzIFNQSSB0byBjdXN0b21pemUgaW1tZWRpYXRlIGFjdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEFwcGxldEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKaW5kZXggNWI1ZWE2ODhjMjFkOGE4MDAyY2JlM2ZmZTI4 ZDBiMWYzOThhZjBhZC4uYTk3MTcxOTJhMjFhMzg0MTIyYWMwMTIwN2Q3OWMwMDMyYzg3M2Y1MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXBwbGV0RWxlbWVudC5jcHAKQEAgLTQxLDcgKzQx LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAog SFRNTEFwcGxldEVsZW1lbnQ6OkhUTUxBcHBsZXRFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUm IHRhZ05hbWUsIERvY3VtZW50JiBkb2N1bWVudCwgYm9vbCBjcmVhdGVkQnlQYXJzZXIpCi0gICAg OiBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50KHRhZ05hbWUsIGRvY3VtZW50LCBjcmVhdGVkQnlQYXJz ZXIsIFNob3VsZE5vdFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCisgICAgOiBIVE1MUGx1Z0luSW1h Z2VFbGVtZW50KHRhZ05hbWUsIGRvY3VtZW50LCBjcmVhdGVkQnlQYXJzZXIpCiB7CiAgICAgQVNT RVJUKGhhc1RhZ05hbWUoYXBwbGV0VGFnKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJl ZEVsZW1lbnQuY3BwCmluZGV4IDQwNTY1NTcxOTFiNWJiMDZjZTgxMDBkNWI0YzM3MGJhODQ3ZWU4 M2MuLmM2OWQ3ZjFjODAzZDI5ODkwZmNiNzBmMDMyMTI4Yzg4ZmZiMWU3ZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcApAQCAtNDQsNyArNDQsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiBpbmxpbmUgSFRNTEVt YmVkRWxlbWVudDo6SFRNTEVtYmVkRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1l LCBEb2N1bWVudCYgZG9jdW1lbnQsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKQotICAgIDogSFRNTFBs dWdJbkltYWdlRWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCwgY3JlYXRlZEJ5UGFyc2VyLCBTaG91 bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKQorICAgIDogSFRNTFBsdWdJbkltYWdlRWxlbWVudCh0 YWdOYW1lLCBkb2N1bWVudCwgY3JlYXRlZEJ5UGFyc2VyKQogewogICAgIEFTU0VSVChoYXNUYWdO YW1lKGVtYmVkVGFnKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxP YmplY3RFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQu Y3BwCmluZGV4IGY5ZDE5ODY1MDFjNWZhNGI4ZjU4ZmI2NGM2NGY4ZGJlNTYzMDA5NDQuLmMyNDE2 N2MwMTRkMWQ3MzVkMWQwZWExY2VjMmE1OTM1NTI3ZTdiYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCkBAIC02NCw3ICs2NCw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7CiAKIGlubGluZSBIVE1MT2JqZWN0RWxl bWVudDo6SFRNTE9iamVjdEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9j dW1lbnQmIGRvY3VtZW50LCBIVE1MRm9ybUVsZW1lbnQqIGZvcm0sIGJvb2wgY3JlYXRlZEJ5UGFy c2VyKQotICAgIDogSFRNTFBsdWdJbkltYWdlRWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCwgY3Jl YXRlZEJ5UGFyc2VyLCBTaG91bGROb3RQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKQorICAgIDogSFRN TFBsdWdJbkltYWdlRWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCwgY3JlYXRlZEJ5UGFyc2VyKQog ICAgICwgbV9kb2NOYW1lZEl0ZW0odHJ1ZSkKICAgICAsIG1fdXNlRmFsbGJhY2tDb250ZW50KGZh bHNlKQogewpAQCAtMjI4LDcgKzIyOCw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnBhcmFt ZXRlcnNGb3JQbHVnaW4oVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIFZlY3RvcjxTCiAKICAg ICBpZiAodXJsLmlzRW1wdHkoKSAmJiAhdXJsUGFyYW1ldGVyLmlzRW1wdHkoKSkgewogICAgICAg ICBTdWJmcmFtZUxvYWRlciYgbG9hZGVyID0gZG9jdW1lbnQoKS5mcmFtZSgpLT5sb2FkZXIoKS5z dWJmcmFtZUxvYWRlcigpOwotICAgICAgICBpZiAobG9hZGVyLnJlc291cmNlV2lsbFVzZVBsdWdp bih1cmxQYXJhbWV0ZXIsIHNlcnZpY2VUeXBlLCBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2Vz KCkpKQorICAgICAgICBpZiAobG9hZGVyLnJlc291cmNlV2lsbFVzZVBsdWdpbih1cmxQYXJhbWV0 ZXIsIHNlcnZpY2VUeXBlKSkKICAgICAgICAgICAgIHVybCA9IHVybFBhcmFtZXRlcjsKICAgICB9 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcApp bmRleCA1MGU0ZGE4NjRiMTA1ZWU3OGY1YTM1OGI4MjVmNjg4ZTEyMTk4MjFmLi4zZjZlYzRlZDhk ZjgxNmVkM2IyYzcxNGM3ZjgwMTgyMDg2OTE2NDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKQEAgLTk5LDE0ICs5OSwxMyBAQCBzdGF0aWMg Y29uc3QgU3RyaW5nIHN1YnRpdGxlVGV4dChQYWdlKiBwYWdlLCBTdHJpbmcgbWltZVR5cGUpCiAg ICAgcmV0dXJuIHN1YnRpdGxlVGV4dDsKIH07CiAKLUhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhU TUxQbHVnSW5JbWFnZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1l bnQmIGRvY3VtZW50LCBib29sIGNyZWF0ZWRCeVBhcnNlciwgUHJlZmVyUGx1Z0luc0ZvckltYWdl c09wdGlvbiBwcmVmZXJQbHVnSW5zRm9ySW1hZ2VzT3B0aW9uKQorSFRNTFBsdWdJbkltYWdlRWxl bWVudDo6SFRNTFBsdWdJbkltYWdlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1l LCBEb2N1bWVudCYgZG9jdW1lbnQsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKQogICAgIDogSFRNTFBs dWdJbkVsZW1lbnQodGFnTmFtZSwgZG9jdW1lbnQpCiAgICAgLy8gbV9uZWVkc1dpZGdldFVwZGF0 ZSghY3JlYXRlZEJ5UGFyc2VyKSBhbGxvd3MgSFRNTE9iamVjdEVsZW1lbnQgdG8gZGVsYXkKICAg ICAvLyB3aWRnZXQgdXBkYXRlcyB1bnRpbCBhZnRlciBhbGwgY2hpbGRyZW4gYXJlIHBhcnNlZC4g IEZvciBIVE1MRW1iZWRFbGVtZW50CiAgICAgLy8gdGhpcyBkZWxheSBpcyB1bm5lY2Vzc2FyeSwg YnV0IGl0IGlzIHNpbXBsZXIgdG8gbWFrZSBib3RoIGNsYXNzZXMgc2hhcmUKICAgICAvLyB0aGUg c2FtZSBjb2RlcGF0aCBpbiB0aGlzIGNsYXNzLgogICAgICwgbV9uZWVkc1dpZGdldFVwZGF0ZSgh Y3JlYXRlZEJ5UGFyc2VyKQotICAgICwgbV9zaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKHBy ZWZlclBsdWdJbnNGb3JJbWFnZXNPcHRpb24gPT0gU2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdl cykKICAgICAsIG1fbmVlZHNEb2N1bWVudEFjdGl2YXRpb25DYWxsYmFja3MoZmFsc2UpCiAgICAg LCBtX3NpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lcigqdGhpcywgJkhUTUxQbHVnSW5JbWFnZUVsZW1l bnQ6OnNpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lckZpcmVkLCBzaW11bGF0ZWRNb3VzZUNsaWNrVGlt ZXJEZWxheSkKICAgICAsIG1fcmVtb3ZlU25hcHNob3RUaW1lcigqdGhpcywgJkhUTUxQbHVnSW5J bWFnZUVsZW1lbnQ6OnJlbW92ZVNuYXBzaG90VGltZXJGaXJlZCkKQEAgLTE1Niw3ICsxNTUsNyBA QCBib29sIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OmlzSW1hZ2VUeXBlKCkKIAogICAgIGlmIChG cmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCkpIHsKICAgICAgICAgVVJMIGNvbXBsZXRl ZFVSTCA9IGRvY3VtZW50KCkuY29tcGxldGVVUkwobV91cmwpOwotICAgICAgICByZXR1cm4gZnJh bWUtPmxvYWRlcigpLmNsaWVudCgpLm9iamVjdENvbnRlbnRUeXBlKGNvbXBsZXRlZFVSTCwgbV9z ZXJ2aWNlVHlwZSwgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcygpKSA9PSBPYmplY3RDb250 ZW50SW1hZ2U7CisgICAgICAgIHJldHVybiBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkub2JqZWN0 Q29udGVudFR5cGUoY29tcGxldGVkVVJMLCBtX3NlcnZpY2VUeXBlKSA9PSBPYmplY3RDb250ZW50 SW1hZ2U7CiAgICAgfQogCiAgICAgcmV0dXJuIEltYWdlOjpzdXBwb3J0c1R5cGUobV9zZXJ2aWNl VHlwZSk7CkBAIC0xODUsNyArMTg0LDcgQEAgYm9vbCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp3 b3VsZExvYWRBc05ldHNjYXBlUGx1Z2luKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdAogICAgICAg ICBjb21wbGV0ZWRVUkwgPSBkb2N1bWVudCgpLmNvbXBsZXRlVVJMKHVybCk7CiAKICAgICBGcmFt ZUxvYWRlciYgZnJhbWVMb2FkZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPmxvYWRlcigpOwotICAg IGlmIChmcmFtZUxvYWRlci5jbGllbnQoKS5vYmplY3RDb250ZW50VHlwZShjb21wbGV0ZWRVUkws IHNlcnZpY2VUeXBlLCBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKCkpID09IE9iamVjdENv bnRlbnROZXRzY2FwZVBsdWdpbikKKyAgICBpZiAoZnJhbWVMb2FkZXIuY2xpZW50KCkub2JqZWN0 Q29udGVudFR5cGUoY29tcGxldGVkVVJMLCBzZXJ2aWNlVHlwZSkgPT0gT2JqZWN0Q29udGVudE5l dHNjYXBlUGx1Z2luKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gZmFsc2U7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCmluZGV4IGUw NDk1Yjc0ZDI0YzdhZTdhNzVkNmFlNDVkM2FjNDZlODVmM2I1MmIuLjQxZWU4NjE3MWZlNmQ5ZGE5 OWU3MmEwNDEyMjBkOTY5Y2UyZDI4ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBs dWdJbkltYWdlRWxlbWVudC5oCkBAIC02MSw4ICs2MSw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0 dXJuIG1pbWVUeXBlOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0Zvcklt YWdlcygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlczsgfQot CiAgICAgLy8gUHVibGljIGZvciBGcmFtZVZpZXc6OmFkZFdpZGdldFRvVXBkYXRlKCkKICAgICBi b29sIG5lZWRzV2lkZ2V0VXBkYXRlKCkgY29uc3QgeyByZXR1cm4gbV9uZWVkc1dpZGdldFVwZGF0 ZTsgfQogICAgIHZvaWQgc2V0TmVlZHNXaWRnZXRVcGRhdGUoYm9vbCBuZWVkc1dpZGdldFVwZGF0 ZSkgeyBtX25lZWRzV2lkZ2V0VXBkYXRlID0gbmVlZHNXaWRnZXRVcGRhdGU7IH0KQEAgLTkzLDgg KzkxLDcgQEAgcHVibGljOgogICAgIFNuYXBzaG90RGVjaXNpb24gc25hcHNob3REZWNpc2lvbigp IGNvbnN0IHsgcmV0dXJuIG1fc25hcHNob3REZWNpc2lvbjsgfQogCiBwcm90ZWN0ZWQ6Ci0gICAg ZW51bSBQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzT3B0aW9uIHsgU2hvdWxkUHJlZmVyUGx1Z0luc0Zv ckltYWdlcywgU2hvdWxkTm90UHJlZmVyUGx1Z0luc0ZvckltYWdlcyB9OwotICAgIEhUTUxQbHVn SW5JbWFnZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmLCBi b29sIGNyZWF0ZWRCeVBhcnNlciwgUHJlZmVyUGx1Z0luc0ZvckltYWdlc09wdGlvbik7CisgICAg SFRNTFBsdWdJbkltYWdlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1 bWVudCYsIGJvb2wgY3JlYXRlZEJ5UGFyc2VyKTsKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRNb3Zl VG9OZXdEb2N1bWVudChEb2N1bWVudCogb2xkRG9jdW1lbnQpIG92ZXJyaWRlOwogICAgIHZpcnR1 YWwgYm9vbCByZXF1ZXN0T2JqZWN0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0 cmluZz4mIHBhcmFtVmFsdWVzKSBvdmVycmlkZSBmaW5hbDsKQEAgLTE0Miw3ICsxMzksNiBAQCBw cml2YXRlOgogCiAgICAgVVJMIG1fbG9hZGVkVXJsOwogICAgIGJvb2wgbV9uZWVkc1dpZGdldFVw ZGF0ZTsKLSAgICBib29sIG1fc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlczsKICAgICBib29s IG1fbmVlZHNEb2N1bWVudEFjdGl2YXRpb25DYWxsYmFja3M7CiAgICAgUmVmUHRyPE1vdXNlRXZl bnQ+IG1fcGVuZGluZ0NsaWNrRXZlbnRGcm9tU25hcHNob3Q7CiAgICAgRGVmZXJyYWJsZU9uZVNo b3RUaW1lciBtX3NpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0 eUNsaWVudHMuaAppbmRleCA2YjJmNjQ5NGI1M2I5YzViNmUxNDdjZWI5NDBhZWVjN2RjZjg0YmNk Li5hYzkyOWZmODE3OGFjZTI3NjQyNWMwNTZiZjc3YWE5NWM1ODE2N2JmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0VtcHR5Q2xpZW50cy5oCkBAIC0zNzYsNyArMzc2LDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCByZWNyZWF0ZVBsdWdpbihXaWRnZXQqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IFBhc3NSZWZQdHI8V2lkZ2V0PiBjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUm LCBIVE1MQXBwbGV0RWxlbWVudCosIGNvbnN0IFVSTCYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+Jiwg Y29uc3QgVmVjdG9yPFN0cmluZz4mKSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgT2JqZWN0Q29u dGVudFR5cGUgb2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiwgYm9v bCkgb3ZlcnJpZGUgeyByZXR1cm4gT2JqZWN0Q29udGVudFR5cGUoKTsgfQorICAgIHZpcnR1YWwg T2JqZWN0Q29udGVudFR5cGUgb2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiwgY29uc3QgU3Ry aW5nJikgb3ZlcnJpZGUgeyByZXR1cm4gT2JqZWN0Q29udGVudFR5cGUoKTsgfQogICAgIHZpcnR1 YWwgU3RyaW5nIG92ZXJyaWRlTWVkaWFUeXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gU3Ry aW5nKCk7IH0KIAogICAgIHZpcnR1YWwgdm9pZCByZWRpcmVjdERhdGFUb1BsdWdpbihXaWRnZXQq KSBvdmVycmlkZSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgK aW5kZXggMDBhMzViYmY1MGRiNTg3NjAyZWUyY2M1M2I5ZDZhZGZjZDcwYzliYS4uYTAwNGE0ZGI1 ZTQ2ZjdmODkwMGYwODVjNDFhY2Q4NDczOTBkMjMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTI4MSw3ICsyODEsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkRmFpbFRvU3RhcnRQbHVnaW4o Y29uc3QgUGx1Z2luVmlld0Jhc2UqKSBjb25zdCB7IH0KIAotICAgICAgICB2aXJ0dWFsIE9iamVj dENvbnRlbnRUeXBlIG9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcykgPSAwOworICAgICAg ICB2aXJ0dWFsIE9iamVjdENvbnRlbnRUeXBlIG9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYs IGNvbnN0IFN0cmluZyYgbWltZVR5cGUpID0gMDsKICAgICAgICAgdmlydHVhbCBTdHJpbmcgb3Zl cnJpZGVNZWRpYVR5cGUoKSBjb25zdCA9IDA7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIGRpc3Bh dGNoRGlkQ2xlYXJXaW5kb3dPYmplY3RJbldvcmxkKERPTVdyYXBwZXJXb3JsZCYpID0gMDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmluZGV4IDdlZmNiZWMzMzA4Nzky ZTk5Mjk5MTAyYjY4OTdkMTE0Mzc1YzNhMTIuLmI1YjZkYTdlODQwYTUwOGRlMGIwZDA1ZjcyYTgz ZGQxMGY4MjQwMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApA QCAtOTQsMTQgKzk0LDE0IEBAIGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RGcmFtZShIVE1M RnJhbWVPd25lckVsZW1lbnQmIG93bmVyRWxlbWVudCwgY29uc3QgU3RyCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAgICAgCi1ib29sIFN1YmZyYW1lTG9hZGVyOjpyZXNvdXJjZVdpbGxVc2VQbHVnaW4o Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgc2hvdWxkUHJl ZmVyUGx1Z0luc0ZvckltYWdlcykKK2Jvb2wgU3ViZnJhbWVMb2FkZXI6OnJlc291cmNlV2lsbFVz ZVBsdWdpbihjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsKICAg ICBVUkwgY29tcGxldGVkVVJMOwogICAgIGlmICghdXJsLmlzRW1wdHkoKSkKICAgICAgICAgY29t cGxldGVkVVJMID0gY29tcGxldGVVUkwodXJsKTsKIAogICAgIGJvb2wgdXNlRmFsbGJhY2s7Ci0g ICAgcmV0dXJuIHNob3VsZFVzZVBsdWdpbihjb21wbGV0ZWRVUkwsIG1pbWVUeXBlLCBzaG91bGRQ cmVmZXJQbHVnSW5zRm9ySW1hZ2VzLCBmYWxzZSwgdXNlRmFsbGJhY2spOworICAgIHJldHVybiBz aG91bGRVc2VQbHVnaW4oY29tcGxldGVkVVJMLCBtaW1lVHlwZSwgZmFsc2UsIHVzZUZhbGxiYWNr KTsKIH0KIAogYm9vbCBTdWJmcmFtZUxvYWRlcjo6cGx1Z2luSXNMb2FkYWJsZShIVE1MUGx1Z0lu SW1hZ2VFbGVtZW50JiBwbHVnaW5FbGVtZW50LCBjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSkKQEAgLTIyMSw3ICsyMjEsNyBAQCBib29sIFN1YmZyYW1lTG9hZGVyOjpyZXF1 ZXN0T2JqZWN0KEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQmIG93bmVyRWxlbWVudCwgY29uc3QgUwog ICAgIGJvb2wgaGFzRmFsbGJhY2tDb250ZW50ID0gaXM8SFRNTE9iamVjdEVsZW1lbnQ+KG93bmVy RWxlbWVudCkgJiYgZG93bmNhc3Q8SFRNTE9iamVjdEVsZW1lbnQ+KG93bmVyRWxlbWVudCkuaGFz RmFsbGJhY2tDb250ZW50KCk7CiAKICAgICBib29sIHVzZUZhbGxiYWNrOwotICAgIGlmIChzaG91 bGRVc2VQbHVnaW4oY29tcGxldGVkVVJMLCBtaW1lVHlwZSwgb3duZXJFbGVtZW50LnNob3VsZFBy ZWZlclBsdWdJbnNGb3JJbWFnZXMoKSwgaGFzRmFsbGJhY2tDb250ZW50LCB1c2VGYWxsYmFjaykp IHsKKyAgICBpZiAoc2hvdWxkVXNlUGx1Z2luKGNvbXBsZXRlZFVSTCwgbWltZVR5cGUsIGhhc0Zh bGxiYWNrQ29udGVudCwgdXNlRmFsbGJhY2spKSB7CiAgICAgICAgIGJvb2wgc3VjY2VzcyA9IHJl cXVlc3RQbHVnaW4ob3duZXJFbGVtZW50LCBjb21wbGV0ZWRVUkwsIG1pbWVUeXBlLCBwYXJhbU5h bWVzLCBwYXJhbVZhbHVlcywgdXNlRmFsbGJhY2spOwogICAgICAgICBsb2dQbHVnaW5SZXF1ZXN0 KGRvY3VtZW50KCktPnBhZ2UoKSwgbWltZVR5cGUsIGNvbXBsZXRlZFVSTCwgc3VjY2Vzcyk7CiAg ICAgICAgIHJldHVybiBzdWNjZXNzOwpAQCAtMzY3LDE3ICszNjcsMTggQEAgYm9vbCBTdWJmcmFt ZUxvYWRlcjo6YWxsb3dQbHVnaW5zKCkKICAgICByZXR1cm4gbV9mcmFtZS5zZXR0aW5ncygpLmFy ZVBsdWdpbnNFbmFibGVkKCk7CiB9CiAKLWJvb2wgU3ViZnJhbWVMb2FkZXI6OnNob3VsZFVzZVBs dWdpbihjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBzaG91bGRQ cmVmZXJQbHVnSW5zRm9ySW1hZ2VzLCBib29sIGhhc0ZhbGxiYWNrLCBib29sJiB1c2VGYWxsYmFj aykKK2Jvb2wgU3ViZnJhbWVMb2FkZXI6OnNob3VsZFVzZVBsdWdpbihjb25zdCBVUkwmIHVybCwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBoYXNGYWxsYmFjaywgYm9vbCYgdXNlRmFsbGJh Y2spCiB7CiAgICAgaWYgKG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuc2hvdWxkQWx3YXlzVXNl UGx1Z2luRG9jdW1lbnQobWltZVR5cGUpKSB7CiAgICAgICAgIHVzZUZhbGxiYWNrID0gZmFsc2U7 CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotICAgIE9iamVjdENvbnRlbnRUeXBlIG9i amVjdFR5cGUgPSBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLm9iamVjdENvbnRlbnRUeXBlKHVy bCwgbWltZVR5cGUsIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpOworICAgIE9iamVjdENv bnRlbnRUeXBlIG9iamVjdFR5cGUgPSBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLm9iamVjdENv bnRlbnRUeXBlKHVybCwgbWltZVR5cGUpOwogICAgIC8vIElmIGFuIG9iamVjdCdzIGNvbnRlbnQg Y2FuJ3QgYmUgaGFuZGxlZCBhbmQgaXQgaGFzIG5vIGZhbGxiYWNrLCBsZXQKICAgICAvLyBpdCBi ZSBoYW5kbGVkIGFzIGEgcGx1Z2luIHRvIHNob3cgdGhlIGJyb2tlbiBwbHVnaW4gaWNvbi4KICAg ICB1c2VGYWxsYmFjayA9IG9iamVjdFR5cGUgPT0gT2JqZWN0Q29udGVudE5vbmUgJiYgaGFzRmFs bGJhY2s7CisKICAgICByZXR1cm4gb2JqZWN0VHlwZSA9PSBPYmplY3RDb250ZW50Tm9uZSB8fCBv YmplY3RUeXBlID09IE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbiB8fCBvYmplY3RUeXBlID09 IE9iamVjdENvbnRlbnRPdGhlclBsdWdpbjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJh bWVMb2FkZXIuaAppbmRleCA3MTMxM2FmMDBlZWM3MzEwZTE3ZGFlNzFhNGZlMzBjZGE5NmQwZWRh Li4zOTI5MWZjMjQ5MWZiYTIwYTRhN2Q0MDM5ZjQxZDIyMzJhMTM1ZDg4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuaApAQCAtNjksNyArNjksNyBAQCBwdWJsaWM6CiAKICAg ICBib29sIGNvbnRhaW5zUGx1Z2lucygpIGNvbnN0IHsgcmV0dXJuIG1fY29udGFpbnNQbHVnaW5z OyB9CiAgICAgCi0gICAgYm9vbCByZXNvdXJjZVdpbGxVc2VQbHVnaW4oY29uc3QgU3RyaW5nJiB1 cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0Zvcklt YWdlcyk7CisgICAgYm9vbCByZXNvdXJjZVdpbGxVc2VQbHVnaW4oY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogCiBwcml2YXRlOgogICAgIGJvb2wgcmVxdWVzdFBs dWdpbihIVE1MUGx1Z0luSW1hZ2VFbGVtZW50JiwgY29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBz ZXJ2aWNlVHlwZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgYm9vbCB1c2VGYWxsYmFjayk7CkBAIC03Nyw3ICs3Nyw3 IEBAIHByaXZhdGU6CiAgICAgRnJhbWUqIGxvYWRTdWJmcmFtZShIVE1MRnJhbWVPd25lckVsZW1l bnQmLCBjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgcmVmZXJy ZXIpOwogICAgIGJvb2wgbG9hZFBsdWdpbihIVE1MUGx1Z0luSW1hZ2VFbGVtZW50JiwgY29uc3Qg VVJMJiwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFt TmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbVZhbHVlcywgYm9vbCB1c2VGYWxsYmFj ayk7CiAKLSAgICBib29sIHNob3VsZFVzZVBsdWdpbihjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMsIGJvb2wgaGFzRmFs bGJhY2ssIGJvb2wmIHVzZUZhbGxiYWNrKTsKKyAgICBib29sIHNob3VsZFVzZVBsdWdpbihjb25z dCBVUkwmLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGhhc0ZhbGxiYWNrLCBib29sJiB1 c2VGYWxsYmFjayk7CiAgICAgYm9vbCBwbHVnaW5Jc0xvYWRhYmxlKEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQmLCBjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKIAogICAgIERvY3Vt ZW50KiBkb2N1bWVudCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKaW5kZXggNWQyNTc2ZjdkYjZjNmRl ZWRkM2JkZTFlYWJhNGI5NDQ2MDZkYjc1Ni4uODRlNTQ1NjQwOWIxZjVmMzRiNjg4MjczZmRlNmZk ZDNhYzdmNWJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0yMTMsNyArMjEzLDcgQEAgcHJpdmF0ZToK ICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6V2lkZ2V0PiBjcmVhdGVKYXZhQXBwbGV0 V2lkZ2V0KGNvbnN0IFdlYkNvcmU6OkludFNpemUmLCBXZWJDb3JlOjpIVE1MQXBwbGV0RWxlbWVu dCosIGNvbnN0IFdlYkNvcmU6OlVSTCYgYmFzZVVSTCwKICAgICAgICAgY29uc3QgVmVjdG9yPFdU Rjo6U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgcGFyYW1W YWx1ZXMpIG92ZXJyaWRlOwogICAgIAotICAgIHZpcnR1YWwgV2ViQ29yZTo6T2JqZWN0Q29udGVu dFR5cGUgb2JqZWN0Q29udGVudFR5cGUoY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgV1RGOjpT dHJpbmcmIG1pbWVUeXBlLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpIG92ZXJy aWRlOworICAgIHZpcnR1YWwgV2ViQ29yZTo6T2JqZWN0Q29udGVudFR5cGUgb2JqZWN0Q29udGVu dFR5cGUoY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgV1RGOjpTdHJpbmcmIG1pbWVUeXBlKSBv dmVycmlkZTsKICAgICB2aXJ0dWFsIFdURjo6U3RyaW5nIG92ZXJyaWRlTWVkaWFUeXBlKCkgY29u c3Qgb3ZlcnJpZGU7CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2xlYXJXaW5k b3dPYmplY3RJbldvcmxkKFdlYkNvcmU6OkRPTVdyYXBwZXJXb3JsZCYpIG92ZXJyaWRlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5tbQppbmRleCAwMzA2ODljNWMyZDYzZmU5YzgwMWFlNjgzMDI2NzU2NzQ3ZDhiMzIz Li5jZmZmZmUxNjNjZWE5NDU4OTM1MWY1NDgzMTNhNTAxNDZkZjZlMzgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5tbQpAQCAtMTY1MSw3ICsxNjUxLDcgQEAgUmVmUHRyPEZyYW1lPiBXZWJGcmFtZUxvYWRlckNs aWVudDo6Y3JlYXRlRnJhbWUoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbmEKICAgICBy ZXR1cm4gbnVsbHB0cjsKIH0KIAotT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGll bnQ6Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCitPYmplY3RDb250ZW50VHlw ZSBXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiB1cmws IGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJ T05TOwogCkBAIC0xNjk3LDcgKzE2OTcsNyBAQCBPYmplY3RDb250ZW50VHlwZSBXZWJGcmFtZUxv YWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3QgVVJMJiB1cmwsIGNvbnN0CiAgICAg fQogICAgIAogICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5 cGUodHlwZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzICYm IHBsdWdJblR5cGUgIT0gT2JqZWN0Q29udGVudE5vbmUgPyBwbHVnSW5UeXBlIDogT2JqZWN0Q29u dGVudEltYWdlOworICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEltYWdlOwogCiAgICAgaWYg KHBsdWdJblR5cGUgIT0gT2JqZWN0Q29udGVudE5vbmUpCiAgICAgICAgIHJldHVybiBwbHVnSW5U eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDdmYjA1MTY0NGNmZmZkYWQ1MDE2OTU1NTdjNmYw MmIwMGM1ZmFjMTcuLmI5MGY4OTYyYmRkMmNlYWZiNWFmNDFmZTk4NTExMWUxNDUyYzI5NWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKQEAgLTEwODQsNyArMTA4NCw3IEBAIFJlZlB0cjxGcmFtZT4gV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUZyYW1lKGNvbnN0IFVSTCYgVVJMLCBjb25zdCBTdHJp bmcmIG5hCiAgICAgcmV0dXJuIGNoaWxkRnJhbWU7CiB9CiAKLU9iamVjdENvbnRlbnRUeXBlIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBVUkwmIHVybCwgY29u c3QgU3RyaW5nJiBtaW1lVHlwZUluLCBib29sIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMp CitPYmplY3RDb250ZW50VHlwZSBXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5 cGUoY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGVJbikKIHsKICAgICBTdHJp bmcgbWltZVR5cGUgPSBtaW1lVHlwZUluOwogCkBAIC0xMTAyLDcgKzExMDIsNyBAQCBPYmplY3RD b250ZW50VHlwZSBXZWJGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUoY29uc3Qg VVJMJiB1cmwsIGNvbnN0CiAgICAgYm9vbCBwbHVnSW5TdXBwb3J0c01JTUVUeXBlID0gUGx1Z2lu RGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWltZVR5 cGUpOwogCiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlw ZShtaW1lVHlwZSkpCi0gICAgICAgIHJldHVybiBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2Vz ICYmIHBsdWdJblN1cHBvcnRzTUlNRVR5cGUgPyBXZWJDb3JlOjpPYmplY3RDb250ZW50TmV0c2Nh cGVQbHVnaW4gOiBXZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7CisgICAgICAgIHJldHVybiBX ZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7CiAKICAgICBpZiAocGx1Z0luU3VwcG9ydHNNSU1F VHlwZSkKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdp bjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5oCmluZGV4IGIyOWYxNzhlMjU0NGFmNmE2MmYxOWFlMGJjMDAxYmQ0Y2Ex ZGVlODEuLmMxODQ2Nzg2MjBhMTk4N2E0ODJjM2E3MDczZWNhNmY3ZDYyYzE1YmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuaApAQCAtMTg5LDcgKzE4OSw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxXZWJDb3JlOjpXaWRnZXQ+IGNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgV2ViQ29y ZTo6SW50U2l6ZSYsIFdlYkNvcmU6OkhUTUxBcHBsZXRFbGVtZW50KiwgY29uc3QgV2ViQ29yZTo6 VVJMJiBiYXNlVVJMLCBjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25z dCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBwYXJhbVZhbHVlcykgb3ZlcnJpZGU7CiAKLSAgICB2aXJ0 dWFsIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRUeXBlIG9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFdl YkNvcmU6OlVSTCYsIGNvbnN0IFdURjo6U3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBzaG91bGRQcmVm ZXJQbHVnSW5zRm9ySW1hZ2VzKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFdlYkNvcmU6Ok9iamVj dENvbnRlbnRUeXBlIG9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFdlYkNvcmU6OlVSTCYsIGNvbnN0 IFdURjo6U3RyaW5nJiBtaW1lVHlwZSkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBXVEY6OlN0cmlu ZyBvdmVycmlkZU1lZGlhVHlwZSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lk IGRpc3BhdGNoRGlkQ2xlYXJXaW5kb3dPYmplY3RJbldvcmxkKFdlYkNvcmU6OkRPTVdyYXBwZXJX b3JsZCYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAppbmRleCAw YjAzZjRjMDM5NWE1MTdlOGJmMDEwOTlhNWRmN2ZiYmJkYjk5MjU2Li40OWRhNWVlNjQxZTE1Mjg2 MDY4YjcyOTFiODc1MDVjZWZmYzNhOGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmNwcApAQCAtMTUxMiw3ICsxNTEyLDcgQEAgc3RhdGljIGJvb2wgcGx1Z2luU3VwcG9ydHNFeHRl bnNpb24oY29uc3QgUGx1Z2luRGF0YSYgcGx1Z2luRGF0YSwgY29uc3QgU3RyaW5nJgogICAgIHJl dHVybiBmYWxzZTsKIH0KIAotT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBl SW4sIGJvb2wgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcykKK09iamVjdENvbnRlbnRUeXBl IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBVUkwmIHVybCwg Y29uc3QgU3RyaW5nJiBtaW1lVHlwZUluKQogewogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBi ZSBtZXJnZWQgd2l0aCBXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRU eXBlIHdoZW4gdGhlIHBsdWdpbiBjb2RlCiAgICAgLy8gaXMgY29uc29saWRhdGVkLgpAQCAtMTU0 Niw3ICsxNTQ2LDcgQEAgT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9i amVjdENvbnRlbnRUeXBlKGNvbnN0IFVSTCYgdXJsLCBjb25zdAogICAgIH0KICAgICAKICAgICBp ZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkK LSAgICAgICAgcmV0dXJuIHNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMgJiYgcGx1Z0luU3Vw cG9ydHNNSU1FVHlwZSA/IE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbiA6IE9iamVjdENvbnRl bnRJbWFnZTsKKyAgICAgICAgcmV0dXJuIE9iamVjdENvbnRlbnRJbWFnZTsKIAogICAgIGlmIChw bHVnSW5TdXBwb3J0c01JTUVUeXBlKQogICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudE5ldHNj YXBlUGx1Z2luOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmluZGV4IDk0ZDJiOTRiMDIx ODE3MzM3MzA4MWIwNDBhODlmYzM4NjQzNTE3NWQuLjhmOTVkMDVlY2I2NTNhYjQ2OTdjODIwZWFj MTZhMmNiNzQ4NzQ1YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKQEAgLTIwMCw3 ICsyMDAsNyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6Oldp ZGdldD4gY3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBXZWJDb3JlOjpJbnRTaXplJiwgV2Vi Q29yZTo6SFRNTEFwcGxldEVsZW1lbnQqLCBjb25zdCBXZWJDb3JlOjpVUkwmIGJhc2VVUkwsIGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFy YW1WYWx1ZXMpIG92ZXJyaWRlOwogICAgIAotICAgIHZpcnR1YWwgV2ViQ29yZTo6T2JqZWN0Q29u dGVudFR5cGUgb2JqZWN0Q29udGVudFR5cGUoY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSwgYm9vbCBzaG91bGRQcmVmZXJQbHVnSW5zRm9ySW1hZ2VzKSBvdmVycmlk ZTsKKyAgICB2aXJ0dWFsIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRUeXBlIG9iamVjdENvbnRlbnRU eXBlKGNvbnN0IFdlYkNvcmU6OlVSTCYsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIG92ZXJyaWRl OwogICAgIHZpcnR1YWwgU3RyaW5nIG92ZXJyaWRlTWVkaWFUeXBlKCkgY29uc3Qgb3ZlcnJpZGU7 CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDbGVhcldpbmRvd09iamVjdEluV29ybGQo V2ViQ29yZTo6RE9NV3JhcHBlcldvcmxkJikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTAzZTAzODFjOTY3 NWZjYjk2NzE0ZjIyZTc4NjgyNmU5NjcxMWRhYy4uZTM0MTQxOWU3OTgxNzlmMTZkYTM1Y2U4NGNk OTIwMGMzNjAzOTE5MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTEwLTA5ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgYWxsb3cgcGx1 Zy1pbnMgdG8gb3ZlcnJpZGUgaW1hZ2UgdHlwZXMgZm9yIDxlbWJlZD4gZWxlbWVudHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTk3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0ZXN0Lgor CisgICAgICAgICogcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxh dGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGx1Z2lucy9lbWJlZC1wcmVm ZXJzLXBsdWdpbnMtZm9yLWltYWdlcy1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCisgICAgICAgICog cGx1Z2lucy9lbWJlZC1wcmVmZXJzLXBsdWdpbnMtZm9yLWltYWdlcy5odG1sOiBSZW1vdmVkLgor CiAyMDE1LTEwLTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIEdhcmJhZ2UgdGV4dHVyZSBkYXRhIHdpdGggY29tcG9zaXRlZCB0YWJsZSByb3cKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZGE3MTIzMDgyM2Yw YmM1NDA3YjQ2YTg4YzRiZWM0ZWFkNTk2MDk5OS4uMjEyM2I0M2UwYWFjNTIxYTNjYzYzNTcyNDc1 ZTdmOTI3MDZiMGVmYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlv bnMKQEAgLTE5NTUsOCArMTk1NSw2IEBAIHdlYmtpdC5vcmcvYi8xMjc0ODkgaHR0cC90ZXN0cy9t aXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1vbi1yZWRpcmVjdC5oCiAKIHdlYmtp dC5vcmcvYi8xMjc3MjUgbWVkaWEvdmlkZW8tcmVzdHJpY3RlZC1uby1wcmVsb2FkLWF1dG8uaHRt bCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMTI3NzMxIHBsdWdpbnMvZW1iZWQtcHJlZmVy cy1wbHVnaW5zLWZvci1pbWFnZXMuaHRtbCBbIEZhaWx1cmUgXQotCiAjIFN1YnBpeGVsIHJlbmRl cmluZzogYm9yZGVycyBhcmUgcmVwb3J0aW5nIGZsb2F0IHZhbHVlcy4KIHdlYmtpdC5vcmcvYi8x MjgwNjEgZmFzdC9ibG9jay9mbG9hdC8wMTYuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzEyODA2MSBmYXN0L2Nzcy9iaWRpLW92ZXJyaWRlLWluLWFub255bW91cy1ibG9jay5odG1sIFsg RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IDYzODYwM2JjNTAyYWNmMTY3Yjk4ZTIyZGY3ZGUxNzE0M2EzZjRhZDEuLmVlMzA3ZjNiNmRmNGIz NWJlMzIxNzNmZmRhNThiOGQ4NTIwZWFlZmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9U ZXN0RXhwZWN0YXRpb25zCkBAIC02ODIsNyArNjgyLDYgQEAgd2Via2l0Lm9yZy9iLzEzMTIyNCBb IERlYnVnIF0gbWVkaWEvdHJhY2svdHJhY2staW5zZXJ0LWFmdGVyLWxvYWQtY3Jhc2guaHRtbCBb IEMKIHdlYmtpdC5vcmcvYi8xMzEyMjUgWyBEZWJ1ZyBdIG1lZGlhL3RyYWNrL3RyYWNrLXJlbW92 ZS1xdWlja2x5Lmh0bWwgWyBDcmFzaCBdCiAKIHdlYmtpdC5vcmcvYi8xMzEyMTcgWyBEZWJ1ZyBd IHBsdWdpbnMvbm8tbWltZS13aXRoLXZhbGlkLWV4dGVuc2lvbi5odG1sIFsgQ3Jhc2ggXQotd2Vi a2l0Lm9yZy9iLzEzMTIxNyBbIERlYnVnIF0gcGx1Z2lucy9lbWJlZC1wcmVmZXJzLXBsdWdpbnMt Zm9yLWltYWdlcy5odG1sIFsgQ3Jhc2ggXQogCiB3ZWJraXQub3JnL2IvMTA1ODcwIFsgRGVidWcg XSB3ZWJhdWRpby9hdWRpb2J1ZmZlcnNvdXJjZS1sb29wLXBvaW50cy5odG1sIFsgQ3Jhc2ggXQog d2Via2l0Lm9yZy9iLzEwNTg3MCBbIERlYnVnIF0gd2ViYXVkaW8vYXVkaW9ub2RlLWNoYW5uZWwt cnVsZXMuaHRtbCBbIENyYXNoIFBhc3MgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGx1Z2lu cy9lbWJlZC1wcmVmZXJzLXBsdWdpbnMtZm9yLWltYWdlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9wbHVnaW5zL2VtYmVkLXByZWZlcnMtcGx1Z2lucy1mb3ItaW1hZ2VzLWV4cGVjdGVkLnR4 dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNTBhNTUyZGIyYTQzZTBmNTM5OGZmZDM3 NzVkYzRhODIwNzViYzgzYy4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MAotLS0gYS9MYXlvdXRUZXN0cy9wbHVnaW5zL2VtYmVkLXByZWZlcnMtcGx1Z2lucy1mb3ItaW1h Z2VzLWV4cGVjdGVkLnR4dAorKysgL2Rldi9udWxsCkBAIC0xLDQgKzAsMCBAQAotVGVzdCB0aGF0 IFdlYktpdCB3aWxsIGxvYWQgYSBwbHVnLWluIHRvIHJlbmRlciBhbiBpbWFnZSBiZWZvcmUgcmVu ZGVyaW5nIGl0IG5hdGl2ZWx5LgotCi1QQVNTCi0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs dWdpbnMvZW1iZWQtcHJlZmVycy1wbHVnaW5zLWZvci1pbWFnZXMuaHRtbCBiL0xheW91dFRlc3Rz L3BsdWdpbnMvZW1iZWQtcHJlZmVycy1wbHVnaW5zLWZvci1pbWFnZXMuaHRtbApkZWxldGVkIGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggZjYyYjc0OTdjNTk2NzA2OGFiNmZlNGFkOWQ3OTM2MDc2NTAw YWVmZi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlv dXRUZXN0cy9wbHVnaW5zL2VtYmVkLXByZWZlcnMtcGx1Z2lucy1mb3ItaW1hZ2VzLmh0bWwKKysr IC9kZXYvbnVsbApAQCAtMSwyOCArMCwwIEBACi08c2NyaXB0PgotICAgIGlmICh3aW5kb3cudGVz dFJ1bm5lcikgewotICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKLSAgICAgICAgdGVz dFJ1bm5lci53YWl0VW50aWxEb25lKCk7Ci0gICAgfQotICAgIAotICAgIGZ1bmN0aW9uIHJ1blRl c3QoKQotICAgIHsKLSAgICAgICAgdmFyIHBsdWdpbiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJwbHVnaW4iKTsKLSAgICAgICAgCi0gICAgICAgIC8vIEJvdGggUXVpY2tUaW1lIGFuZCBUZXN0 TmV0c2NhcGVQbHVnSW4gcmVnaXN0ZXIgZm9yIGltYWdlL3BuZy4KLSAgICAgICAgaWYgKHBsdWdp biAmJiAocGx1Z2luLnRlc3RDYWxsYmFjayB8fCBwbHVnaW4uR2V0UXVpY2tUaW1lVmVyc2lvbikp Ci0gICAgICAgICAgICBsb2dTdWNjZXNzKCk7Ci0KLSAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVu bmVyKQotICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7Ci0gICAgfQotICAgIAot ICAgIGZ1bmN0aW9uIGxvZ1N1Y2Nlc3MoKQotICAgIHsKLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNvbnNvbGUiKS5pbm5lckhUTUwgPSAiUEFTUyI7Ci0gICAgfQotPC9zY3JpcHQ+ Ci08Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Ci08cD5UZXN0IHRoYXQgV2ViS2l0IHdpbGwgbG9h ZCBhIHBsdWctaW4gdG8gcmVuZGVyIGFuIGltYWdlIGJlZm9yZSByZW5kZXJpbmcgaXQgbmF0aXZl bHkuPC9wPgotPGRpdiBpZD0iY29uc29sZSI+RkFJTDwvZGl2PgotPGVtYmVkIGlkPSJwbHVnaW4i IHNyYz0iaW1hZ2UucG5nIj4KLSAgICAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==