189517 2018-09-11 12:49:22 -0700 Clean up SuspendedPageProxy 2018-09-12 09:38:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1458588 0 cdumez 2018-09-11 12:49:22 -0700 Clean up SuspendedPageProxy. 1458596 1 349424 cdumez 2018-09-11 12:56:01 -0700 Created attachment 349424 Patch 1458701 2 349468 cdumez 2018-09-11 15:03:15 -0700 Created attachment 349468 Patch 1458988 3 349468 commit-queue 2018-09-12 09:37:03 -0700 Comment on attachment 349468 Patch Clearing flags on attachment: 349468 Committed r235940: <https://trac.webkit.org/changeset/235940> 1458989 4 commit-queue 2018-09-12 09:37:05 -0700 All reviewed patches have been landed. Closing bug. 1458992 5 webkit-bug-importer 2018-09-12 09:38:20 -0700 <rdar://problem/44386037> 349424 2018-09-11 12:56:01 -0700 2018-09-11 15:03:13 -0700 Patch bug-189517-20180911125600.patch text/plain 10393 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNkZTM3ZjU4ZjNhMTQ1Mjcw ZjQ2ZjQ1ZjVmYmNkY2Q3YzMwN2M4NDcuLjc4ODliZTI5MGI3YzZmMzBmNzk2ZWQzZTRiMzgyNTE5 M2JmMmMyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDktMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBTdXNwZW5kZWRQYWdl UHJveHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTUxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENs ZWFuIHVwIFN1c3BlbmRlZFBhZ2VQcm94eToKKyAgICAgICAgMS4gU3VzcGVuZGVkUGFnZVByb3h5 IGRvZXMgbm90IG5lZWQgdG8gYmUgUmVmQ291bnRlZC4gSXQgaXMgZXZlbiBkYW5nZXJvdXMgZ2l2 ZW4gdGhhdCBXZWJQYWdlUHJveHkKKyAgICAgICAgICAgb3ducyB0aGUgU3VzcGVuZGVkUGFnZVBy b3h5IGFuZCBTdXNwZW5kZWRQYWdlUHJveHkgaGFzIGEgV2ViUGFnZVByb3h5JiBkYXRhIG1lbWJl ci4gV2UgZGVmaW5pdGVseQorICAgICAgICAgICBkbyBub3Qgd2FudCBpdCB0byBvdXRsaXZlIGl0 cyBXZWJQYWdlUHJveHkuCisgICAgICAgIDIuIFRoZSBTdXNwZW5kZWRQYWdlUHJveHkgZGVzdHJ1 Y3RvciBkb2VzIG5vdCBuZWVkIHRvIGJlIHZpcnR1YWwuCisgICAgICAgIDMuIEhhdmUgV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSBrZWVwIGEgV2Vha1B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IGluc3Rl YWQgb2YgYSBTdXNwZW5kZWRQYWdlUHJveHkqLgorICAgICAgICAgICBUaGlzIGlzIHNhZmVyIGFu ZCBhdm9pZCBoYXZpbmcgdG8gZXhwbGljaXRseSBjbGVhciB0aGUgcG9pbnRlci4KKyAgICAgICAg NC4gbV9maW5pc2hlZFN1c3BlbmRpbmcgZGF0YSBtZW1iZXIgZG9lcyBub3QgbmVlZCBhIGdldHRl ciBhbmQgaXMgb25seSBuZWVkZWQgaWYgIUxPR19ESVNBQkxFRC4KKworICAgICAgICAqIFNoYXJl ZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0Zv cndhcmRMaXN0SXRlbTo6c2V0U3VzcGVuZGVkUGFnZSk6CisgICAgICAgICogU2hhcmVkL1dlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0uaDoKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0 SXRlbTo6c3VzcGVuZGVkUGFnZSBjb25zdCk6CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRl ZFBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQcm94eTo6U3Vz cGVuZGVkUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojp+ U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5 Ojp3ZWJQcm9jZXNzRGlkQ2xvc2UpOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJv eHk6OmRpZEZpbmlzaExvYWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuaDoKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5Ojpwcm9jZXNzIGNvbnN0 KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjptYXliZUNyZWF0ZVN1c3BlbmRlZFBhZ2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisKIDIwMTgtMDktMTEgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKFBTT04pOiAiU3dpcGUgYmFjayIgc25h cHNob3QgaXMgbWlzc2luZyB3aGVuIG5hdmlnYXRpbmcgYmFjayBjcm9zcy1wcm9jZXNzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCmluZGV4IDMy ZTdjNzgwZjY3NDE4MzI4YWU4YjYxNWQ3MDU5OGM5NmY3YzYyZDcuLjNiZTFjYjA4YjVlYmU5OTJl MzM1YzAxYThhMTAyNDA0MDhjZjgyYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oIgogCisjaW5jbHVkZSAi U3VzcGVuZGVkUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KICNpbmNsdWRl IDx3dGYvRGVidWdVdGlsaXRpZXMuaD4KIApAQCAtMTEyLDEwICsxMTMsMTAgQEAgYm9vbCBXZWJC YWNrRm9yd2FyZExpc3RJdGVtOjppdGVtSXNJblNhbWVEb2N1bWVudChjb25zdCBXZWJCYWNrRm9y d2FyZExpc3RJdGVtJgogICAgIHJldHVybiBkb2N1bWVudFRyZWVzQXJlRXF1YWwobWFpbkZyYW1l U3RhdGUsIG90aGVyTWFpbkZyYW1lU3RhdGUpOwogfQogCi12b2lkIFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW06OnNldFN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5KiBwYWdlKQordm9pZCBX ZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpzZXRTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94 eSYgcGFnZSkKIHsKLSAgICBBU1NFUlQoIW1fc3VzcGVuZGVkUGFnZSB8fCBwYWdlID09IG51bGxw dHIpOwotICAgIG1fc3VzcGVuZGVkUGFnZSA9IHBhZ2U7CisgICAgQVNTRVJUKCFtX3N1c3BlbmRl ZFBhZ2UpOworICAgIG1fc3VzcGVuZGVkUGFnZSA9IG1ha2VXZWFrUHRyKHBhZ2UpOwogfQogCiAj aWYgIUxPR19ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFj a0ZvcndhcmRMaXN0SXRlbS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRM aXN0SXRlbS5oCmluZGV4IGJhNzQ2YmVlOTUzYmIyNGU5MmEwNzYzMTVjOTQ2MjVmMmFmNWYxMDcu LjFiM2FjNjU3MmI1MmY3OGUxODc0MWFhOTJiM2UwM2UwODNkZjhmZmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKQEAgLTY4LDggKzY4LDggQEAg cHVibGljOgogICAgIFZpZXdTbmFwc2hvdCogc25hcHNob3QoKSBjb25zdCB7IHJldHVybiBtX2l0 ZW1TdGF0ZS5zbmFwc2hvdC5nZXQoKTsgfQogICAgIHZvaWQgc2V0U25hcHNob3QoUmVmUHRyPFZp ZXdTbmFwc2hvdD4mJiBzbmFwc2hvdCkgeyBtX2l0ZW1TdGF0ZS5zbmFwc2hvdCA9IFdURk1vdmUo c25hcHNob3QpOyB9CiAjZW5kaWYKLSAgICB2b2lkIHNldFN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVk UGFnZVByb3h5Kik7Ci0gICAgU3VzcGVuZGVkUGFnZVByb3h5KiBzdXNwZW5kZWRQYWdlKCkgY29u c3QgeyByZXR1cm4gbV9zdXNwZW5kZWRQYWdlOyB9CisgICAgdm9pZCBzZXRTdXNwZW5kZWRQYWdl KFN1c3BlbmRlZFBhZ2VQcm94eSYpOworICAgIFN1c3BlbmRlZFBhZ2VQcm94eSogc3VzcGVuZGVk UGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VzcGVuZGVkUGFnZS5nZXQoKTsgfQogCiAjaWYgIUxP R19ESVNBQkxFRAogICAgIGNvbnN0IGNoYXIqIGxvZ2dpbmdTdHJpbmcoKTsKQEAgLTgwLDcgKzgw LDcgQEAgcHJpdmF0ZToKIAogICAgIEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSBtX2l0ZW1TdGF0 ZTsKICAgICB1aW50NjRfdCBtX3BhZ2VJRDsKLSAgICBTdXNwZW5kZWRQYWdlUHJveHkqIG1fc3Vz cGVuZGVkUGFnZSB7IG51bGxwdHIgfTsKKyAgICBXZWFrUHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4g bV9zdXNwZW5kZWRQYWdlOwogfTsKIAogdHlwZWRlZiBWZWN0b3I8UmVmPFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0+PiBCYWNrRm9yd2FyZExpc3RJdGVtVmVjdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKaW5kZXggODA3MTg5MjU4ZjZkMDg0MzIx YzUyM2YxNDZmYmYxZDNjNWE1YTA4My4uNWQxZmM1YzMxYzk0MDlmMmUyM2RmZmRhZTUyMzk0MjE2 NzhlMDliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFn ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuY3BwCkBAIC03NiwxMCArNzYsOSBAQCBzdGF0aWMgY29uc3QgSGFzaFNldDxJUEM6OlN0cmlu Z1JlZmVyZW5jZT4mIG1lc3NhZ2VOYW1lc1RvSWdub3JlV2hpbGVTdXNwZW5kZWQoKQogU3VzcGVu ZGVkUGFnZVByb3h5OjpTdXNwZW5kZWRQYWdlUHJveHkoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pCiAgICAg OiBtX3BhZ2UocGFnZSkKICAgICAsIG1fcHJvY2VzcygmcHJvY2VzcykKLSAgICAsIG1fYmFja0Zv cndhcmRMaXN0SXRlbShpdGVtKQogICAgICwgbV9vcmlnaW4oU2VjdXJpdHlPcmlnaW5EYXRhOjpm cm9tVVJMKHsgUGFyc2VkVVJMU3RyaW5nLCBpdGVtLnVybCgpIH0pKQogewotICAgIG1fYmFja0Zv cndhcmRMaXN0SXRlbS0+c2V0U3VzcGVuZGVkUGFnZSh0aGlzKTsKKyAgICBpdGVtLnNldFN1c3Bl bmRlZFBhZ2UoKnRoaXMpOwogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5yZWdpc3RlclN1 c3BlbmRlZFBhZ2VQcm94eSgqdGhpcyk7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpTZXRJc1N1c3BlbmRlZCh0cnVlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0KQEAgLTkx LDIwICs5MCwxNyBAQCBTdXNwZW5kZWRQYWdlUHJveHk6On5TdXNwZW5kZWRQYWdlUHJveHkoKQog ICAgICAgICBwcm9jZXNzLT5zdXNwZW5kZWRQYWdlV2FzRGVzdHJveWVkKCp0aGlzKTsKICAgICAg ICAgcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS51bnJlZ2lzdGVyU3VzcGVuZGVkUGFnZVByb3h5KCp0 aGlzKTsKICAgICB9Ci0KLSAgICBtX2JhY2tGb3J3YXJkTGlzdEl0ZW0tPnNldFN1c3BlbmRlZFBh Z2UobnVsbHB0cik7CiB9CiAKIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5Ojp3ZWJQcm9jZXNzRGlk Q2xvc2UoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQogewogICAgIEFTU0VSVF9VTlVTRUQocHJv Y2VzcywgJnByb2Nlc3MgPT0gbV9wcm9jZXNzKTsKIAotICAgIGF1dG8gcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpOwogICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS51bnJlZ2lzdGVy U3VzcGVuZGVkUGFnZVByb3h5KCp0aGlzKTsKICAgICBtX3Byb2Nlc3MgPSBudWxscHRyOwogCisg ICAgLy8gVGhpcyB3aWxsIGRlc3Ryb3kgfHRoaXN8LgogICAgIG1fcGFnZS5zdXNwZW5kZWRQYWdl Q2xvc2VkKCp0aGlzKTsKLSAgICBtX2JhY2tGb3J3YXJkTGlzdEl0ZW0tPnNldFN1c3BlbmRlZFBh Z2UobnVsbHB0cik7CiB9CiAKIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkZXN0cm95V2ViUGFn ZUluV2ViUHJvY2VzcygpCkBAIC0xMTgsNyArMTE0LDkgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJv eHk6OmRpZEZpbmlzaExvYWQoKQogICAgIEFTU0VSVChtX3Byb2Nlc3MpOwogICAgIExPRyhQcm9j ZXNzU3dhcHBpbmcsICJTdXNwZW5kZWRQYWdlUHJveHkgJXMgZnJvbSBwcm9jZXNzICVpIGZpbmlz aGVkIHRyYW5zaXRpb24gdG8gc3VzcGVuZGVkIiwgbG9nZ2luZ1N0cmluZygpLCBtX3Byb2Nlc3Mt PnByb2Nlc3NJZGVudGlmaWVyKCkpOwogCisjaWYgIUxPR19ESVNBQkxFRAogICAgIG1fZmluaXNo ZWRTdXNwZW5kaW5nID0gdHJ1ZTsKKyNlbmRpZgogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQcm9jZXNzOjpVcGRhdGVBY3RpdmVQYWdlcygpLCAwKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKaW5kZXggNWM4NGIyMjgyNDA2NzM5 YjRiZWJiM2M1NzJmYWViY2NmYjI2NjQ4NC4uNDkyMTEwOWQzZTRlODc2NzAzMjQ5NTQ1ZTRjNGEw ZGVkOWI1YWI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVk UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVBy b3h5LmgKQEAgLTI5LDMwICsyOSwyNCBAQAogI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0uaCIKICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luRGF0YS5oPgogI2luY2x1ZGUg PHd0Zi9SZWZDb3VudGVkLmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAogbmFtZXNwYWNl IFdlYktpdCB7CiAKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIGNsYXNzIFdlYlByb2Nlc3NQcm94eTsK IAotY2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5IDogcHVibGljIFJlZkNvdW50ZWQ8U3VzcGVuZGVk UGFnZVByb3h5PiB7CitjbGFzcyBTdXNwZW5kZWRQYWdlUHJveHkgOiBwdWJsaWMgQ2FuTWFrZVdl YWtQdHI8U3VzcGVuZGVkUGFnZVByb3h5PiB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxTdXNw ZW5kZWRQYWdlUHJveHk+IGNyZWF0ZShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYlByb2Nlc3NQcm94 eSYgcHJvY2VzcywgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkKLSAgICB7Ci0gICAgICAg IHJldHVybiBhZG9wdFJlZigqbmV3IFN1c3BlbmRlZFBhZ2VQcm94eShwYWdlLCBwcm9jZXNzLCBp dGVtKSk7Ci0gICAgfQotCi0gICAgdmlydHVhbCB+U3VzcGVuZGVkUGFnZVByb3h5KCk7CisgICAg U3VzcGVuZGVkUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYsIFdlYlByb2Nlc3NQcm94eSYsIFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0mKTsKKyAgICB+U3VzcGVuZGVkUGFnZVByb3h5KCk7CiAKICAgICB2 b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYpOwog CiAgICAgV2ViUGFnZVByb3h5JiBwYWdlKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlOyB9CiAgICAg V2ViUHJvY2Vzc1Byb3h5KiBwcm9jZXNzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzOyB9Ci0g ICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFja0Zv cndhcmRMaXN0SXRlbTsgfQogICAgIGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYg b3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW47IH0KIAotICAgIGJvb2wgZmluaXNoZWRT dXNwZW5kaW5nKCkgY29uc3QgeyByZXR1cm4gbV9maW5pc2hlZFN1c3BlbmRpbmc7IH0KLQogICAg IHZvaWQgd2ViUHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nlc3NQcm94eSYpOwogICAgIHZvaWQgZGVz dHJveVdlYlBhZ2VJbldlYlByb2Nlc3MoKTsKIApAQCAtNjEsMTYgKzU1LDE1IEBAIHB1YmxpYzoK ICNlbmRpZgogCiBwcml2YXRlOgotICAgIFN1c3BlbmRlZFBhZ2VQcm94eShXZWJQYWdlUHJveHkm LCBXZWJQcm9jZXNzUHJveHkmLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJik7Ci0KICAgICB2b2lk IGRpZEZpbmlzaExvYWQoKTsKIAogICAgIFdlYlBhZ2VQcm94eSYgbV9wYWdlOwogICAgIFdlYlBy b2Nlc3NQcm94eSogbV9wcm9jZXNzOwotICAgIFJlZjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiBt X2JhY2tGb3J3YXJkTGlzdEl0ZW07CiAgICAgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhIG1f b3JpZ2luOwogCisjaWYgIUxPR19ESVNBQkxFRAogICAgIGJvb2wgbV9maW5pc2hlZFN1c3BlbmRp bmcgeyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGIyN2IyMDFlOGFhNzU4OTA4 NDQ0NzZjZWRjOTZjNmFhYzYxZDBkODIuLjVkODg5ODBiNjk2ZjAwODMxMmViYWMyNDE4Y2JkMDcw ZDg0MmEzYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAt NzA4LDcgKzcwOCw3IEBAIFN1c3BlbmRlZFBhZ2VQcm94eSogV2ViUGFnZVByb3h5OjptYXliZUNy ZWF0ZVN1c3BlbmRlZFBhZ2UoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jCiAgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgIH0KIAotICAgIG1fc3VzcGVuZGVkUGFnZSA9IFN1c3BlbmRlZFBhZ2VQcm94 eTo6Y3JlYXRlKCp0aGlzLCBwcm9jZXNzLCAqY3VycmVudEl0ZW0pOworICAgIG1fc3VzcGVuZGVk UGFnZSA9IHN0ZDo6bWFrZV91bmlxdWU8U3VzcGVuZGVkUGFnZVByb3h5PigqdGhpcywgcHJvY2Vz cywgKmN1cnJlbnRJdGVtKTsKIAogICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJXZWJQYWdlUHJv eHkgJSIgUFJJdTY0ICIgY3JlYXRlZCBzdXNwZW5kZWQgcGFnZSAlcyBmb3IgcHJvY2VzcyBwaWQg JWksIGJhY2svZm9yd2FyZCBpdGVtICVzIiBQUkl1NjQsIHBhZ2VJRCgpLCBtX3N1c3BlbmRlZFBh Z2UtPmxvZ2dpbmdTdHJpbmcoKSwgcHJvY2Vzcy5wcm9jZXNzSWRlbnRpZmllcigpLCBjdXJyZW50 SXRlbS0+aXRlbUlEKCkubG9nU3RyaW5nKCkpOwogCkBAIC03MzAsMTIgKzczMCwxMiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4m JiBwcm9jZXNzLCBBUEk6Ok5hdgogCiAgICAgLy8gSWYgdGhlIHByb2Nlc3Mgd2UncmUgYXR0YWNo aW5nIHRvIGlzIGtlcHQgYWxpdmUgc29sZWx5IGJ5IG91ciBjdXJyZW50IHN1c3BlbmRlZCBwYWdl LAogICAgIC8vIHdlIG5lZWQgdG8gbWFpbnRhaW4gdGhhdCBieSB0ZW1wb3JhcmlseSBrZWVwaW5n IHRoZSBzdXNwZW5kZWQgcGFnZSBhbGl2ZS4KLSAgICBSZWZQdHI8U3VzcGVuZGVkUGFnZVByb3h5 PiBjdXJyZW50U3VzcGVuZGVkUGFnZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiBjdXJyZW50U3VzcGVuZGVkUGFnZTsKICAgICBpZiAoIW5hdmlnYXRpb24pIHsKICAg ICAgICAgbV9wcm9jZXNzLT5yZW1vdmVXZWJQYWdlKCp0aGlzLCBtX3BhZ2VJRCk7CiAgICAgICAg IG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQpOwogICAgIH0gZWxzZSB7Ci0gICAgICAg IGN1cnJlbnRTdXNwZW5kZWRQYWdlID0gbV9zdXNwZW5kZWRQYWdlOworICAgICAgICBjdXJyZW50 U3VzcGVuZGVkUGFnZSA9IFdURk1vdmUobV9zdXNwZW5kZWRQYWdlKTsKICAgICAgICAgbV9wcm9j ZXNzLT5zdXNwZW5kV2ViUGFnZVByb3h5KCp0aGlzLCAqbmF2aWdhdGlvbik7CiAgICAgfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGEwYzFhODJhMTI4MjQ5ODEy MGI0ZWVkOWUzNDgyOTM5MzRjYjU0MTQuLmE1N2I3OGRjZTkzMzQ1NzdhMGQwM2MzMTAwYTFkZGEz ZmU0OTc2MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0yMjMy LDcgKzIyMzIsNyBAQCBwcml2YXRlOgogICAgIC8vIEZJWE1FOiBTdXBwb3J0IG1vcmUgdGhhbiBv bmUgc3VzcGVuZGVkIHBhZ2UgcGVyIFdlYlBhZ2VQcm94eSwKICAgICAvLyBhbmQgaGF2ZSBhIGds b2JhbCBjb2xsZWN0aW9uIG9mIHRoZW0gcGVyIHByb2Nlc3MgcG9vbAogICAgIC8vIChlLmcuIGZv ciB0aGF0IHByb2Nlc3MgcG9vbCdzIHBhZ2UgY2FjaGUpCi0gICAgUmVmUHRyPFN1c3BlbmRlZFBh Z2VQcm94eT4gbV9zdXNwZW5kZWRQYWdlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQ YWdlUHJveHk+IG1fc3VzcGVuZGVkUGFnZTsKIAogICAgIFJ1bkxvb3A6OlRpbWVyPFdlYlBhZ2VQ cm94eT4gbV9yZXNldFJlY2VudENyYXNoQ291bnRUaW1lcjsKICAgICB1bnNpZ25lZCBtX3JlY2Vu dENyYXNoQ291bnQgeyAwIH07Cg== 349468 2018-09-11 15:03:15 -0700 2018-09-12 09:37:03 -0700 Patch bug-189517-20180911150313.patch text/plain 10550 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0YjJlNWEwMjk4MzE5NzMx Y2I0Njg3ZDMxODNlMDE3Y2ZjZWUwYjkuLjkxYjY0OTYzYjEyMjgxZDkwZTFhYWUzOTVlNzQwNGU4 YWE0YjFiZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDktMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBTdXNwZW5kZWRQYWdl UHJveHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTUxNworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAg Q2xlYW4gdXAgU3VzcGVuZGVkUGFnZVByb3h5OgorICAgICAgICAxLiBTdXNwZW5kZWRQYWdlUHJv eHkgZG9lcyBub3QgbmVlZCB0byBiZSBSZWZDb3VudGVkLiBJdCBpcyBldmVuIGRhbmdlcm91cyBn aXZlbiB0aGF0IFdlYlBhZ2VQcm94eQorICAgICAgICAgICBvd25zIHRoZSBTdXNwZW5kZWRQYWdl UHJveHkgYW5kIFN1c3BlbmRlZFBhZ2VQcm94eSBoYXMgYSBXZWJQYWdlUHJveHkmIGRhdGEgbWVt YmVyLiBXZSBkZWZpbml0ZWx5CisgICAgICAgICAgIGRvIG5vdCB3YW50IGl0IHRvIG91dGxpdmUg aXRzIFdlYlBhZ2VQcm94eS4KKyAgICAgICAgMi4gVGhlIFN1c3BlbmRlZFBhZ2VQcm94eSBkZXN0 cnVjdG9yIGRvZXMgbm90IG5lZWQgdG8gYmUgdmlydHVhbC4KKyAgICAgICAgMy4gSGF2ZSBXZWJC YWNrRm9yd2FyZExpc3RJdGVtIGtlZXAgYSBXZWFrUHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gaW5z dGVhZCBvZiBhIFN1c3BlbmRlZFBhZ2VQcm94eSouCisgICAgICAgICAgIFRoaXMgaXMgc2FmZXIg YW5kIGF2b2lkIGhhdmluZyB0byBleHBsaWNpdGx5IGNsZWFyIHRoZSBwb2ludGVyLgorICAgICAg ICA0LiBtX2ZpbmlzaGVkU3VzcGVuZGluZyBkYXRhIG1lbWJlciBkb2VzIG5vdCBuZWVkIGEgZ2V0 dGVyIGFuZCBpcyBvbmx5IG5lZWRlZCBpZiAhTE9HX0RJU0FCTEVELgorCisgICAgICAgICogU2hh cmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNr Rm9yd2FyZExpc3RJdGVtOjpzZXRTdXNwZW5kZWRQYWdlKToKKyAgICAgICAgKiBTaGFyZWQvV2Vi QmFja0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExp c3RJdGVtOjpzdXNwZW5kZWRQYWdlIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvU3VzcGVu ZGVkUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5OjpT dXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6 On5TdXNwZW5kZWRQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJv eHk6OndlYlByb2Nlc3NEaWRDbG9zZSk6CisgICAgICAgIChXZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQ cm94eTo6ZGlkRmluaXNoTG9hZCk6CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQ cm94eS5oOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OnByb2Nlc3MgY29u c3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6Om1heWJlQ3JlYXRlU3VzcGVuZGVkUGFnZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKwogMjAxOC0wOS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIFtXSzJdIFN1cHBvcnQgY2hh bmdpbmcgZm9yZWdyb3VuZCBjb2xvcnMgdmlhIGNvbG9yIHBhbmVsCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmNwcCBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCmluZGV4IDMyZTdjNzgwZjY3NDE4 MzI4YWU4YjYxNWQ3MDU5OGM5NmY3YzYyZDcuLjNiZTFjYjA4YjVlYmU5OTJlMzM1YzAxYThhMTAy NDA0MDhjZjgyYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJk TGlzdEl0ZW0uY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5j bHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oIgogCisjaW5jbHVkZSAiU3VzcGVuZGVkUGFn ZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KICNpbmNsdWRlIDx3dGYvRGVidWdV dGlsaXRpZXMuaD4KIApAQCAtMTEyLDEwICsxMTMsMTAgQEAgYm9vbCBXZWJCYWNrRm9yd2FyZExp c3RJdGVtOjppdGVtSXNJblNhbWVEb2N1bWVudChjb25zdCBXZWJCYWNrRm9yd2FyZExpc3RJdGVt JgogICAgIHJldHVybiBkb2N1bWVudFRyZWVzQXJlRXF1YWwobWFpbkZyYW1lU3RhdGUsIG90aGVy TWFpbkZyYW1lU3RhdGUpOwogfQogCi12b2lkIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OnNldFN1 c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5KiBwYWdlKQordm9pZCBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjpzZXRTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSYgcGFnZSkKIHsK LSAgICBBU1NFUlQoIW1fc3VzcGVuZGVkUGFnZSB8fCBwYWdlID09IG51bGxwdHIpOwotICAgIG1f c3VzcGVuZGVkUGFnZSA9IHBhZ2U7CisgICAgQVNTRVJUKCFtX3N1c3BlbmRlZFBhZ2UpOworICAg IG1fc3VzcGVuZGVkUGFnZSA9IG1ha2VXZWFrUHRyKHBhZ2UpOwogfQogCiAjaWYgIUxPR19ESVNB QkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0 SXRlbS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCmlu ZGV4IGJhNzQ2YmVlOTUzYmIyNGU5MmEwNzYzMTVjOTQ2MjVmMmFmNWYxMDcuLjQzNzY2NDgzOTZj NGVmZWI4YjY0MjM4MGJkNDAzMzEyODkxZjM4NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJB UElPYmplY3QuaCIKICNpbmNsdWRlICJTZXNzaW9uU3RhdGUuaCIKICNpbmNsdWRlIDx3dGYvUmVm Lmg+CisjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJp bmcuaD4KIAogbmFtZXNwYWNlIEFQSSB7CkBAIC02OCw4ICs2OSw4IEBAIHB1YmxpYzoKICAgICBW aWV3U25hcHNob3QqIHNuYXBzaG90KCkgY29uc3QgeyByZXR1cm4gbV9pdGVtU3RhdGUuc25hcHNo b3QuZ2V0KCk7IH0KICAgICB2b2lkIHNldFNuYXBzaG90KFJlZlB0cjxWaWV3U25hcHNob3Q+JiYg c25hcHNob3QpIHsgbV9pdGVtU3RhdGUuc25hcHNob3QgPSBXVEZNb3ZlKHNuYXBzaG90KTsgfQog I2VuZGlmCi0gICAgdm9pZCBzZXRTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSopOwot ICAgIFN1c3BlbmRlZFBhZ2VQcm94eSogc3VzcGVuZGVkUGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1f c3VzcGVuZGVkUGFnZTsgfQorICAgIHZvaWQgc2V0U3VzcGVuZGVkUGFnZShTdXNwZW5kZWRQYWdl UHJveHkmKTsKKyAgICBTdXNwZW5kZWRQYWdlUHJveHkqIHN1c3BlbmRlZFBhZ2UoKSBjb25zdCB7 IHJldHVybiBtX3N1c3BlbmRlZFBhZ2UuZ2V0KCk7IH0KIAogI2lmICFMT0dfRElTQUJMRUQKICAg ICBjb25zdCBjaGFyKiBsb2dnaW5nU3RyaW5nKCk7CkBAIC04MCw3ICs4MSw3IEBAIHByaXZhdGU6 CiAKICAgICBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgbV9pdGVtU3RhdGU7CiAgICAgdWludDY0 X3QgbV9wYWdlSUQ7Ci0gICAgU3VzcGVuZGVkUGFnZVByb3h5KiBtX3N1c3BlbmRlZFBhZ2UgeyBu dWxscHRyIH07CisgICAgV2Vha1B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IG1fc3VzcGVuZGVkUGFn ZTsKIH07CiAKIHR5cGVkZWYgVmVjdG9yPFJlZjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPj4gQmFj a0ZvcndhcmRMaXN0SXRlbVZlY3RvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNw ZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IDgwNzE4OTI1OGY2ZDA4NDMyMWM1MjNmMTQ2ZmJmMWQz YzVhNWEwODMuLjVkMWZjNWMzMWM5NDA5ZjJlMjNkZmZkYWU1MjM5NDIxNjc4ZTA5YjQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAtNzYs MTAgKzc2LDkgQEAgc3RhdGljIGNvbnN0IEhhc2hTZXQ8SVBDOjpTdHJpbmdSZWZlcmVuY2U+JiBt ZXNzYWdlTmFtZXNUb0lnbm9yZVdoaWxlU3VzcGVuZGVkKCkKIFN1c3BlbmRlZFBhZ2VQcm94eTo6 U3VzcGVuZGVkUGFnZVByb3h5KFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViUHJvY2Vzc1Byb3h5JiBw cm9jZXNzLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtJiBpdGVtKQogICAgIDogbV9wYWdlKHBhZ2Up CiAgICAgLCBtX3Byb2Nlc3MoJnByb2Nlc3MpCi0gICAgLCBtX2JhY2tGb3J3YXJkTGlzdEl0ZW0o aXRlbSkKICAgICAsIG1fb3JpZ2luKFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVVSTCh7IFBhcnNl ZFVSTFN0cmluZywgaXRlbS51cmwoKSB9KSkKIHsKLSAgICBtX2JhY2tGb3J3YXJkTGlzdEl0ZW0t PnNldFN1c3BlbmRlZFBhZ2UodGhpcyk7CisgICAgaXRlbS5zZXRTdXNwZW5kZWRQYWdlKCp0aGlz KTsKICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucmVnaXN0ZXJTdXNwZW5kZWRQYWdlUHJv eHkoKnRoaXMpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0SXNT dXNwZW5kZWQodHJ1ZSksIG1fcGFnZS5wYWdlSUQoKSk7CiB9CkBAIC05MSwyMCArOTAsMTcgQEAg U3VzcGVuZGVkUGFnZVByb3h5Ojp+U3VzcGVuZGVkUGFnZVByb3h5KCkKICAgICAgICAgcHJvY2Vz cy0+c3VzcGVuZGVkUGFnZVdhc0Rlc3Ryb3llZCgqdGhpcyk7CiAgICAgICAgIHByb2Nlc3MtPnBy b2Nlc3NQb29sKCkudW5yZWdpc3RlclN1c3BlbmRlZFBhZ2VQcm94eSgqdGhpcyk7CiAgICAgfQot Ci0gICAgbV9iYWNrRm9yd2FyZExpc3RJdGVtLT5zZXRTdXNwZW5kZWRQYWdlKG51bGxwdHIpOwog fQogCiB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6d2ViUHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nl c3NQcm94eSYgcHJvY2VzcykKIHsKICAgICBBU1NFUlRfVU5VU0VEKHByb2Nlc3MsICZwcm9jZXNz ID09IG1fcHJvY2Vzcyk7CiAKLSAgICBhdXRvIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KTsKICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkudW5yZWdpc3RlclN1c3BlbmRlZFBhZ2VQ cm94eSgqdGhpcyk7CiAgICAgbV9wcm9jZXNzID0gbnVsbHB0cjsKIAorICAgIC8vIFRoaXMgd2ls bCBkZXN0cm95IHx0aGlzfC4KICAgICBtX3BhZ2Uuc3VzcGVuZGVkUGFnZUNsb3NlZCgqdGhpcyk7 Ci0gICAgbV9iYWNrRm9yd2FyZExpc3RJdGVtLT5zZXRTdXNwZW5kZWRQYWdlKG51bGxwdHIpOwog fQogCiB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGVzdHJveVdlYlBhZ2VJbldlYlByb2Nlc3Mo KQpAQCAtMTE4LDcgKzExNCw5IEBAIHZvaWQgU3VzcGVuZGVkUGFnZVByb3h5OjpkaWRGaW5pc2hM b2FkKCkKICAgICBBU1NFUlQobV9wcm9jZXNzKTsKICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAi U3VzcGVuZGVkUGFnZVByb3h5ICVzIGZyb20gcHJvY2VzcyAlaSBmaW5pc2hlZCB0cmFuc2l0aW9u IHRvIHN1c3BlbmRlZCIsIGxvZ2dpbmdTdHJpbmcoKSwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRp ZmllcigpKTsKIAorI2lmICFMT0dfRElTQUJMRUQKICAgICBtX2ZpbmlzaGVkU3VzcGVuZGluZyA9 IHRydWU7CisjZW5kaWYKIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vz czo6VXBkYXRlQWN0aXZlUGFnZXMoKSwgMCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1N1c3BlbmRlZFBhZ2VQcm94eS5oCmluZGV4IDVjODRiMjI4MjQwNjczOWI0YmViYjNjNTcyZmFl YmNjZmIyNjY0ODQuLjQ5MjExMDlkM2U0ZTg3NjcwMzI0OTU0NWU0YzRhMGRlZDliNWFiNDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oCkBAIC0yOSwz MCArMjksMjQgQEAKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgiCiAjaW5jbHVk ZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbkRhdGEuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBj bGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJQcm9jZXNzUHJveHk7CiAKLWNsYXNzIFN1c3Bl bmRlZFBhZ2VQcm94eSA6IHB1YmxpYyBSZWZDb3VudGVkPFN1c3BlbmRlZFBhZ2VQcm94eT4gewor Y2xhc3MgU3VzcGVuZGVkUGFnZVByb3h5IDogcHVibGljIENhbk1ha2VXZWFrUHRyPFN1c3BlbmRl ZFBhZ2VQcm94eT4gewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8U3VzcGVuZGVkUGFnZVByb3h5 PiBjcmVhdGUoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0ZW0pCi0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBTdXNwZW5kZWRQYWdlUHJveHkocGFnZSwgcHJvY2VzcywgaXRlbSkpOwotICAgIH0K LQotICAgIHZpcnR1YWwgflN1c3BlbmRlZFBhZ2VQcm94eSgpOworICAgIFN1c3BlbmRlZFBhZ2VQ cm94eShXZWJQYWdlUHJveHkmLCBXZWJQcm9jZXNzUHJveHkmLCBXZWJCYWNrRm9yd2FyZExpc3RJ dGVtJik7CisgICAgflN1c3BlbmRlZFBhZ2VQcm94eSgpOwogCiAgICAgdm9pZCBkaWRSZWNlaXZl TWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKTsKIAogICAgIFdlYlBhZ2VQ cm94eSYgcGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZTsgfQogICAgIFdlYlByb2Nlc3NQcm94 eSogcHJvY2VzcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2VzczsgfQotICAgIFdlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0mIGl0ZW0oKSBjb25zdCB7IHJldHVybiBtX2JhY2tGb3J3YXJkTGlzdEl0ZW07 IH0KICAgICBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmIG9yaWdpbigpIGNvbnN0 IHsgcmV0dXJuIG1fb3JpZ2luOyB9CiAKLSAgICBib29sIGZpbmlzaGVkU3VzcGVuZGluZygpIGNv bnN0IHsgcmV0dXJuIG1fZmluaXNoZWRTdXNwZW5kaW5nOyB9Ci0KICAgICB2b2lkIHdlYlByb2Nl c3NEaWRDbG9zZShXZWJQcm9jZXNzUHJveHkmKTsKICAgICB2b2lkIGRlc3Ryb3lXZWJQYWdlSW5X ZWJQcm9jZXNzKCk7CiAKQEAgLTYxLDE2ICs1NSwxNSBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJp dmF0ZToKLSAgICBTdXNwZW5kZWRQYWdlUHJveHkoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1By b3h5JiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpOwotCiAgICAgdm9pZCBkaWRGaW5pc2hMb2Fk KCk7CiAKICAgICBXZWJQYWdlUHJveHkmIG1fcGFnZTsKICAgICBXZWJQcm9jZXNzUHJveHkqIG1f cHJvY2VzczsKLSAgICBSZWY8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4gbV9iYWNrRm9yd2FyZExp c3RJdGVtOwogICAgIFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSBtX29yaWdpbjsKIAorI2lm ICFMT0dfRElTQUJMRUQKICAgICBib29sIG1fZmluaXNoZWRTdXNwZW5kaW5nIHsgZmFsc2UgfTsK KyNlbmRpZgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA0MDNiMDEyOTNhNGNiMDFlZTM1Y2M0MzA2MzBlZTRl NzIyZjk4ZGJhLi43OWRjYzU5ODAwMzlkY2EyMzk4NjlkNzdmMTEyODdiN2FlMWExYWQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTcxOCw3ICs3MTgsNyBA QCBTdXNwZW5kZWRQYWdlUHJveHkqIFdlYlBhZ2VQcm94eTo6bWF5YmVDcmVhdGVTdXNwZW5kZWRQ YWdlKFdlYlByb2Nlc3NQcm94eSYgcHJvYwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAKLSAgICBtX3N1c3BlbmRlZFBhZ2UgPSBTdXNwZW5kZWRQYWdlUHJveHk6OmNyZWF0ZSgqdGhp cywgcHJvY2VzcywgKmN1cnJlbnRJdGVtKTsKKyAgICBtX3N1c3BlbmRlZFBhZ2UgPSBzdGQ6Om1h a2VfdW5pcXVlPFN1c3BlbmRlZFBhZ2VQcm94eT4oKnRoaXMsIHByb2Nlc3MsICpjdXJyZW50SXRl bSk7CiAKICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAi IGNyZWF0ZWQgc3VzcGVuZGVkIHBhZ2UgJXMgZm9yIHByb2Nlc3MgcGlkICVpLCBiYWNrL2Zvcndh cmQgaXRlbSAlcyIgUFJJdTY0LCBwYWdlSUQoKSwgbV9zdXNwZW5kZWRQYWdlLT5sb2dnaW5nU3Ry aW5nKCksIHByb2Nlc3MucHJvY2Vzc0lkZW50aWZpZXIoKSwgY3VycmVudEl0ZW0tPml0ZW1JRCgp LmxvZ1N0cmluZygpKTsKIApAQCAtNzQwLDEyICs3NDAsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnJlYXR0YWNoVG9XZWJQcm9jZXNzKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgQVBJ OjpOYXYKIAogICAgIC8vIElmIHRoZSBwcm9jZXNzIHdlJ3JlIGF0dGFjaGluZyB0byBpcyBrZXB0 IGFsaXZlIHNvbGVseSBieSBvdXIgY3VycmVudCBzdXNwZW5kZWQgcGFnZSwKICAgICAvLyB3ZSBu ZWVkIHRvIG1haW50YWluIHRoYXQgYnkgdGVtcG9yYXJpbHkga2VlcGluZyB0aGUgc3VzcGVuZGVk IHBhZ2UgYWxpdmUuCi0gICAgUmVmUHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gY3VycmVudFN1c3Bl bmRlZFBhZ2U7CisgICAgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gY3VycmVu dFN1c3BlbmRlZFBhZ2U7CiAgICAgaWYgKCFuYXZpZ2F0aW9uKSB7CiAgICAgICAgIG1fcHJvY2Vz cy0+cmVtb3ZlV2ViUGFnZSgqdGhpcywgbV9wYWdlSUQpOwogICAgICAgICBtX3Byb2Nlc3MtPnJl bW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fcGFnZUlEKTsKICAgICB9IGVsc2UgewotICAgICAgICBjdXJyZW50U3VzcGVu ZGVkUGFnZSA9IG1fc3VzcGVuZGVkUGFnZTsKKyAgICAgICAgY3VycmVudFN1c3BlbmRlZFBhZ2Ug PSBXVEZNb3ZlKG1fc3VzcGVuZGVkUGFnZSk7CiAgICAgICAgIG1fcHJvY2Vzcy0+c3VzcGVuZFdl YlBhZ2VQcm94eSgqdGhpcywgKm5hdmlnYXRpb24pOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBiNzg0NWJmY2ViZDJmZWQ5ZjMyMjg3YzE1N2E0MGQw ZWZlZWNkODU4Li4zZDMzNzIwODYyODFmMDc0OWNmZjIzNWJmMzZhNDU4Zjg2MmRjNWMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjIzNCw3ICsyMjM0LDcgQEAg cHJpdmF0ZToKICAgICAvLyBGSVhNRTogU3VwcG9ydCBtb3JlIHRoYW4gb25lIHN1c3BlbmRlZCBw YWdlIHBlciBXZWJQYWdlUHJveHksCiAgICAgLy8gYW5kIGhhdmUgYSBnbG9iYWwgY29sbGVjdGlv biBvZiB0aGVtIHBlciBwcm9jZXNzIHBvb2wKICAgICAvLyAoZS5nLiBmb3IgdGhhdCBwcm9jZXNz IHBvb2wncyBwYWdlIGNhY2hlKQotICAgIFJlZlB0cjxTdXNwZW5kZWRQYWdlUHJveHk+IG1fc3Vz cGVuZGVkUGFnZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBtX3N1 c3BlbmRlZFBhZ2U7CiAKICAgICBSdW5Mb29wOjpUaW1lcjxXZWJQYWdlUHJveHk+IG1fcmVzZXRS ZWNlbnRDcmFzaENvdW50VGltZXI7CiAgICAgdW5zaWduZWQgbV9yZWNlbnRDcmFzaENvdW50IHsg MCB9Owo=