113918 2013-04-03 19:28:16 -0700 Expose settings to disable plugin snapshotting autostart and primary detection 2013-04-04 11:51:40 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino esprehn+autocc ojan.autocc thorton webkit.review.bot oldest_to_newest 868997 0 dino 2013-04-03 19:28:16 -0700 Expose some settings so that we can disable some of the plugin snapshotting features. <rdar://problem/13569460> 868999 1 196431 dino 2013-04-03 19:35:38 -0700 Created attachment 196431 Patch 869108 2 196465 dino 2013-04-04 04:09:00 -0700 Created attachment 196465 Patch 869261 3 dino 2013-04-04 11:51:40 -0700 Committed r147659: <http://trac.webkit.org/changeset/147659> 196431 2013-04-03 19:35:38 -0700 2013-04-04 04:08:55 -0700 Patch bug-113918-20130404133526.patch text/plain 11334 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg5MWUwOGRjNjU3M2Vi ZGNmNzUxODU1OTVjOWI1ZmQwZGM3NTA2NC4uNzEzM2Y4NDI5NTlhZThiZDA1NDk2NGNlOTJjZjMw ZmFhMGNhMzY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEzLTA0LTAzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBFeHBvc2Ugc2V0dGluZ3MgdG8g ZGlzYWJsZSBwbHVnaW4gc25hcHNob3R0aW5nIGF1dG9zdGFydCBhbmQgcHJpbWFyeSBkZXRlY3Rp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzkx OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBu ZXcgc2V0dGluZ3M6IHByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQgYW5kIGF1 dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQuCisKKyAgICAgICAgKiBodG1s L0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJ bkltYWdlRWxlbWVudDo6dXNlckRpZENsaWNrU25hcHNob3QpOiBEb24ndCB0ZWxsIHRoZSBob3N0 IHRoYXQgd2UndmUgc3RhcnRlZAorICAgICAgICAgICAgaWYgdGhlIGF1dG9zdGFydE9yaWdpblBs dWdJblNuYXBzaG90dGluZ0VuYWJsZWQgaXMgZmFsc2UuCisgICAgICAgIChXZWJDb3JlOjpIVE1M UGx1Z0luSW1hZ2VFbGVtZW50OjpzZXRJc1ByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbik6IERvbid0 IHJlc3RhcnQgYSBwcmltYXJ5CisgICAgICAgICAgICBwbHVnaW4gaWYgcHJpbWFyeVBsdWdJblNu YXBzaG90RGV0ZWN0aW9uRW5hYmxlZCBpcyBmYWxzZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQ bHVnSW5JbWFnZUVsZW1lbnQ6OnN1YmZyYW1lTG9hZGVyV2lsbENyZWF0ZVBsdWdJbik6IERvbid0 IHRlc3QgZm9yIGF1dG9zdGFydCBpZgorICAgICAgICAgICAgYXV0b3N0YXJ0T3JpZ2luUGx1Z0lu U25hcHNob3R0aW5nRW5hYmxlZCBpcyBmYWxzZS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmlu OiBUd28gbmV3IHNldHRpbmdzIHZhbHVlcy4KKworMjAxMy0wNC0wMyAgRGVhbiBKYWNrc29uICA8 ZGlub0BhcHBsZS5jb20+CisKICAgICAgICAgQ3Jvc3MgZmFkZSBpbnRvIHJlc3RhcnRlZCBwbHVn aW4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg2 OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggZjFmY2ExZDIyODg0NjIzMDM2NzU1ZTk3ZjljODhiNDIzYjJhMjlk NC4uODczMjNiOTc1NDlkNzdlN2RhMjVhMDU4YmM3NjU5OWNkNjg0NmNlNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDI4IEBACiAyMDEzLTA0LTAzICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNv bT4KIAorICAgICAgICBFeHBvc2Ugc2V0dGluZ3MgdG8gZGlzYWJsZSBwbHVnaW4gc25hcHNob3R0 aW5nIGF1dG9zdGFydCBhbmQgcHJpbWFyeSBkZXRlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzkxOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBuZXcgc2V0dGluZ3M6IHByaW1hcnlQbHVn SW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQgYW5kIGF1dG9zdGFydE9yaWdpblBsdWdJblNuYXBz aG90dGluZ0VuYWJsZWQuCisgICAgICAgIFRoZXNlIGFyZSBleHBvc2VkIHZpYSBXS1ByZWZlcmVu Y2VzIChXZWJLaXQyIG9ubHksIHNpbmNlIHRoYXQncyB0aGUgb25seSBwb3J0IGFjdGl2ZWx5Cisg ICAgICAgIHVzaW5nIHRoZSBmZWF0dXJlKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJQcmVmZXJl bmNlc1N0b3JlLmg6IEFkZCBtYWNyb3MgZm9yIG5ldyBzZXR0aW5ncy4KKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6IEdldHRlcnMgYW5kIHNldHRlcnMgZm9yIG5l dyBzZXR0aW5ncy4KKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRBdXRvc3RhcnRPcmlnaW5QbHVn SW5TbmFwc2hvdHRpbmdFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRBdXRvc3Rh cnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKToKKyAgICAgICAgKFdLUHJlZmVyZW5j ZXNTZXRQcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKToKKyAgICAgICAgKFdL UHJlZmVyZW5jZXNHZXRQcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnVwZGF0ZVByZWZlcmVuY2VzKTogRm9yd2FyZCBzZXR0aW5ncyB1cGRhdGVzLgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjphZGRQbHVnaW5WaWV3KTogRG9uJ3QgcnVuIHByaW1hcnkgcGx1 Z2luIGRldGVjdGlvbiBpZiB0aGUgc2V0dGluZyBpcyBmYWxzZS4KKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZGlkRmluaXNoTG9hZCk6IERpdHRvLgorCisyMDEzLTA0LTAzICBEZWFuIEphY2tz b24gIDxkaW5vQGFwcGxlLmNvbT4KKwogICAgICAgICBDcm9zcyBmYWRlIGludG8gcmVzdGFydGVk IHBsdWdpbgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEzODY4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdl RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQu Y3BwCmluZGV4IDZmZmI4NjkxNjBiZjZlODU4ZWEzYTViMTRhZmY0YTdmM2FiODNhMGIuLjcwMmIz ZTc2OWQ2ZGFlZjk3YzNmOWRmZDA3NjYwZjhhYzI1ZDI0YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcApAQCAtNDY3LDcgKzQ2Nyw3IEBAIHZv aWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXNlckRpZENsaWNrU25hcHNob3QoUGFzc1JlZlB0 cjxNb3VzZUV2ZW50PiBldmVudCkKIHsKICAgICBtX3BlbmRpbmdDbGlja0V2ZW50RnJvbVNuYXBz aG90ID0gZXZlbnQ7CiAgICAgU3RyaW5nIHBsdWdJbk9yaWdpbiA9IG1fbG9hZGVkVXJsLmhvc3Qo KTsKLSAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpICYmICFTY2hlbWVSZWdpc3RyeTo6c2hvdWxk VHJlYXRVUkxTY2hlbWVBc0xvY2FsKGRvY3VtZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmRv Y3VtZW50KCktPmJhc2VVUkwoKS5wcm90b2NvbCgpKSkKKyAgICBpZiAoZG9jdW1lbnQoKS0+cGFn ZSgpICYmICFTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKGRvY3Vt ZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPmJhc2VVUkwoKS5wcm90b2Nv bCgpKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPmF1dG9zdGFydE9yaWdpblBs dWdJblNuYXBzaG90dGluZ0VuYWJsZWQoKSkKICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgpLT5w bHVnSW5DbGllbnQoKS0+ZGlkU3RhcnRGcm9tT3JpZ2luKGRvY3VtZW50KCktPnBhZ2UoKS0+bWFp bkZyYW1lKCktPmRvY3VtZW50KCktPmJhc2VVUkwoKS5ob3N0KCksIHBsdWdJbk9yaWdpbiwgbG9h ZGVkTWltZVR5cGUoKSk7CiAKICAgICByZXN0YXJ0U25hcHNob3R0ZWRQbHVnSW4oKTsKQEAgLTQ3 Niw2ICs0NzYsOSBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnVzZXJEaWRDbGlja1Nu YXBzaG90KFBhc3NSZWZQdHI8TW91c2VFdmVudD4gZXZlbnQpCiAKIHZvaWQgSFRNTFBsdWdJbklt YWdlRWxlbWVudDo6c2V0SXNQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oYm9vbCBpc1ByaW1hcnlT bmFwc2hvdHRlZFBsdWdJbikKIHsKKyAgICBpZiAoIWRvY3VtZW50KCktPnBhZ2UoKSB8fCAhZG9j dW1lbnQoKS0+cGFnZSgpLT5zZXR0aW5ncygpLT5wcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rp b25FbmFibGVkKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChpc1ByaW1hcnlTbmFwc2hv dHRlZFBsdWdJbikgewogICAgICAgICByZXN0YXJ0U25hcHNob3R0ZWRQbHVnSW4oKTsKICAgICAg ICAgcmVzdGFydFNpbWlsYXJQbHVnSW5zKCk7CkBAIC01ODEsNyArNTg0LDcgQEAgdm9pZCBIVE1M UGx1Z0luSW1hZ2VFbGVtZW50OjpzdWJmcmFtZUxvYWRlcldpbGxDcmVhdGVQbHVnSW4oY29uc3Qg S1VSTCYgdXJsKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKGRvY3VtZW50KCkt PnBhZ2UoKS0+cGx1Z0luQ2xpZW50KCktPnNob3VsZEF1dG9TdGFydEZyb21PcmlnaW4oZG9jdW1l bnQoKS0+cGFnZSgpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLmhvc3QoKSwg dXJsLmhvc3QoKSwgbG9hZGVkTWltZVR5cGUoKSkpIHsKKyAgICBpZiAoZG9jdW1lbnQoKS0+cGFn ZSgpLT5zZXR0aW5ncygpLT5hdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVk KCkgJiYgZG9jdW1lbnQoKS0+cGFnZSgpLT5wbHVnSW5DbGllbnQoKS0+c2hvdWxkQXV0b1N0YXJ0 RnJvbU9yaWdpbihkb2N1bWVudCgpLT5wYWdlKCktPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpLT5i YXNlVVJMKCkuaG9zdCgpLCB1cmwuaG9zdCgpLCBsb2FkZWRNaW1lVHlwZSgpKSkgewogICAgICAg ICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gZnJvbSAoJXMsICVzKSBpcyBtYXJrZWQgdG8gYXV0 by1zdGFydCwgc2V0IHRvIHBsYXkiLCB0aGlzLCBkb2N1bWVudCgpLT5wYWdlKCktPm1haW5GcmFt ZSgpLT5kb2N1bWVudCgpLT5iYXNlVVJMKCkuaG9zdCgpLnV0ZjgoKS5kYXRhKCksIHVybC5ob3N0 KCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0 aW5ncy5pbgppbmRleCA4NDEzNGM4ZTAwZjc5OGU4NmM0ZTc2NzllZGNjMmQyZTgxNjUzMDU5Li4z MjllOWUyYmYwN2QyMjcwMTkxOGU0MWU3MDllYWY5ODY4MTJjNjIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuaW4KQEAgLTE4MSw2ICsxODEsOCBAQCBkaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQgaW5p dGlhbD1mYWxzZQogYXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvciBpbml0aWFsPXRy dWUKIGFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yIGluaXRpYWw9ZmFsc2UKIHBsdWdJ blNuYXBzaG90dGluZ0VuYWJsZWQgaW5pdGlhbD1mYWxzZQorYXV0b3N0YXJ0T3JpZ2luUGx1Z0lu U25hcHNob3R0aW5nRW5hYmxlZCBpbml0aWFsPXRydWUKK3ByaW1hcnlQbHVnSW5TbmFwc2hvdERl dGVjdGlvbkVuYWJsZWQgaW5pdGlhbD10cnVlCiBtYXhpbXVtUGx1Z0luU25hcHNob3RBdHRlbXB0 cyB0eXBlPXVuc2lnbmVkLCBpbml0aWFsPTIwCiBmcmFtZUZsYXR0ZW5pbmdFbmFibGVkIGluaXRp YWw9ZmFsc2UKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmgK aW5kZXggMDlmMzM2OTNmNzI5OGE0MjRiNmZiYzMxMDY2ZjlhN2M1MDc4Y2RlNC4uMTA0M2VmN2Jh MWZjNjU3MGFmZjU3ZmQ1NDliZjViODRiMWZhNTJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCkBAIC0xNDQsNiArMTQ0LDggQEAgbmFtZXNwYWNlIFdl YktpdCB7CiAgICAgbWFjcm8oU2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQsIHNjcmVlbkZv bnRTdWJzdGl0dXRpb25FbmFibGVkLCBCb29sLCBib29sLCBERUZBVUxUX1NDUkVFTl9GT05UX1NV QlNUSVRVVElPTl9FTkFCTEVEKSBcCiAgICAgbWFjcm8oQ29va2llRW5hYmxlZCwgY29va2llRW5h YmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKFBsdWdJblNuYXBzaG90dGluZ0Vu YWJsZWQsIHBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisg ICAgbWFjcm8oQXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCwgYXV0b3N0 YXJ0T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAor ICAgIG1hY3JvKFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQsIHByaW1hcnlQ bHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQsIEJvb2wsIGJvb2wsIHRydWUpIFwKICAgICBt YWNybyhQREZQbHVnaW5FbmFibGVkLCBwZGZQbHVnaW5FbmFibGVkLCBCb29sLCBib29sLCBmYWxz ZSkgXAogICAgIG1hY3JvKFVzZXNFbmNvZGluZ0RldGVjdG9yLCB1c2VzRW5jb2RpbmdEZXRlY3Rv ciwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhUZXh0QXV0b3NpemluZ0VuYWJsZWQs IHRleHRBdXRvc2l6aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCA0NTFjZjBi ZTUwYjBjZTc1M2ExYzhmOGExZDdiNzJhZjJhMjRiMDllLi45ZTZjMTkyZTdlNmIzMDI0YTcxZDY0 ZjJhOWU0MzBhMmExNjk4MGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC05OTQsNiArOTk0LDI2IEBAIGJvb2wgV0tQcmVmZXJl bmNlc0dldFBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJl bmNlc1JlZikKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+cGx1Z0luU25hcHNo b3R0aW5nRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRBdXRvc3RhcnRPcmln aW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYsIGJvb2wgZW5hYmxlZCkKK3sKKyAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRBdXRv c3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKGVuYWJsZWQpOworfQorCitib29s IFdLUHJlZmVyZW5jZXNHZXRBdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVk KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChw cmVmZXJlbmNlc1JlZiktPmF1dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQo KTsKK30KKwordm9pZCBXS1ByZWZlcmVuY2VzU2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0 aW9uRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQp Cit7CisgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0UHJpbWFyeVBsdWdJblNuYXBzaG90 RGV0ZWN0aW9uRW5hYmxlZChlbmFibGVkKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0UHJp bWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZl cmVuY2VzUmVmKQoreworICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5wcmltYXJ5 UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNl c1NldFBERlBsdWdpbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9v bCBlbmFibGVkKQogewogICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFBERlBsdWdpbkVu YWJsZWQoZW5hYmxlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4IGE1Y2IxYWZlZGQ4MDc5M2YyNmNlMTNlYzIw YzkyOTFhMGFkODYyYTYuLjRlOWZiOGFmOTJkMWEwZmMxOWRiNGJkMTg1OTViNjRjOWYwOWU3N2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzUHJpdmF0ZS5oCkBAIC0yNjcsNiArMjY3LDE0IEBAIFdLX0VYUE9SVCBib29sIFdLUHJlZmVy ZW5jZXNHZXRIaWRkZW5QYWdlRE9NVGltZXJUaHJvdHRsaW5nRW5hYmxlZChXS1ByZWZlcmVuY2Vz CiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1 c3BlbnNpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMsIGJvb2wgZW5hYmxl ZCk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlv blN1c3BlbnNpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCisvLyBE ZWZhdWx0cyB0byB0cnVlCitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0QXV0b3N0YXJ0 T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGVuYWJsZWQpOworV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEF1 dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZik7CisKKy8vIERlZmF1bHRzIHRvIHRydWUKK1dLX0VYUE9SVCB2b2lkIFdL UHJlZmVyZW5jZXNTZXRQcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCk7CitXS19FWFBPUlQgYm9v bCBXS1ByZWZlcmVuY2VzR2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZChX S1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKTsKKwogV0tfRVhQT1JUIHZvaWQgV0tQcmVm ZXJlbmNlc1Jlc2V0VGVzdFJ1bm5lck92ZXJyaWRlcyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNWRmODU3ZjBiMWZlMDMwOGJkNjMyN2FmMjI3 ZTFiOWRkM2RkYjRmZS4uNGM2ZjVkMzFmOWM2OTMwYTUwNmUyNzJmODI3NTU1MmRkMWY2MGZjNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt MjQxNSw2ICsyNDE1LDggQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBX ZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy0+c2V0U2Nyb2xsaW5nUGVy Zm9ybWFuY2VMb2dnaW5nRW5hYmxlZChtX3Njcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJs ZWQpOwogCiAgICAgc2V0dGluZ3MtPnNldFBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpwbHVnSW5TbmFwc2hvdHRpbmdF bmFibGVkS2V5KCkpKTsKKyAgICBzZXR0aW5ncy0+c2V0QXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25h cHNob3R0aW5nRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OmF1dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWRLZXkoKSkpOworICAg IHNldHRpbmdzLT5zZXRQcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKHN0b3Jl LmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6cHJpbWFyeVBsdWdJblNuYXBz aG90RGV0ZWN0aW9uRW5hYmxlZEtleSgpKSk7CiAgICAgc2V0dGluZ3MtPnNldFVzZXNFbmNvZGlu Z0RldGVjdG9yKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dXNl c0VuY29kaW5nRGV0ZWN0b3JLZXkoKSkpOwogCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykK QEAgLTI5MTksNyArMjkyMSw4IEBAIHZvaWQgV2ViUGFnZTo6YWRkUGx1Z2luVmlldyhQbHVnaW5W aWV3KiBwbHVnaW5WaWV3KQogCiAgICAgbV9wbHVnaW5WaWV3cy5hZGQocGx1Z2luVmlldyk7CiAj aWYgRU5BQkxFKFBSSU1BUllfU05BUFNIT1RURURfUExVR0lOX0hFVVJJU1RJQykKLSAgICBkZXRl cm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKTsKKyAgICBpZiAobV9wYWdlLT5zZXR0aW5n cygpLT5wcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKCkpCisgICAgICAgIGRl dGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpOwogI2VuZGlmCiB9CiAKQEAgLTM4OTcs NyArMzkwMCw4IEBAIHZvaWQgV2ViUGFnZTo6ZGlkRmluaXNoTG9hZChXZWJGcmFtZSogZnJhbWUp CiB7CiAjaWYgRU5BQkxFKFBSSU1BUllfU05BUFNIT1RURURfUExVR0lOX0hFVVJJU1RJQykKICAg ICBtX3JlYWR5VG9GaW5kUHJpbWFyeVNuYXBzaG90dGVkUGx1Z2luID0gdHJ1ZTsKLSAgICBkZXRl cm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKTsKKyAgICBpZiAobV9wYWdlLT5zZXR0aW5n cygpLT5wcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkKCkpCisgICAgICAgIGRl dGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpOwogI2VuZGlmCiB9CiAK 196465 2013-04-04 04:09:00 -0700 2013-04-04 11:38:08 -0700 Patch bug-113918-20130404220848.patch text/plain 13141 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg5MWUwOGRjNjU3M2Vi ZGNmNzUxODU1OTVjOWI1ZmQwZGM3NTA2NC4uNGI5ZmNlMzZlZDE1NDFlYTlhMGRkZDVkYWIzNGQy YzE5YTY1ZDIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTA0LTAzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBFeHBvc2Ugc2V0dGluZ3MgdG8g ZGlzYWJsZSBwbHVnaW4gc25hcHNob3R0aW5nIGF1dG9zdGFydCBhbmQgcHJpbWFyeSBkZXRlY3Rp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzkx OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRocmVl IG5ldyBzZXR0aW5nczoKKyAgICAgICAgLSBzbmFwc2hvdEFsbFBsdWdJbnM6IERvIG5vdCBhcHBs eSBhbnkgaGV1cmlzdGljcyAtIGltbWVkaWF0ZWx5IHNuYXBzaG90IGEgcGx1Z2luLgorICAgICAg ICAtIHByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQ6IFRvZ2dsZSBzbmFwc2hv dHRpbmcgdGhlICJtYWluIiBwbHVnaW4gaW4gdGhlIHBhZ2UuCisgICAgICAgIC0gYXV0b3N0YXJ0 T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZDogVG9nZ2xlIHNuYXBzaG90dGluZyBiYXNl ZCBvbiBVUkwgb3JpZ2lucy4KKworICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1c2VyRGlk Q2xpY2tTbmFwc2hvdCk6IERvbid0IHRlbGwgdGhlIGhvc3QgdGhhdCB3ZSd2ZSBzdGFydGVkCisg ICAgICAgICAgICBpZiB0aGUgYXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxl ZCBpcyBmYWxzZS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnNl dElzUHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luKTogRG9uJ3QgcmVzdGFydCBhIHByaW1hcnkKKyAg ICAgICAgICAgIHBsdWdpbiBpZiBwcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVk IGlzIGZhbHNlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c3Vi ZnJhbWVMb2FkZXJXaWxsQ3JlYXRlUGx1Z0luKTogU25hcHNob3QgaW1tZWRpYXRlbHkgaWYKKyAg ICAgICAgICAgIHNuYXBzaG90QWxsUGx1Z0lucyBpcyB0cnVlLiBBbHNvLCBkb24ndCB0ZXN0IGZv ciBhdXRvc3RhcnQgaWYKKyAgICAgICAgICAgIGF1dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90 dGluZ0VuYWJsZWQgaXMgZmFsc2UuCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5pbjogVGhyZWUg bmV3IHNldHRpbmdzIHZhbHVlcy4KKworMjAxMy0wNC0wMyAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CisKICAgICAgICAgQ3Jvc3MgZmFkZSBpbnRvIHJlc3RhcnRlZCBwbHVnaW4KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg2OAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggZjFmY2ExZDIyODg0NjIzMDM2NzU1ZTk3ZjljODhiNDIzYjJhMjlkNC4uODA4 MzY3M2FjZTk0ZTY0NzVmODQ5MjY3M2UyZTVjYjZkY2M3YjllYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDMxIEBACiAyMDEzLTA0LTAzICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAor ICAgICAgICBFeHBvc2Ugc2V0dGluZ3MgdG8gZGlzYWJsZSBwbHVnaW4gc25hcHNob3R0aW5nIGF1 dG9zdGFydCBhbmQgcHJpbWFyeSBkZXRlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzkxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRocmVlIG5ldyBzZXR0aW5nczogc25hcHNob3RBbGxQbHVn SW5zLCBwcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25FbmFibGVkIGFuZAorICAgICAgICBh dXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkLgorICAgICAgICBUaGVzZSBh cmUgZXhwb3NlZCB2aWEgV0tQcmVmZXJlbmNlcyAoV2ViS2l0MiBvbmx5LCBzaW5jZSB0aGF0J3Mg dGhlIG9ubHkgcG9ydCBhY3RpdmVseQorICAgICAgICB1c2luZyB0aGUgZmVhdHVyZSkuCisKKyAg ICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oOiBBZGQgbWFjcm9zIGZvciBuZXcg c2V0dGluZ3MuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwOiBH ZXR0ZXJzIGFuZCBzZXR0ZXJzIGZvciBuZXcgc2V0dGluZ3MuCisgICAgICAgIChXS1ByZWZlcmVu Y2VzU2V0U25hcHNob3RBbGxQbHVnSW5zKToKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNHZXRTbmFw c2hvdEFsbFBsdWdJbnMpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc1NldEF1dG9zdGFydE9yaWdp blBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldEF1 dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQpOgorICAgICAgICAoV0tQcmVm ZXJlbmNlc1NldFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQpOgorICAgICAg ICAoV0tQcmVmZXJlbmNlc0dldFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOiBGb3J3YXJkIHNldHRpbmdzIHVwZGF0ZXMuCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmFkZFBsdWdpblZpZXcpOiBEb24ndCBydW4gcHJpbWFy eSBwbHVnaW4gZGV0ZWN0aW9uIGlmIHRoZSBzZXR0aW5nIGlzIGZhbHNlLgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpkaWRGaW5pc2hMb2FkKTogRGl0dG8uCisKKzIwMTMtMDQtMDMgIERlYW4g SmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCiAgICAgICAgIENyb3NzIGZhZGUgaW50byByZXN0 YXJ0ZWQgcGx1Z2luCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTM4NjgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxl bWVudC5jcHAKaW5kZXggNmZmYjg2OTE2MGJmNmU4NThlYTNhNWIxNGFmZjRhN2YzYWI4M2EwYi4u ZWNjOGFmY2U1YmU1NTlhZTQyZWJmNmZjNjM2MzIzNGJkNWU4YmJhZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCkBAIC00NjcsNyArNDY3LDcg QEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1c2VyRGlkQ2xpY2tTbmFwc2hvdChQYXNz UmVmUHRyPE1vdXNlRXZlbnQ+IGV2ZW50KQogewogICAgIG1fcGVuZGluZ0NsaWNrRXZlbnRGcm9t U25hcHNob3QgPSBldmVudDsKICAgICBTdHJpbmcgcGx1Z0luT3JpZ2luID0gbV9sb2FkZWRVcmwu aG9zdCgpOwotICAgIGlmIChkb2N1bWVudCgpLT5wYWdlKCkgJiYgIVNjaGVtZVJlZ2lzdHJ5Ojpz aG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwoZG9jdW1lbnQoKS0+cGFnZSgpLT5tYWluRnJhbWUo KS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLnByb3RvY29sKCkpKQorICAgIGlmIChkb2N1bWVudCgp LT5wYWdlKCkgJiYgIVNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwo ZG9jdW1lbnQoKS0+cGFnZSgpLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLnBy b3RvY29sKCkpICYmIGRvY3VtZW50KCktPnBhZ2UoKS0+c2V0dGluZ3MoKS0+YXV0b3N0YXJ0T3Jp Z2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCgpKQogICAgICAgICBkb2N1bWVudCgpLT5wYWdl KCktPnBsdWdJbkNsaWVudCgpLT5kaWRTdGFydEZyb21PcmlnaW4oZG9jdW1lbnQoKS0+cGFnZSgp LT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLmhvc3QoKSwgcGx1Z0luT3JpZ2lu LCBsb2FkZWRNaW1lVHlwZSgpKTsKIAogICAgIHJlc3RhcnRTbmFwc2hvdHRlZFBsdWdJbigpOwpA QCAtNDc2LDYgKzQ3Niw5IEBAIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXNlckRpZENs aWNrU25hcHNob3QoUGFzc1JlZlB0cjxNb3VzZUV2ZW50PiBldmVudCkKIAogdm9pZCBIVE1MUGx1 Z0luSW1hZ2VFbGVtZW50OjpzZXRJc1ByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbihib29sIGlzUHJp bWFyeVNuYXBzaG90dGVkUGx1Z0luKQogeworICAgIGlmICghZG9jdW1lbnQoKS0+cGFnZSgpIHx8 ICFkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPnByaW1hcnlQbHVnSW5TbmFwc2hvdERl dGVjdGlvbkVuYWJsZWQoKSB8fCBkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPnNuYXBz aG90QWxsUGx1Z0lucygpKQorICAgICAgICByZXR1cm47CisKICAgICBpZiAoaXNQcmltYXJ5U25h cHNob3R0ZWRQbHVnSW4pIHsKICAgICAgICAgcmVzdGFydFNuYXBzaG90dGVkUGx1Z0luKCk7CiAg ICAgICAgIHJlc3RhcnRTaW1pbGFyUGx1Z0lucygpOwpAQCAtNTU0LDYgKzU1NywxMiBAQCB2b2lk IEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnN1YmZyYW1lTG9hZGVyV2lsbENyZWF0ZVBsdWdJbihj b25zdCBLVVJMJiB1cmwpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAoZG9jdW1l bnQoKS0+cGFnZSgpLT5zZXR0aW5ncygpLT5zbmFwc2hvdEFsbFBsdWdJbnMoKSkgeworICAgICAg ICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gZm9yY2VkIHRvIHNuYXBzaG90IGJ5IHVzZXIgcHJl ZmVyZW5jZSIsIHRoaXMpOworICAgICAgICBzZXREaXNwbGF5U3RhdGUoV2FpdGluZ0ZvclNuYXBz aG90KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFJlbmRlckJveCogcmVuZGVyRW1i ZWRkZWRPYmplY3QgPSB0b1JlbmRlckJveChyZW5kZXJlcigpKTsKICAgICBMZW5ndGggc3R5bGVX aWR0aCA9IHJlbmRlckVtYmVkZGVkT2JqZWN0LT5zdHlsZSgpLT53aWR0aCgpOwogICAgIExlbmd0 aCBzdHlsZUhlaWdodCA9IHJlbmRlckVtYmVkZGVkT2JqZWN0LT5zdHlsZSgpLT5oZWlnaHQoKTsK QEAgLTU4MSw3ICs1OTAsNyBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnN1YmZyYW1l TG9hZGVyV2lsbENyZWF0ZVBsdWdJbihjb25zdCBLVVJMJiB1cmwpCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpLT5wbHVnSW5DbGllbnQoKS0+c2hv dWxkQXV0b1N0YXJ0RnJvbU9yaWdpbihkb2N1bWVudCgpLT5wYWdlKCktPm1haW5GcmFtZSgpLT5k b2N1bWVudCgpLT5iYXNlVVJMKCkuaG9zdCgpLCB1cmwuaG9zdCgpLCBsb2FkZWRNaW1lVHlwZSgp KSkgeworICAgIGlmIChkb2N1bWVudCgpLT5wYWdlKCktPnNldHRpbmdzKCktPmF1dG9zdGFydE9y aWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCktPnBs dWdJbkNsaWVudCgpLT5zaG91bGRBdXRvU3RhcnRGcm9tT3JpZ2luKGRvY3VtZW50KCktPnBhZ2Uo KS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPmJhc2VVUkwoKS5ob3N0KCksIHVybC5ob3N0KCks IGxvYWRlZE1pbWVUeXBlKCkpKSB7CiAgICAgICAgIExPRyhQbHVnaW5zLCAiJXAgUGx1Zy1pbiBm cm9tICglcywgJXMpIGlzIG1hcmtlZCB0byBhdXRvLXN0YXJ0LCBzZXQgdG8gcGxheSIsIHRoaXMs IGRvY3VtZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPmJhc2VVUkwoKS5o b3N0KCkudXRmOCgpLmRhdGEoKSwgdXJsLmhvc3QoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3Mu aW4gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCmluZGV4IDg0MTM0YzhlMDBmNzk4 ZTg2YzRlNzY3OWVkY2MyZDJlODE2NTMwNTkuLjNlNTM3ZTc2NzBkOWY5MjIxNmI0N2Y2YmY1MmU1 ODI1Yjc1OTI0YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4K KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgpAQCAtMTgxLDYgKzE4MSw5IEBA IGRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZCBpbml0aWFsPWZhbHNlCiBhcHBseURldmljZVNjYWxl RmFjdG9ySW5Db21wb3NpdG9yIGluaXRpYWw9dHJ1ZQogYXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNv bXBvc2l0b3IgaW5pdGlhbD1mYWxzZQogcGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCBpbml0aWFs PWZhbHNlCitzbmFwc2hvdEFsbFBsdWdJbnMgaW5pdGlhbD1mYWxzZQorYXV0b3N0YXJ0T3JpZ2lu UGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCBpbml0aWFsPXRydWUKK3ByaW1hcnlQbHVnSW5TbmFw c2hvdERldGVjdGlvbkVuYWJsZWQgaW5pdGlhbD10cnVlCiBtYXhpbXVtUGx1Z0luU25hcHNob3RB dHRlbXB0cyB0eXBlPXVuc2lnbmVkLCBpbml0aWFsPTIwCiBmcmFtZUZsYXR0ZW5pbmdFbmFibGVk IGluaXRpYWw9ZmFsc2UKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBy ZWZlcmVuY2VzU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc1N0 b3JlLmgKaW5kZXggMDlmMzM2OTNmNzI5OGE0MjRiNmZiYzMxMDY2ZjlhN2M1MDc4Y2RlNC4uM2Yy ZDc1MWExZDZiMzViYzhhMjg1MmU3MGJkMTBjMWM5Mzg5ZDYxYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCkBAIC0xNDQsNiArMTQ0LDkgQEAgbmFtZXNw YWNlIFdlYktpdCB7CiAgICAgbWFjcm8oU2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQsIHNj cmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkLCBCb29sLCBib29sLCBERUZBVUxUX1NDUkVFTl9G T05UX1NVQlNUSVRVVElPTl9FTkFCTEVEKSBcCiAgICAgbWFjcm8oQ29va2llRW5hYmxlZCwgY29v a2llRW5hYmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKFBsdWdJblNuYXBzaG90 dGluZ0VuYWJsZWQsIHBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNl KSBcCisgICAgbWFjcm8oU25hcHNob3RBbGxQbHVnSW5zLCBzbmFwc2hvdEFsbFBsdWdJbnMsIEJv b2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8oQXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25hcHNo b3R0aW5nRW5hYmxlZCwgYXV0b3N0YXJ0T3JpZ2luUGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCwg Qm9vbCwgYm9vbCwgdHJ1ZSkgXAorICAgIG1hY3JvKFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVj dGlvbkVuYWJsZWQsIHByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWQsIEJvb2ws IGJvb2wsIHRydWUpIFwKICAgICBtYWNybyhQREZQbHVnaW5FbmFibGVkLCBwZGZQbHVnaW5FbmFi bGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFVzZXNFbmNvZGluZ0RldGVjdG9y LCB1c2VzRW5jb2RpbmdEZXRlY3RvciwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhU ZXh0QXV0b3NpemluZ0VuYWJsZWQsIHRleHRBdXRvc2l6aW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwg ZmFsc2UpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1By ZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzLmNwcAppbmRleCA0NTFjZjBiZTUwYjBjZTc1M2ExYzhmOGExZDdiNzJhZjJhMjRiMDllLi4y M2Y5ZTg3Yjc0ZDc5MDQyODJiOGU0ZTk4NzU4ZjMxN2Y5MTMyYTU3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC05OTQsNiArOTk0 LDM2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldFBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+cGx1Z0luU25hcHNob3R0aW5nRW5hYmxlZCgpOwogfQogCit2b2lkIFdLUHJlZmVy ZW5jZXNTZXRTbmFwc2hvdEFsbFBsdWdJbnMoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl ZiwgYm9vbCBlbmFibGVkKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldFNuYXBz aG90QWxsUGx1Z0lucyhlbmFibGVkKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0U25hcHNo b3RBbGxQbHVnSW5zKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7CisgICAgcmV0 dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNuYXBzaG90QWxsUGx1Z0lucygpOworfQorCit2 b2lkIFdLUHJlZmVyZW5jZXNTZXRBdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFi bGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKK3sKKyAg ICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRBdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hv dHRpbmdFbmFibGVkKGVuYWJsZWQpOworfQorCitib29sIFdLUHJlZmVyZW5jZXNHZXRBdXRvc3Rh cnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVy ZW5jZXNSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmF1dG9zdGFy dE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoKTsKK30KKwordm9pZCBXS1ByZWZlcmVu Y2VzU2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZChXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQpCit7CisgICAgdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+c2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZChlbmFibGVk KTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0 aW9uRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQoreworICAgIHJldHVy biB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5wcmltYXJ5UGx1Z0luU25hcHNob3REZXRlY3Rpb25F bmFibGVkKCk7Cit9CisKIHZvaWQgV0tQcmVmZXJlbmNlc1NldFBERlBsdWdpbkVuYWJsZWQoV0tQ cmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKQogewogICAgIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPnNldFBERlBsdWdpbkVuYWJsZWQoZW5hYmxlZCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5o CmluZGV4IGE1Y2IxYWZlZGQ4MDc5M2YyNmNlMTNlYzIwYzkyOTFhMGFkODYyYTYuLjVlYTZkMzRi ZThjMjg5NGI2YjE5NDQ0ZjRlNjU1NzYzNWU3MjFkZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUHJpdmF0ZS5oCkBAIC0yNjcsNiAr MjY3LDE4IEBAIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRIaWRkZW5QYWdlRE9NVGlt ZXJUaHJvdHRsaW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZl cmVuY2VzU2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFibGVkKFdLUHJlZmVy ZW5jZXNSZWYgcHJlZmVyZW5jZXMsIGJvb2wgZW5hYmxlZCk7CiBXS19FWFBPUlQgYm9vbCBXS1By ZWZlcmVuY2VzR2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCisvLyBEZWZhdWx0cyB0byBmYWxzZQorV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldFNuYXBzaG90QWxsUGx1Z0lucyhXS1ByZWZlcmVuY2Vz UmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQpOworV0tfRVhQT1JUIGJvb2wgV0tQcmVm ZXJlbmNlc0dldFNuYXBzaG90QWxsUGx1Z0lucyhXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2Vz UmVmKTsKKworLy8gRGVmYXVsdHMgdG8gdHJ1ZQorV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNl c1NldEF1dG9zdGFydE9yaWdpblBsdWdJblNuYXBzaG90dGluZ0VuYWJsZWQoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBlbmFibGVkKTsKK1dLX0VYUE9SVCBib29sIFdLUHJl ZmVyZW5jZXNHZXRBdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkKFdLUHJl ZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOworCisvLyBEZWZhdWx0cyB0byB0cnVlCitXS19F WFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9u RW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGVuYWJsZWQpOwor V0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFByaW1hcnlQbHVnSW5TbmFwc2hvdERldGVj dGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CisKIFdLX0VYUE9S VCB2b2lkIFdLUHJlZmVyZW5jZXNSZXNldFRlc3RSdW5uZXJPdmVycmlkZXMoV0tQcmVmZXJlbmNl c1JlZiBwcmVmZXJlbmNlc1JlZik7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDVkZjg1N2YwYjFmZTAz MDhiZDYzMjdhZjIyN2UxYjlkZDNkZGI0ZmUuLjkwZWUzM2E1OWRkMTc4ZjIzNWMyMGYwYWM0ZmZi YjY2ZDIwMTQ5NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKQEAgLTI0MTUsNiArMjQxNSw5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVy ZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiAgICAgc2V0dGluZ3MtPnNl dFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQobV9zY3JvbGxpbmdQZXJmb3JtYW5j ZUxvZ2dpbmdFbmFibGVkKTsKIAogICAgIHNldHRpbmdzLT5zZXRQbHVnSW5TbmFwc2hvdHRpbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6cGx1Z0lu U25hcHNob3R0aW5nRW5hYmxlZEtleSgpKSk7CisgICAgc2V0dGluZ3MtPnNldFNuYXBzaG90QWxs UGx1Z0lucyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNuYXBz aG90QWxsUGx1Z0luc0tleSgpKSk7CisgICAgc2V0dGluZ3MtPnNldEF1dG9zdGFydE9yaWdpblBs dWdJblNuYXBzaG90dGluZ0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5OjphdXRvc3RhcnRPcmlnaW5QbHVnSW5TbmFwc2hvdHRpbmdFbmFibGVkS2V5KCkp KTsKKyAgICBzZXR0aW5ncy0+c2V0UHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnByaW1hcnlQbHVn SW5TbmFwc2hvdERldGVjdGlvbkVuYWJsZWRLZXkoKSkpOwogICAgIHNldHRpbmdzLT5zZXRVc2Vz RW5jb2RpbmdEZXRlY3RvcihzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OnVzZXNFbmNvZGluZ0RldGVjdG9yS2V5KCkpKTsKIAogI2lmIEVOQUJMRShURVhUX0FVVE9T SVpJTkcpCkBAIC0yOTE5LDcgKzI5MjIsOCBAQCB2b2lkIFdlYlBhZ2U6OmFkZFBsdWdpblZpZXco UGx1Z2luVmlldyogcGx1Z2luVmlldykKIAogICAgIG1fcGx1Z2luVmlld3MuYWRkKHBsdWdpblZp ZXcpOwogI2lmIEVOQUJMRShQUklNQVJZX1NOQVBTSE9UVEVEX1BMVUdJTl9IRVVSSVNUSUMpCi0g ICAgZGV0ZXJtaW5lUHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luKCk7CisgICAgaWYgKCFtX3BhZ2Ut PnNldHRpbmdzKCktPnNuYXBzaG90QWxsUGx1Z0lucygpICYmIG1fcGFnZS0+c2V0dGluZ3MoKS0+ cHJpbWFyeVBsdWdJblNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZCgpKQorICAgICAgICBkZXRlcm1p bmVQcmltYXJ5U25hcHNob3R0ZWRQbHVnSW4oKTsKICNlbmRpZgogfQogCkBAIC0zODk3LDcgKzM5 MDEsOCBAQCB2b2lkIFdlYlBhZ2U6OmRpZEZpbmlzaExvYWQoV2ViRnJhbWUqIGZyYW1lKQogewog I2lmIEVOQUJMRShQUklNQVJZX1NOQVBTSE9UVEVEX1BMVUdJTl9IRVVSSVNUSUMpCiAgICAgbV9y ZWFkeVRvRmluZFByaW1hcnlTbmFwc2hvdHRlZFBsdWdpbiA9IHRydWU7Ci0gICAgZGV0ZXJtaW5l UHJpbWFyeVNuYXBzaG90dGVkUGx1Z0luKCk7CisgICAgaWYgKCFtX3BhZ2UtPnNldHRpbmdzKCkt PnNuYXBzaG90QWxsUGx1Z0lucygpICYmIG1fcGFnZS0+c2V0dGluZ3MoKS0+cHJpbWFyeVBsdWdJ blNuYXBzaG90RGV0ZWN0aW9uRW5hYmxlZCgpKQorICAgICAgICBkZXRlcm1pbmVQcmltYXJ5U25h cHNob3R0ZWRQbHVnSW4oKTsKICNlbmRpZgogfQogCg==