145730 2015-06-06 14:13:03 -0700 Remove support from getting plug-in information from Carbon resources 2015-06-06 14:22:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1100117 0 andersca 2015-06-06 14:13:03 -0700 Remove support from getting plug-in information from Carbon resources 1100118 1 254418 andersca 2015-06-06 14:15:00 -0700 Created attachment 254418 Patch 1100119 2 andersca 2015-06-06 14:22:46 -0700 Committed r185294: <http://trac.webkit.org/changeset/185294> 254418 2015-06-06 14:15:00 -0700 2015-06-06 14:19:59 -0700 Patch bug-145730-20150606141436.patch text/plain 18583 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDU5MDAyNTkzMWNkNzFl YWNlY2M1ZTQ1MGNlM2YzMjE2MDg5MTE2Yi4uMTg5ODNmYjM2MzRkMWQ3MTcxMjI2ZWFjYjcyNjRk MzBkMmQzYmIzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA2LTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHN1cHBv cnQgZnJvbSBnZXR0aW5nIHBsdWctaW4gaW5mb3JtYXRpb24gZnJvbSBDYXJib24gcmVzb3VyY2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg YSBub3cgdW51c2VkIGZ1bmN0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYkNvcmVO U1N0cmluZ0V4dHJhcy5oOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3JlTlNTdHJpbmdF eHRyYXMubW06CisgICAgICAgIChzdHJpbmdFbmNvZGluZ0ZvclJlc291cmNlKTogRGVsZXRlZC4K KwogMjAxNS0wNi0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE4NTI4NC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpp bmRleCBlMjQ3NjdlMzI3MTFmNTJkNzhlM2RkNGRhMjJlYjI5YzM2MDlhMmVkLi5lYzExN2UwZTQ2 MTFhY2JhNjZlOTBjMTg3MjM3OTBjMTUzNTJjYWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUg KzEsMjQgQEAKIDIwMTUtMDYtMDYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAorICAgICAgICBSZW1vdmUgc3VwcG9ydCBmcm9tIGdldHRpbmcgcGx1Zy1pbiBpbmZvcm1h dGlvbiBmcm9tIENhcmJvbiByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0NTczMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIGN1cnJlbnQgcGx1Zy1pbiB2ZXJzaW9ucyB1c2UgdGhpcyBm ZWF0dXJlLCBhbmQgYm90aCBDaHJvbWUgYW5kIE1vemlsbGEgZm9yCisgICAgICAgIE1hYyBzdG9w cGVkIGxvb2tpbmcgYXQgQ2FyYm9uIHJlc291cmNlcyB5ZWFycyBhZ28uCisKKyAgICAgICAgKiBN aXNjL1dlYktpdE5TU3RyaW5nRXh0cmFzLmg6CisgICAgICAgICogTWlzYy9XZWJLaXROU1N0cmlu Z0V4dHJhcy5tbToKKyAgICAgICAgKCtbTlNTdHJpbmcgX3dlYl9lbmNvZGluZ0ZvclJlc291cmNl Ol0pOiBEZWxldGVkLgorICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW06 CisgICAgICAgICogUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW06CisgICAgICAg ICgtW1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSBfaW5pdFdpdGhQYXRoOl0pOgorICAgICAgICAo LVtXZWJOZXRzY2FwZVBsdWdpblBhY2thZ2Ugc3RyaW5nRm9yU3RyaW5nTGlzdElEOmFuZEluZGV4 Ol0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UgZ2V0UGx1 Z2luSW5mb0Zyb21SZXNvdXJjZXNdKTogRGVsZXRlZC4KKworMjAxNS0wNi0wNiAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJlbW92ZSBub3cgdW51c2Vk IGNhdGVnb3J5IG1ldGhvZHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NTcyOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODQzYjNjZmZlNzlhYzU5ODhmMTlmOGI0 Zjg4Y2M2NjhlNTcxYzVjOS4uNzNhODdmNjY0ZTYxMjU1MWQ2ODMwMjFhNTk0NTdkODY1NjVlYjRk MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA2LTA2ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZnJvbSBn ZXR0aW5nIHBsdWctaW4gaW5mb3JtYXRpb24gZnJvbSBDYXJib24gcmVzb3VyY2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjdXJyZW50IHBsdWct aW4gdmVyc2lvbnMgdXNlIHRoaXMgZmVhdHVyZSwgYW5kIGJvdGggQ2hyb21lIGFuZCBNb3ppbGxh IGZvcgorICAgICAgICBNYWMgc3RvcHBlZCBsb29raW5nIGF0IENhcmJvbiByZXNvdXJjZXMgeWVh cnMgYWdvLgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBl UGx1Z2luTW9kdWxlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVs ZTo6Z2V0UGx1Z2luSW5mbyk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTWFwOjpSZXNvdXJj ZU1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTWFwOjp+UmVzb3VyY2VN YXApOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZU1hcDo6aXNWYWxpZCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OmdldFN0cmluZ0xpc3RSZXNvdXJjZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJLaXQ6OmdldFBsdWdpbkluZm9Gcm9tQ2FyYm9uUmVzb3VyY2VzKTogRGVs ZXRlZC4KKwogMjAxNS0wNi0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgogCiAgICAgICAgIE9ubHkgYWxsb3cgcGx1Zy1pbnMgdG8gY3JlYXRlIGN1c3RvbSBNSU1FIHBy b3BlcnR5IGxpc3RzIG9uIG9sZGVyIHZlcnNpb25zIG9mIE9TIFgKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNTdHJpbmdFeHRyYXMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNTdHJpbmdFeHRyYXMuaAppbmRleCA0NjU2OTc4 OGNjY2Q3YTRjOGM0ZTUwMzAyYWZiMTFiYWYxMjUxYzM3Li44MWMyYzk2ZWE5ODZlYTk4OWI2MmRj ZWE4YjhmODllZDU3NzYwYmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvV2ViQ29yZU5TU3RyaW5nRXh0cmFzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1dlYkNvcmVOU1N0cmluZ0V4dHJhcy5oCkBAIC00NCw5ICs0NCw2IEBAIFdFQkNPUkVfRVhQ T1JUIEJPT0wgaGFzQ2FzZUluc2Vuc2l0aXZlU3VmZml4KE5TU3RyaW5nICosIE5TU3RyaW5nICpz dWZmaXgpOwogV0VCQ09SRV9FWFBPUlQgQk9PTCBoYXNDYXNlSW5zZW5zaXRpdmVQcmVmaXgoTlNT dHJpbmcgKiwgTlNTdHJpbmcgKnByZWZpeCk7CiBXRUJDT1JFX0VYUE9SVCBCT09MIGhhc0Nhc2VJ bnNlbnNpdGl2ZVN1YnN0cmluZyhOU1N0cmluZyAqLCBOU1N0cmluZyAqc3Vic3RyaW5nKTsKIFdF QkNPUkVfRVhQT1JUIE5TU3RyaW5nICpmaWxlbmFtZUJ5Rml4aW5nSWxsZWdhbENoYXJhY3RlcnMo TlNTdHJpbmcgKik7Ci0jaWYgIVBMQVRGT1JNKElPUykKLVdFQkNPUkVfRVhQT1JUIENGU3RyaW5n RW5jb2Rpbmcgc3RyaW5nRW5jb2RpbmdGb3JSZXNvdXJjZShIYW5kbGUgcmVzb3VyY2UpOwotI2Vu ZGlmCiAKIFdFQkNPUkVfRVhQT1JUIE5TU3RyaW5nICpwcmVmZXJyZWRCdW5kbGVMb2NhbGl6YXRp b25OYW1lKCk7CiBOU1N0cmluZyAqY2Fub25pY2FsTG9jYWxlTmFtZShOU1N0cmluZyAqKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNTdHJpbmdFeHRy YXMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZU5TU3RyaW5nRXh0cmFz Lm1tCmluZGV4IDJhN2FlYzYxZjEwMmI4M2E2ZjI5MDI4NDg3YTBhZjI3ZjljZTA5NmMuLjI5OTc1 ZmQyM2ZiMGMyOWJlZDE5YjQ0MDNkMmU3MTI1YmU3ZWY2ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNTdHJpbmdFeHRyYXMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1N0cmluZ0V4dHJhcy5tbQpAQCAtNzQsNjMg Kzc0LDYgQEAgTlNTdHJpbmcgKmZpbGVuYW1lQnlGaXhpbmdJbGxlZ2FsQ2hhcmFjdGVycyhOU1N0 cmluZyAqc3RyaW5nKQogICAgIHJldHVybiBmaWxlbmFtZTsKIH0KIAotI2lmICFQTEFURk9STShJ T1MpCi0KLSNpZiBDT01QSUxFUihDTEFORykKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNo Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0 aW9ucyIKLSNlbmRpZgotCi1DRlN0cmluZ0VuY29kaW5nIHN0cmluZ0VuY29kaW5nRm9yUmVzb3Vy Y2UoSGFuZGxlIHJlc291cmNlKQotewotICAgIHNob3J0IHJlc1JlZiA9IEhvbWVSZXNGaWxlKHJl c291cmNlKTsKLSAgICBpZiAoUmVzRXJyb3IoKSAhPSBub0VycikKLSAgICAgICAgcmV0dXJuIE5T TWFjT1NSb21hblN0cmluZ0VuY29kaW5nOwotICAgIAotICAgIC8vIEdldCB0aGUgRlNSZWYgZm9y IHRoZSBjdXJyZW50IHJlc291cmNlIGZpbGUKLSAgICBGU1JlZiBmcmVmOwotICAgIE9TU3RhdHVz IGVycm9yID0gRlNHZXRGb3JrQ0JJbmZvKHJlc1JlZiwgMCwgTlVMTCwgTlVMTCwgTlVMTCwgJmZy ZWYsIE5VTEwpOwotICAgIGlmIChlcnJvciAhPSBub0VycikKLSAgICAgICAgcmV0dXJuIE5TTWFj T1NSb21hblN0cmluZ0VuY29kaW5nOwotICAgIAotICAgIFJldGFpblB0cjxDRlVSTFJlZj4gdXJs ID0gYWRvcHRDRihDRlVSTENyZWF0ZUZyb21GU1JlZihOVUxMLCAmZnJlZikpOwotICAgIGlmICgh dXJsKQotICAgICAgICByZXR1cm4gTlNNYWNPU1JvbWFuU3RyaW5nRW5jb2Rpbmc7Ci0KLSAgICBO U1N0cmluZyAqcGF0aCA9IFsoTlNVUkwgKil1cmwuZ2V0KCkgcGF0aF07Ci0KLSAgICAvLyBHZXQg dGhlIGxwcm9qIGRpcmVjdG9yeSBuYW1lCi0gICAgcGF0aCA9IFtwYXRoIHN0cmluZ0J5RGVsZXRp bmdMYXN0UGF0aENvbXBvbmVudF07Ci0gICAgaWYgKCFzdHJpbmdJc0Nhc2VJbnNlbnNpdGl2ZUVx dWFsVG9TdHJpbmcoW3BhdGggcGF0aEV4dGVuc2lvbl0sIEAibHByb2oiKSkKLSAgICAgICAgcmV0 dXJuIE5TTWFjT1NSb21hblN0cmluZ0VuY29kaW5nOwotICAgIAotICAgIE5TU3RyaW5nICpkaXJl Y3RvcnlOYW1lID0gW1twYXRoIHN0cmluZ0J5RGVsZXRpbmdQYXRoRXh0ZW5zaW9uXSBsYXN0UGF0 aENvbXBvbmVudF07Ci0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBsb2NhbGUgPSBhZG9wdENG KENGTG9jYWxlQ3JlYXRlQ2Fub25pY2FsTG9jYWxlSWRlbnRpZmllckZyb21TdHJpbmcoTlVMTCwg KENGU3RyaW5nUmVmKWRpcmVjdG9yeU5hbWUpKTsKLSAgICBpZiAoIWxvY2FsZSkKLSAgICAgICAg cmV0dXJuIE5TTWFjT1NSb21hblN0cmluZ0VuY29kaW5nOwotCi0gICAgTGFuZ0NvZGUgbGFuZzsK LSAgICBSZWdpb25Db2RlIHJlZ2lvbjsKLSAgICBlcnJvciA9IExvY2FsZVN0cmluZ1RvTGFuZ0Fu ZFJlZ2lvbkNvZGVzKFsoTlNTdHJpbmcgKilsb2NhbGUuZ2V0KCkgVVRGOFN0cmluZ10sICZsYW5n LCAmcmVnaW9uKTsKLSAgICBpZiAoZXJyb3IgIT0gbm9FcnIpCi0gICAgICAgIHJldHVybiBOU01h Y09TUm9tYW5TdHJpbmdFbmNvZGluZzsKLQotICAgIFRleHRFbmNvZGluZyBlbmNvZGluZzsKLSAg ICBlcnJvciA9IFVwZ3JhZGVTY3JpcHRJbmZvVG9UZXh0RW5jb2Rpbmcoa1RleHRTY3JpcHREb250 Q2FyZSwgbGFuZywgcmVnaW9uLCBOVUxMLCAmZW5jb2RpbmcpOwotICAgIGlmIChlcnJvciAhPSBu b0VycikKLSAgICAgICAgcmV0dXJuIE5TTWFjT1NSb21hblN0cmluZ0VuY29kaW5nOwotICAgIAot ICAgIHJldHVybiBlbmNvZGluZzsKLX0KLQotI2lmIENPTVBJTEVSKENMQU5HKQotI3ByYWdtYSBj bGFuZyBkaWFnbm9zdGljIHBvcAotI2VuZGlmCi0KLSNlbmRpZiAvLyAhUExBVEZPUk0oSU9TKQot Ci0KLQogTlNTdHJpbmcgKnByZWZlcnJlZEJ1bmRsZUxvY2FsaXphdGlvbk5hbWUoKQogewogICAg IC8vIEZJWE1FOiBBbnkgdXNlIG9mIHRoaXMgZnVuY3Rpb24gdG8gcGFzcyBsb2NhbGl6YXRpb25z IHRvIGFub3RoZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TlNT dHJpbmdFeHRyYXMuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TlNTdHJpbmdFeHRy YXMuaAppbmRleCA5YTBiYTJkODNhODk1ODk5NDIyZWQ1MjIzMGEzYWQwMzc4OTliYzIyLi4yYzcw YTAzM2Q2ZGU0ZDMxMzgxMDEyZTJmNzA3MmUyNTNiMjA4NjY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9NaXNjL1dlYktpdE5TU3RyaW5nRXh0cmFzLmgKKysrIGIvU291cmNlL1dlYktp dC9tYWMvTWlzYy9XZWJLaXROU1N0cmluZ0V4dHJhcy5oCkBAIC01MCwxMCArNTAsNiBAQCBleHRl cm4gTlNTdHJpbmcgKldlYktpdExvY2FsQ2FjaGVEZWZhdWx0c0tleTsKIAogLSAoTlNTdHJpbmcg Kilfd2ViX3N0cmluZ0J5U3RyaXBwaW5nUmV0dXJuQ2hhcmFjdGVyczsKIAotI2lmICFUQVJHRVRf T1NfSVBIT05FCi0rIChOU1N0cmluZ0VuY29kaW5nKV93ZWJfZW5jb2RpbmdGb3JSZXNvdXJjZToo SGFuZGxlKXJlc291cmNlOwotI2VuZGlmCi0KIC0gKEJPT0wpX3dlYmtpdF9pc0Nhc2VJbnNlbnNp dGl2ZUVxdWFsVG9TdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nOwogLSAoQk9PTClfd2Via2l0X2hh c0Nhc2VJbnNlbnNpdGl2ZVByZWZpeDooTlNTdHJpbmcgKilzdWZmaXg7CiAtIChCT09MKV93ZWJr aXRfaGFzQ2FzZUluc2Vuc2l0aXZlU3VmZml4OihOU1N0cmluZyAqKXN1ZmZpeDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TlNTdHJpbmdFeHRyYXMubW0gYi9Tb3Vy Y2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdE5TU3RyaW5nRXh0cmFzLm1tCmluZGV4IGY4MmJiZWQw MGFhNjVlZjI4NjQyYTNhYmEzNTM4NjJkY2Q5NDJiZWIuLjQ1MjM1NTNhZmFlZDEwZTEwZTE4MGE1 MmZjYmVmMGFkZWZlNTFmMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2Vi S2l0TlNTdHJpbmdFeHRyYXMubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRO U1N0cmluZ0V4dHJhcy5tbQpAQCAtMTcwLDEzICsxNzAsNiBAQCBzdGF0aWMgQk9PTCBjYW5Vc2VG YXN0UmVuZGVyZXIoY29uc3QgVW5pQ2hhciAqYnVmZmVyLCB1bnNpZ25lZCBsZW5ndGgpCiAgICAg cmV0dXJuIG5ld1N0cmluZzsKIH0KIAotI2lmICFQTEFURk9STShJT1MpCi0rIChOU1N0cmluZ0Vu Y29kaW5nKV93ZWJfZW5jb2RpbmdGb3JSZXNvdXJjZTooSGFuZGxlKXJlc291cmNlCi17Ci0gICAg cmV0dXJuIENGU3RyaW5nQ29udmVydEVuY29kaW5nVG9OU1N0cmluZ0VuY29kaW5nKHN0cmluZ0Vu Y29kaW5nRm9yUmVzb3VyY2UocmVzb3VyY2UpKTsKLX0KLSNlbmRpZgotCiAtIChCT09MKV93ZWJr aXRfaXNDYXNlSW5zZW5zaXRpdmVFcXVhbFRvU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZwogewog ICAgIHJldHVybiBzdHJpbmdJc0Nhc2VJbnNlbnNpdGl2ZUVxdWFsVG9TdHJpbmcoc2VsZiwgc3Ry aW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdp blBhY2thZ2UubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNr YWdlLm1tCmluZGV4IDJmNDIzODI1ZWE2NWJmNTNjZTYyYmFmNTRmZDFmNzU4YmU2ZTU2ZDIuLmJm NWQ1ZjlkYzg3ODljZDVjYzdkY2I5ZTI3MjFlZmU0YzMwMDBlODcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0KKysrIGIvU291cmNl L1dlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQpAQCAtMzMsNyArMzMs NiBAQAogI2ltcG9ydCAiV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLmgiCiAjaW1wb3J0ICJXZWJQ bHVnaW5QYWNrYWdlLmgiCiAjaW1wb3J0ICJXZWJUeXBlc0ludGVybmFsLmgiCi0jaW1wb3J0IDxX ZWJDb3JlL1dlYkNvcmVOU1N0cmluZ0V4dHJhcy5oPgogI2ltcG9ydCA8V2ViQ29yZS9XZWJDb3Jl T2JqQ0V4dHJhcy5oPgogI2ltcG9ydCA8YWxnb3JpdGhtPgogI2ltcG9ydCA8bWFjaC1vL2FyY2gu aD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVn aW5QYWNrYWdlLm1tIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdp blBhY2thZ2UubW0KaW5kZXggNWU0NWMxYTgzYTBhNDEzODBkY2Q3OTBiYzhkNTk0ZWQyNGJhOWYy Mi4uMDYzMjM3MTRiODUzMzQ3ZDUxNmNhZWE3N2VkZTYxOTVlYTllMWM2OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0KKysr IGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0K QEAgLTQ1LDEwICs0NSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogCi0jZGVmaW5lIFBsdWdpbk5hbWVPckRlc2NyaXB0aW9uU3RyaW5nTnVt YmVyICAgICAxMjYKLSNkZWZpbmUgTUlNRURlc2NyaXB0aW9uU3RyaW5nTnVtYmVyICAgICAgICAg ICAgIDEyNwotI2RlZmluZSBNSU1FTGlzdFN0cmluZ1N0cmluZ051bWJlciAgICAgICAgICAgICAg MTI4Ci0KIEBpbnRlcmZhY2UgV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlIChJbnRlcm5hbCkKIC0g KHZvaWQpX3VubG9hZFdpdGhTaHV0ZG93bjooQk9PTClzaHV0ZG93bjsKIEBlbmQKQEAgLTY1LDEw MSArNjEsNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKICAgICBDRkJ1bmRsZUNsb3NlQnVu ZGxlUmVzb3VyY2VNYXAoY2ZCdW5kbGUuZ2V0KCksIHJlc1JlZik7CiB9CiAKLSNpZiBDT01QSUxF UihDTEFORykKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCi0jcHJhZ21hIGNsYW5nIGRp YWdub3N0aWMgaWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0aW9ucyIKLSNlbmRpZgotCi0t IChOU1N0cmluZyAqKXN0cmluZ0ZvclN0cmluZ0xpc3RJRDooU0ludDE2KXN0cmluZ0xpc3RJRCBh bmRJbmRleDooU0ludDE2KWluZGV4Ci17Ci0gICAgLy8gR2V0IHJlc291cmNlLCBhbmQgZGVyZWZl cmVuY2UgdGhlIGhhbmRsZS4KLSAgICBIYW5kbGUgc3RyaW5nSGFuZGxlID0gR2V0MVJlc291cmNl KCdTVFIjJywgc3RyaW5nTGlzdElEKTsKLSAgICBpZiAoc3RyaW5nSGFuZGxlID09IE5VTEwpIHsK LSAgICAgICAgcmV0dXJuIG5pbDsKLSAgICB9Ci0gICAgdW5zaWduZWQgY2hhciAqcCA9ICh1bnNp Z25lZCBjaGFyICopKnN0cmluZ0hhbmRsZTsKLSAgICBpZiAoIXApCi0gICAgICAgIHJldHVybiBu aWw7Ci0gICAgCi0gICAgLy8gQ2hlY2sgdGhlIGluZGV4IGFnYWluc3QgdGhlIGxlbmd0aCBvZiB0 aGUgc3RyaW5nIGxpc3QsIHRoZW4gc2tpcCB0aGUgbGVuZ3RoLgotICAgIGlmIChpbmRleCA8IDEg fHwgaW5kZXggPiAqKFNJbnQxNiAqKXApCi0gICAgICAgIHJldHVybiBuaWw7Ci0gICAgcCArPSBz aXplb2YoU0ludDE2KTsKLSAgICAKLSAgICAvLyBTa2lwIGFueSBzdHJpbmdzIHRoYXQgY29tZSBi ZWZvcmUgdGhlIG9uZSB3ZSBhcmUgbG9va2luZyBmb3IuCi0gICAgd2hpbGUgKC0taW5kZXgpCi0g ICAgICAgIHAgKz0gMSArICpwOwotICAgIAotICAgIC8vIENvbnZlcnQgdGhlIG9uZSB3ZSBmb3Vu ZCBpbnRvIGFuIE5TU3RyaW5nLgotICAgIHJldHVybiBbW1tOU1N0cmluZyBhbGxvY10gaW5pdFdp dGhCeXRlczoocCArIDEpIGxlbmd0aDoqcCBlbmNvZGluZzpbTlNTdHJpbmcgX3dlYl9lbmNvZGlu Z0ZvclJlc291cmNlOnN0cmluZ0hhbmRsZV1dIGF1dG9yZWxlYXNlXTsKLX0KLQotLSAoQk9PTCln ZXRQbHVnaW5JbmZvRnJvbVJlc291cmNlcwotewotICAgIFNJbnQxNiByZXNSZWYgPSBbc2VsZiBv cGVuUmVzb3VyY2VGaWxlXTsKLSAgICBpZiAocmVzUmVmID09IC0xKQotICAgICAgICByZXR1cm4g Tk87Ci0gICAgCi0gICAgVXNlUmVzRmlsZShyZXNSZWYpOwotICAgIGlmIChSZXNFcnJvcigpICE9 IG5vRXJyKQotICAgICAgICByZXR1cm4gTk87Ci0KLSAgICBOU1N0cmluZyAqTUlNRSwgKmV4dGVu c2lvbnNMaXN0LCAqZGVzY3JpcHRpb247Ci0gICAgTlNBcnJheSAqZXh0ZW5zaW9uczsKLSAgICB1 bnNpZ25lZCBpOwotICAgIAotICAgIGZvciAoaT0xOyAxOyBpKz0yKSB7Ci0gICAgICAgIE1JTUUg PSBbW3NlbGYgc3RyaW5nRm9yU3RyaW5nTGlzdElEOk1JTUVMaXN0U3RyaW5nU3RyaW5nTnVtYmVy Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuZEluZGV4OmldIGxvd2VyY2Fz ZVN0cmluZ107Ci0gICAgICAgIGlmICghTUlNRSkKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAg ICAgIE1pbWVDbGFzc0luZm8gbWltZUNsYXNzSW5mbzsKLSAgICAgICAgbWltZUNsYXNzSW5mby50 eXBlID0gU3RyaW5nKE1JTUUpLmxvd2VyKCk7Ci0KLSAgICAgICAgZXh0ZW5zaW9uc0xpc3QgPSBb W3NlbGYgc3RyaW5nRm9yU3RyaW5nTGlzdElEOk1JTUVMaXN0U3RyaW5nU3RyaW5nTnVtYmVyIGFu ZEluZGV4OmkrMV0gbG93ZXJjYXNlU3RyaW5nXTsKLSAgICAgICAgaWYgKGV4dGVuc2lvbnNMaXN0 KSB7Ci0gICAgICAgICAgICBleHRlbnNpb25zID0gW2V4dGVuc2lvbnNMaXN0IGNvbXBvbmVudHNT ZXBhcmF0ZWRCeVN0cmluZzpAIiwiXTsKLSAgICAgICAgICAgIGZvciAoTlNVSW50ZWdlciBqID0g MDsgaiA8IFtleHRlbnNpb25zIGNvdW50XTsgKytqKQotICAgICAgICAgICAgICAgIG1pbWVDbGFz c0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQoKE5TU3RyaW5nICopW2V4dGVuc2lvbnMgb2JqZWN0QXRJ bmRleDpqXSk7Ci0gICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIGRlc2NyaXB0aW9uID0gW3Nl bGYgc3RyaW5nRm9yU3RyaW5nTGlzdElEOk1JTUVEZXNjcmlwdGlvblN0cmluZ051bWJlcgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmRJbmRleDpwbHVnaW5JbmZv Lm1pbWVzLnNpemUoKSArIDFdOwotICAgICAgICBtaW1lQ2xhc3NJbmZvLmRlc2MgPSBkZXNjcmlw dGlvbjsKLQotICAgICAgICBwbHVnaW5JbmZvLm1pbWVzLmFwcGVuZChtaW1lQ2xhc3NJbmZvKTsK LSAgICB9Ci0KLSAgICBOU1N0cmluZyAqZmlsZW5hbWUgPSBbKE5TU3RyaW5nICopcGF0aCBsYXN0 UGF0aENvbXBvbmVudF07Ci0gICAgcGx1Z2luSW5mby5maWxlID0gZmlsZW5hbWU7Ci0gICAgCi0g ICAgZGVzY3JpcHRpb24gPSBbc2VsZiBzdHJpbmdGb3JTdHJpbmdMaXN0SUQ6UGx1Z2luTmFtZU9y RGVzY3JpcHRpb25TdHJpbmdOdW1iZXIgYW5kSW5kZXg6MV07Ci0gICAgaWYgKCFkZXNjcmlwdGlv bikKLSAgICAgICAgZGVzY3JpcHRpb24gPSBmaWxlbmFtZTsKLSAgICBwbHVnaW5JbmZvLmRlc2Mg PSBkZXNjcmlwdGlvbjsKLSAgICAKLSAgICAKLSAgICBOU1N0cmluZyAqdGhlTmFtZSA9IFtzZWxm IHN0cmluZ0ZvclN0cmluZ0xpc3RJRDpQbHVnaW5OYW1lT3JEZXNjcmlwdGlvblN0cmluZ051bWJl ciBhbmRJbmRleDoyXTsKLSAgICBpZiAoIXRoZU5hbWUpCi0gICAgICAgIHRoZU5hbWUgPSBmaWxl bmFtZTsKLSAgICBwbHVnaW5JbmZvLm5hbWUgPSB0aGVOYW1lOwotCi0gICAgcGx1Z2luSW5mby5p c0FwcGxpY2F0aW9uUGx1Z2luID0gZmFsc2U7Ci0gICAgcGx1Z2luSW5mby5jbGllbnRMb2FkUG9s aWN5ID0gUGx1Z2luTG9hZENsaWVudFBvbGljeVVuZGVmaW5lZDsKLSNpZiBQTEFURk9STShNQUMp Ci0gICAgcGx1Z2luSW5mby5idW5kbGVJZGVudGlmaWVyID0gc2VsZi5idW5kbGVJZGVudGlmaWVy OwotICAgIHBsdWdpbkluZm8udmVyc2lvblN0cmluZyA9IHNlbGYuYnVuZGxlVmVyc2lvbjsKLSNl bmRpZgotCi0gICAgW3NlbGYgY2xvc2VSZXNvdXJjZUZpbGU6cmVzUmVmXTsKLSAgICAKLSAgICBy ZXR1cm4gWUVTOwotfQotI2lmIENPTVBJTEVSKENMQU5HKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9z dGljIHBvcAotI2VuZGlmCi0KIC0gKEJPT0wpX2luaXRXaXRoUGF0aDooTlNTdHJpbmcgKilwbHVn aW5QYXRoCiB7CiAgICAgcmVzb3VyY2VSZWYgPSAtMTsKQEAgLTE5Niw3ICs5Nyw3IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiAjZW5kaWYKIAotICAgIGlmICghW3NlbGYgZ2V0UGx1Z2lu SW5mb0Zyb21QTGlzdHNdICYmICFbc2VsZiBnZXRQbHVnaW5JbmZvRnJvbVJlc291cmNlc10pCisg ICAgaWYgKCFbc2VsZiBnZXRQbHVnaW5JbmZvRnJvbVBMaXN0c10pCiAgICAgICAgIHJldHVybiBO TzsKICAgICAKICAgICByZXR1cm4gWUVTOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9k dWxlTWFjLm1tCmluZGV4IGMyMjg1ODAxOGRkNGY4YzhkNDc2MGUyNzQ2NTExNGI4NDAwM2RiZmEu LjE1NjQxMzYxOWQzNmM1MjAzYWE1ZWJjYzg4NzJhMmY5ZDZkNDNlYTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1v ZHVsZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9t YWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0KQEAgLTMwLDcgKzMwLDYgQEAKIAogI2ltcG9y dCAiUGx1Z2luUHJvY2Vzc1Byb3h5LmgiCiAjaW1wb3J0ICJQbHVnaW5TYW5kYm94UHJvZmlsZS5o IgotI2ltcG9ydCA8V2ViQ29yZS9XZWJDb3JlTlNTdHJpbmdFeHRyYXMuaD4KICNpbXBvcnQgPHd0 Zi9IYXNoU2V0Lmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogCkBAIC0yMTgsMTM5ICsy MTcsNiBAQCBzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5TGlzdHMoQ0ZCdW5k bGVSZWYgYnVuZGxlLCBQbHVnaW5Nb2R1bGVJbmZvJgogICAgIHJldHVybiB0cnVlOyAgICAKIH0K IAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3Rp YyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgotCi1jbGFzcyBSZXNvdXJjZU1h cCB7Ci1wdWJsaWM6Ci0gICAgZXhwbGljaXQgUmVzb3VyY2VNYXAoQ0ZCdW5kbGVSZWYgYnVuZGxl KQotICAgICAgICA6IG1fYnVuZGxlKGJ1bmRsZSkKLSAgICAgICAgLCBtX2N1cnJlbnRSZXNvdXJj ZUZpbGUoQ3VyUmVzRmlsZSgpKQotICAgICAgICAsIG1fYnVuZGxlUmVzb3VyY2VNYXAoQ0ZCdW5k bGVPcGVuQnVuZGxlUmVzb3VyY2VNYXAobV9idW5kbGUpKQotICAgIHsKLSAgICAgICAgVXNlUmVz RmlsZShtX2J1bmRsZVJlc291cmNlTWFwKTsKLSAgICB9Ci0KLSAgICB+UmVzb3VyY2VNYXAoKQot ICAgIHsKLSAgICAgICAgLy8gQ2xvc2UgdGhlIHJlc291cmNlIG1hcC4KLSAgICAgICAgQ0ZCdW5k bGVDbG9zZUJ1bmRsZVJlc291cmNlTWFwKG1fYnVuZGxlLCBtX2J1bmRsZVJlc291cmNlTWFwKTsK LSAgICAgICAgCi0gICAgICAgIC8vIEFuZCByZXN0b3JlIHRoZSBvbGQgcmVzb3VyY2UuCi0gICAg ICAgIFVzZVJlc0ZpbGUobV9jdXJyZW50UmVzb3VyY2VGaWxlKTsKLSAgICB9Ci0KLSAgICBib29s IGlzVmFsaWQoKSBjb25zdCB7IHJldHVybiBtX2J1bmRsZVJlc291cmNlTWFwICE9IC0xOyB9Ci0K LXByaXZhdGU6Ci0gICAgQ0ZCdW5kbGVSZWYgbV9idW5kbGU7Ci0gICAgUmVzRmlsZVJlZk51bSBt X2N1cnJlbnRSZXNvdXJjZUZpbGU7Ci0gICAgUmVzRmlsZVJlZk51bSBtX2J1bmRsZVJlc291cmNl TWFwOwotfTsKLQotc3RhdGljIGJvb2wgZ2V0U3RyaW5nTGlzdFJlc291cmNlKFJlc0lEIHJlc291 cmNlSUQsIFZlY3RvcjxTdHJpbmc+JiBzdHJpbmdMaXN0KSB7Ci0gICAgSGFuZGxlIHN0cmluZ0xp c3RIYW5kbGUgPSBHZXQxUmVzb3VyY2UoJ1NUUiMnLCByZXNvdXJjZUlEKTsKLSAgICBpZiAoIXN0 cmluZ0xpc3RIYW5kbGUgfHwgISpzdHJpbmdMaXN0SGFuZGxlKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICAvLyBHZXQgdGhlIHN0cmluZyBsaXN0IHNpemUuCi0gICAgU2l6ZSBzdHJpbmdM aXN0U2l6ZSA9IEdldEhhbmRsZVNpemUoc3RyaW5nTGlzdEhhbmRsZSk7Ci0gICAgaWYgKHN0cmlu Z0xpc3RTaXplIDwgc3RhdGljX2Nhc3Q8U2l6ZT4oc2l6ZW9mKFVJbnQxNikpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICBDRlN0cmluZ0VuY29kaW5nIHN0cmluZ0VuY29kaW5nID0gc3Ry aW5nRW5jb2RpbmdGb3JSZXNvdXJjZShzdHJpbmdMaXN0SGFuZGxlKTsKLQotICAgIHVuc2lnbmVk IGNoYXIqIHB0ciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgY2hhcio+KCpzdHJpbmdMaXN0 SGFuZGxlKTsKLSAgICB1bnNpZ25lZCBjaGFyKiBlbmQgPSBwdHIgKyBzdHJpbmdMaXN0U2l6ZTsK LSAgICAKLSAgICAvLyBHZXQgdGhlIG51bWJlciBvZiBzdHJpbmdzIGluIHRoZSBzdHJpbmcgbGlz dC4KLSAgICBVSW50MTYgbnVtU3RyaW5ncyA9ICpyZWludGVycHJldF9jYXN0PFVJbnQxNio+KHB0 cik7Ci0gICAgcHRyICs9IHNpemVvZihVSW50MTYpOwotCi0gICAgZm9yIChVSW50MTYgaSA9IDA7 IGkgPCBudW1TdHJpbmdzOyArK2kpIHsKLSAgICAgICAgLy8gV2UncmUgcGFzdCB0aGUgZW5kIG9m IHRoZSBzdHJpbmcsIGJhaWwuCi0gICAgICAgIGlmIChwdHIgPj0gZW5kKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotCi0gICAgICAgIC8vIEdldCB0aGUgc3RyaW5nIGxlbmd0aC4KLSAgICAg ICAgdW5zaWduZWQgY2hhciBzdHJpbmdMZW5ndGggPSAqcHRyKys7Ci0KLSAgICAgICAgUmV0YWlu UHRyPENGU3RyaW5nUmVmPiBjZlN0cmluZyA9IGFkb3B0Q0YoQ0ZTdHJpbmdDcmVhdGVXaXRoQnl0 ZXNOb0NvcHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwgcHRyLCBzdHJpbmdMZW5ndGgsIHN0cmluZ0Vu Y29kaW5nLCBmYWxzZSwga0NGQWxsb2NhdG9yTnVsbCkpOwotICAgICAgICBpZiAoIWNmU3RyaW5n LmdldCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIHN0cmluZ0xpc3Qu YXBwZW5kKGNmU3RyaW5nLmdldCgpKTsKLSAgICAgICAgcHRyICs9IHN0cmluZ0xlbmd0aDsKLSAg ICB9Ci0KLSAgICBpZiAocHRyICE9IGVuZCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg cmV0dXJuIHRydWU7Ci19Ci0KLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKLQotc3RhdGlj IGNvbnN0IFJlc0lEIFBsdWdpbk5hbWVPckRlc2NyaXB0aW9uU3RyaW5nTnVtYmVyID0gMTI2Owot c3RhdGljIGNvbnN0IFJlc0lEIE1JTUVEZXNjcmlwdGlvblN0cmluZ051bWJlciA9IDEyNzsKLXN0 YXRpYyBjb25zdCBSZXNJRCBNSU1FTGlzdFN0cmluZ1N0cmluZ051bWJlciA9IDEyODsKLQotc3Rh dGljIGJvb2wgZ2V0UGx1Z2luSW5mb0Zyb21DYXJib25SZXNvdXJjZXMoQ0ZCdW5kbGVSZWYgYnVu ZGxlLCBQbHVnaW5Nb2R1bGVJbmZvJiBwbHVnaW4pCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6Omlz TWFpbigpKTsKLQotICAgIFJlc291cmNlTWFwIHJlc291cmNlTWFwKGJ1bmRsZSk7Ci0gICAgaWYg KCFyZXNvdXJjZU1hcC5pc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8v IEdldCB0aGUgZGVzY3JpcHRpb24gYW5kIG5hbWUgc3RyaW5nIGxpc3QuCi0gICAgVmVjdG9yPFN0 cmluZz4gZGVzY3JpcHRpb25BbmROYW1lOwotICAgIGlmICghZ2V0U3RyaW5nTGlzdFJlc291cmNl KFBsdWdpbk5hbWVPckRlc2NyaXB0aW9uU3RyaW5nTnVtYmVyLCBkZXNjcmlwdGlvbkFuZE5hbWUp KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyBHZXQgdGhlIE1JTUUgdHlwZXMgYW5k IGV4dGVuc2lvbnMgc3RyaW5nIGxpc3QuIFRoaXMgbGlzdCBuZWVkcyB0byBiZSBhIG11bHRpcGxl IG9mIHR3by4KLSAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZXNBbmRFeHRlbnNpb25zOwotICAg IGlmICghZ2V0U3RyaW5nTGlzdFJlc291cmNlKE1JTUVMaXN0U3RyaW5nU3RyaW5nTnVtYmVyLCBt aW1lVHlwZXNBbmRFeHRlbnNpb25zKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYg KG1pbWVUeXBlc0FuZEV4dGVuc2lvbnMuc2l6ZSgpICUgMikKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgLy8gTm93IGdldCB0aGUgTUlNRSB0eXBlIGRlc2NyaXB0aW9ucyBzdHJpbmcgbGlz dC4gVGhpcyBzdHJpbmcgbGlzdCBuZWVkcyB0byBiZSB0aGUgc2FtZSBsZW5ndGggYXMgdGhlIG51 bWJlciBvZiBNSU1FIHR5cGVzLgotICAgIFZlY3RvcjxTdHJpbmc+IG1pbWVUeXBlRGVzY3JpcHRp b25zOwotICAgIGlmICghZ2V0U3RyaW5nTGlzdFJlc291cmNlKE1JTUVEZXNjcmlwdGlvblN0cmlu Z051bWJlciwgbWltZVR5cGVEZXNjcmlwdGlvbnMpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICAvLyBBZGQgYWxsIE1JTUUgdHlwZXMuCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt aW1lVHlwZXNBbmRFeHRlbnNpb25zLnNpemUoKSAvIDI7ICsraSkgewotICAgICAgICBNaW1lQ2xh c3NJbmZvIG1pbWVDbGFzc0luZm87Ci0gICAgICAgIAotICAgICAgICBjb25zdCBTdHJpbmcmIG1p bWVUeXBlID0gbWltZVR5cGVzQW5kRXh0ZW5zaW9uc1tpICogMl07Ci0gICAgICAgIFN0cmluZyBk ZXNjcmlwdGlvbjsKLSAgICAgICAgaWYgKGkgPCBtaW1lVHlwZURlc2NyaXB0aW9ucy5zaXplKCkp Ci0gICAgICAgICAgICBkZXNjcmlwdGlvbiA9IG1pbWVUeXBlRGVzY3JpcHRpb25zW2ldOwotICAg ICAgICAKLSAgICAgICAgbWltZUNsYXNzSW5mby50eXBlID0gbWltZVR5cGUubG93ZXIoKTsKLSAg ICAgICAgbWltZUNsYXNzSW5mby5kZXNjID0gZGVzY3JpcHRpb247Ci0gICAgICAgIAotICAgICAg ICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25zOwotICAgICAgICBtaW1lVHlwZXNBbmRFeHRlbnNp b25zW2kgKiAyICsgMV0uc3BsaXQoJywnLCBleHRlbnNpb25zKTsKLSAgICAgICAgCi0gICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5zaXplKCk7ICsraSkKLSAgICAgICAg ICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQoZXh0ZW5zaW9uc1tpXS5sb3dlcigp KTsKLQotICAgICAgICBwbHVnaW4uaW5mby5taW1lcy5hcHBlbmQobWltZUNsYXNzSW5mbyk7Ci0g ICAgfQotCi0gICAgLy8gU2V0IHRoZSBkZXNjcmlwdGlvbiBhbmQgbmFtZSBpZiB0aGV5IGV4aXN0 LgotICAgIGlmIChkZXNjcmlwdGlvbkFuZE5hbWUuc2l6ZSgpID4gMCkKLSAgICAgICAgcGx1Z2lu LmluZm8uZGVzYyA9IGRlc2NyaXB0aW9uQW5kTmFtZVswXTsKLSAgICBpZiAoZGVzY3JpcHRpb25B bmROYW1lLnNpemUoKSA+IDEpCi0gICAgICAgIHBsdWdpbi5pbmZvLm5hbWUgPSBkZXNjcmlwdGlv bkFuZE5hbWVbMV07Ci0KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogYm9vbCBOZXRzY2FwZVBsdWdp bk1vZHVsZTo6Z2V0UGx1Z2luSW5mbyhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBsdWdpbk1v ZHVsZUluZm8mIHBsdWdpbikKIHsKICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGJ1bmRsZVVSTCA9 IGFkb3B0Q0YoQ0ZVUkxDcmVhdGVXaXRoRmlsZVN5c3RlbVBhdGgoa0NGQWxsb2NhdG9yRGVmYXVs dCwgcGx1Z2luUGF0aC5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBrQ0ZVUkxQT1NJWFBhdGhTdHls ZSwgZmFsc2UpKTsKQEAgLTM4Nyw5ICsyNTMsNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luTW9kdWxl OjpnZXRQbHVnaW5JbmZvKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGx1Z2luTW9kdWxlSQog ICAgICAgICAgICAgcGx1Z2luLnByZWZlcmVuY2VQYW5lUGF0aCA9IHN0YXRpY19jYXN0PENGU3Ry aW5nUmVmPihwcmVmZXJlbmNlUGF0aFR5cGVSZWYpOwogICAgIH0KIAotICAgIC8vIENoZWNrIHRo YXQgdGhlcmUncyB2YWxpZCBpbmZvIGZvciB0aGlzIHBsdWctaW4uCi0gICAgaWYgKCFnZXRQbHVn aW5JbmZvRnJvbVByb3BlcnR5TGlzdHMoYnVuZGxlLmdldCgpLCBwbHVnaW4pICYmCi0gICAgICAg ICFnZXRQbHVnaW5JbmZvRnJvbUNhcmJvblJlc291cmNlcyhidW5kbGUuZ2V0KCksIHBsdWdpbikp CisgICAgaWYgKCFnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5TGlzdHMoYnVuZGxlLmdldCgpLCBw bHVnaW4pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBwbHVnaW4uaGFzU2FuZGJveFBy b2ZpbGUgPSBwbHVnaW5IYXNTYW5kYm94UHJvZmlsZShwbHVnaW4uYnVuZGxlSWRlbnRpZmllcik7 Cg==