189195 2018-08-31 09:51:51 -0700 Rename ShouldProcessSwapIfPossible to ProcessSwapRequestedByClient for clarity 2018-08-31 10:42:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1455724 0 cdumez 2018-08-31 09:51:51 -0700 Rename ShouldProcessSwapIfPossible to ProcessSwapRequestedByClient for clarity, since it indicates the client requested a process swap via its navigation policy decision. 1455725 1 348643 cdumez 2018-08-31 09:54:20 -0700 Created attachment 348643 Patch 1455760 2 348643 commit-queue 2018-08-31 10:41:42 -0700 Comment on attachment 348643 Patch Clearing flags on attachment: 348643 Committed r235559: <https://trac.webkit.org/changeset/235559> 1455761 3 commit-queue 2018-08-31 10:41:43 -0700 All reviewed patches have been landed. Closing bug. 1455762 4 webkit-bug-importer 2018-08-31 10:42:17 -0700 <rdar://problem/43946123> 348643 2018-08-31 09:54:20 -0700 2018-08-31 10:41:42 -0700 Patch bug-189195-20180831095419.patch text/plain 21993 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGMxMGZjMDQ4YjdlMDc0Y2Qw ZGJiMjQ4ZWZkYmE1ZDMyNzAwMmMzNzQuLmZiOGEyMDFiYTc1ZGM4NTQ0ZmYzNWQzMDIzOTcwODMw OWMyYzYyNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMDgtMzEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgU2hvdWxkUHJvY2Vzc1N3 YXBJZlBvc3NpYmxlIHRvIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgZm9yIGNsYXJpdHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBT aG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgdG8gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCBmb3IgY2xhcml0eSwgc2luY2UgaXQgaW5kaWNhdGVzIHRoZSBjbGllbnQKKyAgICAgICAgcmVx dWVzdGVkIGEgcHJvY2VzcyBzd2FwIHZpYSBpdHMgbmF2aWdhdGlvbiBwb2xpY3kgZGVjaXNpb24u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGljeUxpc3RlbmVyLmNwcDoK KyAgICAgICAgKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZUluTmV3UHJvY2Vzcyk6CisgICAgICAg ICh1c2VXaXRoUG9saWNpZXMpOgorICAgICAgICAoV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0 aFBvbGljaWVzKToKKyAgICAgICAgKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZUluTmV3UHJvY2Vz c1dpdGhQb2xpY2llcyk6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0 ZS5tbToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50 OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5Ojp1c2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHk6OmRvd25sb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQ b2xpY3lMaXN0ZW5lclByb3h5OjppZ25vcmUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lUHJveHk6OnNldFVwUG9saWN5TGlzdGVu ZXJQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JO YXZpZ2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JO YXZpZ2F0aW9uSW50ZXJuYWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o OgorCiAyMDE4LTA4LTMwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIFdLUGFnZUxvYWRGaWxlIFNQSSB2YXJpYW50IHdoaWNoIHJldHVybnMgYSBuYXZpZ2F0 aW9uIG9iamVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tG cmFtZVBvbGljeUxpc3RlbmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dL RnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAKaW5kZXggODgzMzExMjJhMzFlZWZjYzQ2ZDUxNTEyZmFl NzY0OTFiM2ZlNzM1Mi4uYTg1YjViY2Q3Y2E1ZDY4NTJiNmI5ODBlMDVhYmNkZjViZDRkNGMzYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGljeUxp c3RlbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lUG9s aWN5TGlzdGVuZXIuY3BwCkBAIC00OCwyNyArNDgsMjcgQEAgdm9pZCBXS0ZyYW1lUG9saWN5TGlz dGVuZXJVc2UoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3RlbmVyUmVmKQogCiB2 b2lkIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZUluTmV3UHJvY2VzcyhXS0ZyYW1lUG9saWN5TGlz dGVuZXJSZWYgcG9saWN5TGlzdGVuZXJSZWYpCiB7Ci0gICAgdG9JbXBsKHBvbGljeUxpc3RlbmVy UmVmKS0+dXNlKG51bGxwdHIsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6WWVzKTsKKyAg ICB0b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51c2UobnVsbHB0ciwgUHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudDo6WWVzKTsKIH0KIAotc3RhdGljIHZvaWQgdXNlV2l0aFBvbGljaWVzKFdL RnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJzaXRlUG9saWNp ZXNSZWYgd2Vic2l0ZVBvbGljaWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc2hvdWxk UHJvY2Vzc1N3YXBJZlBvc3NpYmxlKQorc3RhdGljIHZvaWQgdXNlV2l0aFBvbGljaWVzKFdLRnJh bWVQb2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJzaXRlUG9saWNpZXNS ZWYgd2Vic2l0ZVBvbGljaWVzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQpCiB7CiAgICAgaWYgKGF1dG8qIHdlYnNpdGVEYXRhU3RvcmUg PSB0b0ltcGwod2Vic2l0ZVBvbGljaWVzKS0+d2Vic2l0ZURhdGFTdG9yZSgpKSB7CiAgICAgICAg IGF1dG8gc2Vzc2lvbklEID0gd2Vic2l0ZURhdGFTdG9yZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnNl c3Npb25JRCgpOwogICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX01FU1NBR0Uoc2Vzc2lvbklE LmlzRXBoZW1lcmFsKCkgfHwgc2Vzc2lvbklEID09IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vz c2lvbklEKCksICJJZiBXZWJzaXRlUG9saWNpZXMgc3BlY2lmaWVzIGEgV2Vic2l0ZURhdGFTdG9y ZSwgdGhlIGRhdGEgc3RvcmUncyBzZXNzaW9uIG11c3QgYmUgZGVmYXVsdCBvciBub24tcGVyc2lz dGVudC4iKTsKICAgICB9CiAKLSAgICB0b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51c2UodG9J bXBsKHdlYnNpdGVQb2xpY2llcyksIHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSk7CisgICAg dG9JbXBsKHBvbGljeUxpc3RlbmVyUmVmKS0+dXNlKHRvSW1wbCh3ZWJzaXRlUG9saWNpZXMpLCBw cm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50KTsKIH0KIAogdm9pZCBXS0ZyYW1lUG9saWN5TGlz dGVuZXJVc2VXaXRoUG9saWNpZXMoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3Rl bmVyUmVmLCBXS1dlYnNpdGVQb2xpY2llc1JlZiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAgdXNl V2l0aFBvbGljaWVzKHBvbGljeUxpc3RlbmVyUmVmLCB3ZWJzaXRlUG9saWNpZXMsIFNob3VsZFBy b2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOworICAgIHVzZVdpdGhQb2xpY2llcyhwb2xpY3lMaXN0 ZW5lclJlZiwgd2Vic2l0ZVBvbGljaWVzLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpO byk7CiB9CiAKIHZvaWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlSW5OZXdQcm9jZXNzV2l0aFBv bGljaWVzKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJz aXRlUG9saWNpZXNSZWYgd2Vic2l0ZVBvbGljaWVzKQogewotICAgIHVzZVdpdGhQb2xpY2llcyhw b2xpY3lMaXN0ZW5lclJlZiwgd2Vic2l0ZVBvbGljaWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9z c2libGU6Olllcyk7CisgICAgdXNlV2l0aFBvbGljaWVzKHBvbGljeUxpc3RlbmVyUmVmLCB3ZWJz aXRlUG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6Olllcyk7CiB9CiAKIHZv aWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyRG93bmxvYWQoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVm IHBvbGljeUxpc3RlbmVyUmVmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev TmF2aWdhdGlvblN0YXRlLm1tCmluZGV4IDg0ODdlNmUzMDVmYzY0OTAwYmQzMWE3MTg2ZWNjNmMw MmIzM2RkYzcuLmQ1YWNkNjQzOGQwZjU1M2Y5NThhNzIwNjY2ZmY0MmQxYzAzYmFmZDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAg LTU1Miw3ICs1NTIsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUAogICAgICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgbG9jYWxM aXN0ZW5lci0+dXNlKHdlYnNpdGVQb2xpY2llcy5nZXQoKSwgYWN0aW9uUG9saWN5ID09IF9XS05h dmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd0luTmV3UHJvY2VzcyA/IFNob3VsZFByb2Nlc3NTd2Fw SWZQb3NzaWJsZTo6WWVzIDogU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7CisgICAg ICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNlKHdlYnNpdGVQb2xpY2llcy5nZXQoKSwgYWN0 aW9uUG9saWN5ID09IF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd0luTmV3UHJvY2VzcyA/ IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6OlllcyA6IFByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQ6Ok5vKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAKICAgICAgICAgICAgIGJy ZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eS5jcHAKaW5kZXggM2Y4MmIwOWNiOThhYTU3NTU5YTE2MTgwMmMxNGZhZjcw ZDVlN2FjNy4uNDBhYTE4NDRkOWY4OTlhNTUzOWRiZDkwYjllNDhhNjlmZGIyZjU2OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHkuY3BwCkBAIC01NSwyNSArNTUsMjUgQEAgdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHk6OmRpZFJlY2VpdmVTYWZlQnJvd3NpbmdSZXN1bHRzKFZlY3RvcjxTYWZlQnJvd3MKICAg ICAgICAgbV9zYWZlQnJvd3NpbmdSZXN1bHRzID0gV1RGTW92ZShzYWZlQnJvd3NpbmdSZXN1bHRz KTsKIH0KIAotdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZShBUEk6OldlYnNp dGVQb2xpY2llcyogcG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwKQor dm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZShBUEk6OldlYnNpdGVQb2xpY2ll cyogcG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1 ZXN0ZWRCeUNsaWVudCkKIHsKICAgICBpZiAobV9zYWZlQnJvd3NpbmdSZXN1bHRzKSB7CiAgICAg ICAgIGlmIChtX3JlcGx5KQotICAgICAgICAgICAgbV9yZXBseShXZWJDb3JlOjpQb2xpY3lBY3Rp b246OlVzZSwgcG9saWNpZXMsIHN3YXAsIFdURk1vdmUoKm1fc2FmZUJyb3dzaW5nUmVzdWx0cykp OworICAgICAgICAgICAgbV9yZXBseShXZWJDb3JlOjpQb2xpY3lBY3Rpb246OlVzZSwgcG9saWNp ZXMsIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFdURk1vdmUoKm1fc2FmZUJyb3dzaW5n UmVzdWx0cykpOwogICAgIH0gZWxzZSBpZiAoIW1fcG9saWN5UmVzdWx0KQotICAgICAgICBtX3Bv bGljeVJlc3VsdCA9IHt7IHBvbGljaWVzLCBzd2FwIH19OworICAgICAgICBtX3BvbGljeVJlc3Vs dCA9IHt7IHBvbGljaWVzLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IH19OwogfQogCiB2 b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6ZG93bmxvYWQoKQogewogICAgIGlmICht X3JlcGx5KQotICAgICAgICBtX3JlcGx5KFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6RG93bmxvYWQs IG51bGxwdHIsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8sIHsgfSk7CisgICAgICAg IG1fcmVwbHkoV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpEb3dubG9hZCwgbnVsbHB0ciwgUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8sIHsgfSk7CiB9CiAKIHZvaWQgV2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5OjppZ25vcmUoKQogewogICAgIGlmIChtX3JlcGx5KQotICAgICAgICBt X3JlcGx5KFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlLCBudWxscHRyLCBTaG91bGRQcm9j ZXNzU3dhcElmUG9zc2libGU6Ok5vLCB7IH0pOworICAgICAgICBtX3JlcGx5KFdlYkNvcmU6OlBv bGljeUFjdGlvbjo6SWdub3JlLCBudWxscHRyLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 OjpObywgeyB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oCmluZGV4IDg5 ZGIyMTE3Zjc3YzM0YmE3MjU4NDU3NjAwOTdjY2Y3MDY3ODVlNmYuLmY3MjZjNjdiOTA3N2FkMDY0 YmI2YWI0NTNmNzNhMTg2YTM5NTU5OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oCkBAIC00MSwyMCArNDEsMjAgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFNhZmVCcm93c2luZ1Jlc3VsdDsKIAotZW51bSBj bGFzcyBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgeyBObywgWWVzIH07CitlbnVtIGNsYXNz IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgeyBObywgWWVzIH07CiBlbnVtIGNsYXNzIFNo b3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCB7IE5vLCBZZXMgfTsKIAogY2xhc3MgV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5IDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVj dDo6VHlwZTo6RnJhbWVQb2xpY3lMaXN0ZW5lcj4gewogcHVibGljOgogCi0gICAgdXNpbmcgUmVw bHkgPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgQVBJOjpX ZWJzaXRlUG9saWNpZXMqLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUsIFZlY3RvcjxTYWZl QnJvd3NpbmdSZXN1bHQ+JiYpPjsKKyAgICB1c2luZyBSZXBseSA9IENvbXBsZXRpb25IYW5kbGVy PHZvaWQoV2ViQ29yZTo6UG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFZlY3RvcjxTYWZlQnJvd3NpbmdSZXN1bHQ+JiYpPjsK ICAgICBzdGF0aWMgUmVmPFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4gY3JlYXRlKFJlcGx5 JiYgcmVwbHksIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCBleHBlY3QpCiAgICAgewog ICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHko V1RGTW92ZShyZXBseSksIGV4cGVjdCkpOwogICAgIH0KICAgICB+V2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5KCk7CiAKLSAgICB2b2lkIHVzZShBUEk6OldlYnNpdGVQb2xpY2llcyogPSBudWxs cHRyLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgPSBTaG91bGRQcm9jZXNzU3dhcElmUG9z c2libGU6Ok5vKTsKKyAgICB2b2lkIHVzZShBUEk6OldlYnNpdGVQb2xpY2llcyogPSBudWxscHRy LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNs aWVudDo6Tm8pOwogICAgIHZvaWQgZG93bmxvYWQoKTsKICAgICB2b2lkIGlnbm9yZSgpOwogICAg IApAQCAtNjMsNyArNjMsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eShSZXBseSYmLCBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQpOwog Ci0gICAgc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8UmVmUHRyPEFQSTo6V2Vic2l0ZVBvbGljaWVz PiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlPj4gbV9wb2xpY3lSZXN1bHQ7CisgICAgc3Rk OjpvcHRpb25hbDxzdGQ6OnBhaXI8UmVmUHRyPEFQSTo6V2Vic2l0ZVBvbGljaWVzPiwgUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudD4+IG1fcG9saWN5UmVzdWx0OwogICAgIHN0ZDo6b3B0aW9u YWw8VmVjdG9yPFNhZmVCcm93c2luZ1Jlc3VsdD4+IG1fc2FmZUJyb3dzaW5nUmVzdWx0czsKICAg ICBSZXBseSBtX3JlcGx5OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5jcHAKaW5kZXggYjVmNTIwZWE4NzFmZTViNjc5NzBhNTQ3ZGI3NmEyNDQ2YmFlM2NlOS4uMDI2 ZmM3YjRiYjZmZTU2ZjAzYzU5MDk5NDFmNjEwNzc4NTEyN2Y1ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAgLTE3NywxMiArMTc3LDEyIEBAIHZvaWQgV2Vi RnJhbWVQcm94eTo6ZGlkQ2hhbmdlVGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSkKICAgICBtX3Rp dGxlID0gdGl0bGU7CiB9CiAKLVdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYgV2ViRnJhbWVQ cm94eTo6c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2Vi Q29yZTo6UG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFNob3VsZFByb2Nlc3NT d2FwSWZQb3NzaWJsZSwgVmVjdG9yPFNhZmVCcm93c2luZ1Jlc3VsdD4mJik+JiYgY29tcGxldGlv bkhhbmRsZXIsIFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdCBleHBlY3QpCitXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHkmIFdlYkZyYW1lUHJveHk6OnNldFVwUG9saWN5TGlzdGVuZXJQ cm94eShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgQVBJOjpX ZWJzaXRlUG9saWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBWZWN0b3I8U2Fm ZUJyb3dzaW5nUmVzdWx0PiYmKT4mJiBjb21wbGV0aW9uSGFuZGxlciwgU2hvdWxkRXhwZWN0U2Fm ZUJyb3dzaW5nUmVzdWx0IGV4cGVjdCkKIHsKICAgICBpZiAobV9hY3RpdmVMaXN0ZW5lcikKICAg ICAgICAgbV9hY3RpdmVMaXN0ZW5lci0+aWdub3JlKCk7Ci0gICAgbV9hY3RpdmVMaXN0ZW5lciA9 IFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcildIChXZWJDb3JlOjpQb2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6OldlYnNpdGVQb2xp Y2llcyogcG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwLCBWZWN0b3I8 U2FmZUJyb3dzaW5nUmVzdWx0PiYmIHNhZmVCcm93c2luZ1Jlc3VsdHMpIG11dGFibGUgewotICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihhY3Rpb24sIHBvbGljaWVzLCBzd2FwLCBXVEZNb3ZlKHNh ZmVCcm93c2luZ1Jlc3VsdHMpKTsKKyAgICBtX2FjdGl2ZUxpc3RlbmVyID0gV2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5OjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKFdl YkNvcmU6OlBvbGljeUFjdGlvbiBhY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBwb2xpY2ll cywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50LCBWZWN0b3I8U2FmZUJyb3dzaW5nUmVzdWx0PiYmIHNhZmVCcm93c2luZ1Jlc3VsdHMpIG11 dGFibGUgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihhY3Rpb24sIHBvbGljaWVzLCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBXVEZNb3ZlKHNhZmVCcm93c2luZ1Jlc3VsdHMpKTsK ICAgICAgICAgbV9hY3RpdmVMaXN0ZW5lciA9IG51bGxwdHI7CiAgICAgfSwgZXhwZWN0KTsKICAg ICByZXR1cm4gKm1fYWN0aXZlTGlzdGVuZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJGcmFtZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFt ZVByb3h5LmgKaW5kZXggNTIyY2I1OGEzNzY1MWJjYmVhNjhkMTJlZjVkZDMxM2NjMGM5YWZlNC4u NDc2YTVhNDcxNDdhNjUzMzNmMWJmYWExM2JkOGQyNGY0MmU4NGE5OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaApAQCAtNTQsNyArNTQsNyBAQCBjbGFzcyBXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJzaXRl RGF0YVN0b3JlOwogZW51bSBjbGFzcyBTaG91bGRFeHBlY3RTYWZlQnJvd3NpbmdSZXN1bHQ7Ci1l bnVtIGNsYXNzIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTsKK2VudW0gY2xhc3MgUHJvY2Vz c1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsKIHN0cnVjdCBXZWJzaXRlUG9saWNpZXNEYXRhOwogCiB0 eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxBUEk6OkRhdGEqPiBEYXRhQ2FsbGJhY2s7CkBAIC0xMTcs NyArMTE3LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbihj b25zdCBXZWJDb3JlOjpVUkwmKTsgLy8gZWcuIGFuY2hvciBuYXZpZ2F0aW9uLCBzZXNzaW9uIHN0 YXRlIGNoYW5nZS4KICAgICB2b2lkIGRpZENoYW5nZVRpdGxlKGNvbnN0IFN0cmluZyYpOwogCi0g ICAgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5JiBzZXRVcFBvbGljeUxpc3RlbmVyUHJveHko Q29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpQb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0 ZVBvbGljaWVzKiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlLCBWZWN0b3I8U2FmZUJyb3dz aW5nUmVzdWx0PiYmKT4mJiwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0KTsKKyAgICBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkmIHNldFVwUG9saWN5TGlzdGVuZXJQcm94eShDb21w bGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9s aWNpZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBWZWN0b3I8U2FmZUJyb3dzaW5n UmVzdWx0PiYmKT4mJiwgU2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0KTsKIAogI2lmIEVO QUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICB2b2lkIGNvbnRlbnRGaWx0ZXJEaWRCbG9ja0xv YWQoV2ViQ29yZTo6Q29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyIGNvbnRlbnRGaWx0ZXJVbmJs b2NrSGFuZGxlcikgeyBtX2NvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlciA9IFdURk1vdmUoY29u dGVudEZpbHRlclVuYmxvY2tIYW5kbGVyKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKaW5kZXggNjQ4MTA4MTEyNmEzMmZiNDI0M2JjNWVmZjc1YjFkYTY2YTdhNDEy Mi4uODYyZTQ4NjM2YzQ4M2JmNTcxYTJkMGQ3ZmZlZTgxNDUwODQ4ZGRiZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MDEzLDcgKzQwMTMsNyBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbih1aW50NjRfdCBm cmFtZUlELCBjb25zdCBXZWJDbwogICAgIFVOVVNFRF9QQVJBTShuZXdOYXZpZ2F0aW9uSUQpOwog I2VuZGlmCiAKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lM aXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGZyYW1l ID0gbWFrZVJlZigqZnJhbWUpLCBzZW5kZXIgPSBzZW5kZXIuY29weVJlZigpLCBuYXZpZ2F0aW9u XSAoV2ViQ29yZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNp ZXMqIHBvbGljaWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc3dhcCwgVmVjdG9yPFNh ZmVCcm93c2luZ1Jlc3VsdD4mJikgbXV0YWJsZSB7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VS ZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBmcmFtZSA9IG1ha2VSZWYoKmZyYW1lKSwgc2VuZGVyID0gc2VuZGVy LmNvcHlSZWYoKSwgbmF2aWdhdGlvbl0gKFdlYkNvcmU6OlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rp b24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBwb2xpY2llcywgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBWZWN0b3I8U2FmZUJyb3dzaW5n UmVzdWx0PiYmKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IGRvIHNvbWV0aGluZyB3aXRo IHRoZSBTYWZlQnJvd3NpbmdSZXN1bHRzLgogCiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8V2Vic2l0 ZVBvbGljaWVzRGF0YT4gZGF0YTsKQEAgLTQwMjQsNyArNDAyNCw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnN0IFdlYkNvCiAgICAgICAgIH0KIAogICAgICAgICBpZiAocG9saWN5QWN0aW9uID09IFBvbGlj eUFjdGlvbjo6VXNlICYmIGZyYW1lLT5pc01haW5GcmFtZSgpKSB7Ci0gICAgICAgICAgICBhdXRv IHByb3Bvc2VkUHJvY2VzcyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnByb2Nlc3NGb3JOYXZp Z2F0aW9uKCp0aGlzLCAqbmF2aWdhdGlvbiwgc3dhcCwgcG9saWN5QWN0aW9uKTsKKyAgICAgICAg ICAgIGF1dG8gcHJvcG9zZWRQcm9jZXNzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkucHJvY2Vz c0Zvck5hdmlnYXRpb24oKnRoaXMsICpuYXZpZ2F0aW9uLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5 Q2xpZW50LCBwb2xpY3lBY3Rpb24pOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAocHJv cG9zZWRQcm9jZXNzLnB0cigpICE9ICZwcm9jZXNzKCkpIHsKICAgICAgICAgICAgICAgICBMT0co UHJvY2Vzc1N3YXBwaW5nLCAiKFByb2Nlc3NTd2FwcGluZykgU3dpdGNoaW5nIGZyb20gcHJvY2Vz cyAlaSB0byBuZXcgcHJvY2VzcyAoJWkpIGZvciBuYXZpZ2F0aW9uICUiIFBSSXU2NCAiICclcyci LCBwcm9jZXNzSWRlbnRpZmllcigpLCBwcm9wb3NlZFByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVy KCksIG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLT5sb2dnaW5nU3RyaW5n KCkpOwpAQCAtNDA4NCw5ICs0MDg0LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGlj eUZvck5ld1dpbmRvd0FjdGlvbih1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKICAgICBN RVNTQUdFX0NIRUNLKGZyYW1lKTsKICAgICBNRVNTQUdFX0NIRUNLX1VSTChyZXF1ZXN0LnVybCgp KTsKIAotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3Rl bmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgbGlzdGVuZXJJ RCwgZnJhbWVJRF0gKFdlYkNvcmU6OlBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6V2Vi c2l0ZVBvbGljaWVzKiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3YXAsIFZlY3RvcjxT YWZlQnJvd3NpbmdSZXN1bHQ+JiYgc2FmZUJyb3dzaW5nUmVzdWx0cykgbXV0YWJsZSB7CisgICAg YXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShb dGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBsaXN0ZW5lcklELCBmcmFtZUlE XSAoV2ViQ29yZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNp ZXMqLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQsIFZlY3RvcjxTYWZlQnJvd3NpbmdSZXN1bHQ+JiYgc2FmZUJyb3dzaW5nUmVzdWx0cykg bXV0YWJsZSB7CiAgICAgICAgIC8vIEZJWE1FOiBBc3NlcnQgdGhlIEFQSTo6V2Vic2l0ZVBvbGlj aWVzKiBpcyBudWxscHRyIGhlcmUgb25jZSBjbGllbnRzIG9mIFdLRnJhbWVQb2xpY3lMaXN0ZW5l clVzZVdpdGhQb2xpY2llcyBnbyBhd2F5LgotICAgICAgICBSRUxFQVNFX0FTU0VSVChzd2FwID09 IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOworICAgICAgICBSRUxFQVNFX0FTU0VS VChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlD bGllbnQ6Ok5vKTsKICAgICAgICAgQVNTRVJUX1VOVVNFRChzYWZlQnJvd3NpbmdSZXN1bHRzLCBz YWZlQnJvd3NpbmdSZXN1bHRzLmlzRW1wdHkoKSk7CiAgICAgICAgIHJlY2VpdmVkUG9saWN5RGVj aXNpb24ocG9saWN5QWN0aW9uLCBudWxscHRyLCBzdGQ6Om51bGxvcHQsIFBvbGljeURlY2lzaW9u U2VuZGVyOjpjcmVhdGUoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpLCBmcmFtZUlELCBsaXN0ZW5lcklEXSAoYXV0by4uLiBhcmdzKSB7CiAgICAgICAgICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZFJlY2VpdmVQb2xpY3lEZWNpc2lv bihmcmFtZUlELCBsaXN0ZW5lcklELCBhcmdzLi4uKSwgbV9wYWdlSUQpOwpAQCAtNDEyMCw5ICs0 MTIwLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyaXR5T3JpZ2kKICAgICBNRVNTQUdFX0NIRUNLX1VSTChy ZXNwb25zZS51cmwoKSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9u ID0gbmF2aWdhdGlvbklEID8gJm1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRp b25JRCkgOiBudWxscHRyOwotICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRV cFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbild IChXZWJDb3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2ll cyosIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwLCBWZWN0b3I8U2FmZUJyb3dzaW5n UmVzdWx0PiYmIHNhZmVCcm93c2luZ1Jlc3VsdHMpIG11dGFibGUgeworICAgIGF1dG8gbGlzdGVu ZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxpc3RlbmVyUHJveHkoW3RoaXMsIHByb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJRCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlv biA9IFdURk1vdmUobmF2aWdhdGlvbildIChXZWJDb3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQg cHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgVmVjdG9yPFNhZmVCcm93c2luZ1Jlc3VsdD4m JiBzYWZlQnJvd3NpbmdSZXN1bHRzKSBtdXRhYmxlIHsKICAgICAgICAgLy8gRklYTUU6IEFzc2Vy dCB0aGUgQVBJOjpXZWJzaXRlUG9saWNpZXMqIGlzIG51bGxwdHIgaGVyZSBvbmNlIGNsaWVudHMg b2YgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzIGdvIGF3YXkuCi0gICAgICAg IFJFTEVBU0VfQVNTRVJUKHN3YXAgPT0gU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0g UHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDo6Tm8pOwogICAgICAgICBBU1NFUlRfVU5VU0VE KHNhZmVCcm93c2luZ1Jlc3VsdHMsIHNhZmVCcm93c2luZ1Jlc3VsdHMuaXNFbXB0eSgpKTsKICAg ICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24uZ2V0 KCksIHN0ZDo6bnVsbG9wdCwgUG9saWN5RGVjaXNpb25TZW5kZXI6OmNyZWF0ZShbdGhpcywgcHJv dGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGZyYW1lSUQsIGxpc3RlbmVySURd IChhdXRvLi4uIGFyZ3MpIHsKICAgICAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6RGlkUmVjZWl2ZVBvbGljeURlY2lzaW9uKGZyYW1lSUQsIGxpc3RlbmVySUQsIGFy Z3MuLi4pLCBtX3BhZ2VJRCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmlu ZGV4IDdiZTUzOTg1ODU5NmJmMTUzZGE3MGVkMDhkMmUyMjEyYWM2Mzk4NzkuLmZiNTQ5MTQyMWYx M2IzNTMwNzQ1MTAzZDM1ZDc0MGZlMWY1MDRmYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCkBAIC0yNTgsNyArMjU4LDcgQEAgc3RydWN0IFByaW50SW5mbzsKIHN0cnVj dCBXZWJQb3B1cEl0ZW07CiBzdHJ1Y3QgVVJMU2NoZW1lVGFza1BhcmFtZXRlcnM7CiAKLWVudW0g Y2xhc3MgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOworZW51bSBjbGFzcyBQcm9jZXNzU3dh cFJlcXVlc3RlZEJ5Q2xpZW50OwogZW51bSBjbGFzcyBVbmRvT3JSZWRvOwogCiAjaWYgVVNFKFFV SUNLX0xPT0spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5k ZXggYTY0MTU3ODc4N2QwNDk3OWI0OWRjNTAwOTdhNWYwYjUwZDlmNTIxZC4uZGI5MzM1MWNlOTM1 ZWNlNTVlMTgwMDIyOTAwN2I3N2IyNTZkYzlmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMjEyNiw5ICsyMTI2LDkgQEAgdm9pZCBXZWJQcm9jZXNz UG9vbDo6cmVtb3ZlUHJvY2Vzc0Zyb21PcmlnaW5DYWNoZVNldChXZWJQcm9jZXNzUHJveHkmIHBy b2Nlc3MpCiAgICAgICAgIG1fc3dhcHBlZFByb2Nlc3Nlc1BlclJlZ2lzdHJhYmxlRG9tYWluLnJl bW92ZShyZWdpc3RyYWJsZURvbWFpbik7CiB9CiAKLVJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlBy b2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0 IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxl IHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgUG9saWN5QWN0aW9uJiBhY3Rpb24pCitSZWY8 V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb24oV2Vi UGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUG9s aWN5QWN0aW9uJiBhY3Rpb24pCiB7Ci0gICAgYXV0byBwcm9jZXNzID0gcHJvY2Vzc0Zvck5hdmln YXRpb25JbnRlcm5hbChwYWdlLCBuYXZpZ2F0aW9uLCBzaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGUsIGFjdGlvbik7CisgICAgYXV0byBwcm9jZXNzID0gcHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRl cm5hbChwYWdlLCBuYXZpZ2F0aW9uLCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBhY3Rp b24pOwogCiAgICAgaWYgKG1fY29uZmlndXJhdGlvbi0+YWx3YXlzS2VlcEFuZFJldXNlU3dhcHBl ZFByb2Nlc3NlcygpICYmIHByb2Nlc3MucHRyKCkgIT0gJnBhZ2UucHJvY2VzcygpKSB7CiAgICAg ICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBvbmNlRmxhZzsKQEAgLTIxNDQsOSArMjE0NCw5IEBA IFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlv bihXZWJQYWdlUHJveHkmIHBhZ2UsIGNvCiAgICAgcmV0dXJuIHByb2Nlc3M7CiB9CiAKLVJlZjxX ZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVy bmFsKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9u LCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxl LCBQb2xpY3lBY3Rpb24mIGFjdGlvbikKK1JlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQ b29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29u c3QgQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIFBvbGljeUFjdGlvbiYgYWN0aW9uKQog ewotICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24oKSAm JiBzaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgPT0gU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3Np YmxlOjpObykKKyAgICBpZiAoIW1fY29uZmlndXJhdGlvbi0+cHJvY2Vzc1N3YXBzT25OYXZpZ2F0 aW9uKCkgJiYgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVl c3RlZEJ5Q2xpZW50OjpObykKICAgICAgICAgcmV0dXJuIHBhZ2UucHJvY2VzcygpOwogCiAgICAg aWYgKHBhZ2UuaW5zcGVjdG9yRnJvbnRlbmRDb3VudCgpID4gMCkKQEAgLTIxOTAsNyArMjE5MCw3 IEBAIFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdh dGlvbkludGVybmFsKFdlYlBhZ2VQcm94eSYKICAgICB9CiAKICAgICBhdXRvIHRhcmdldFVSTCA9 IG5hdmlnYXRpb24uY3VycmVudFJlcXVlc3QoKS51cmwoKTsKLSAgICBpZiAoc2hvdWxkUHJvY2Vz c1N3YXBJZlBvc3NpYmxlID09IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pIHsKKyAg ICBpZiAocHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50OjpObykgewogICAgICAgICBpZiAobmF2aWdhdGlvbi50cmVhdEFzU2FtZU9yaWdp bk5hdmlnYXRpb24oKSkKICAgICAgICAgICAgIHJldHVybiBwYWdlLnByb2Nlc3MoKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggMTEyMTU0MDAyYTNmNjlj ZTY3Nzc0NmZmYTdiMTQzMGFhZjM1MTZkOS4uYTEyZDY0NWYzMTczZDEzZDgwYWRlYjVlNzMzZDRj YzE4OTU1ZWNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCkBA IC0xMTAsNyArMTEwLDcgQEAgaW50IHdlYlByb2Nlc3NMYXRlbmN5UU9TKCk7CiBpbnQgd2ViUHJv Y2Vzc1Rocm91Z2hwdXRRT1MoKTsKICNlbmRpZgogCi1lbnVtIGNsYXNzIFNob3VsZFByb2Nlc3NT d2FwSWZQb3NzaWJsZTsKK2VudW0gY2xhc3MgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudDsK IAogY2xhc3MgV2ViUHJvY2Vzc1Bvb2wgZmluYWwgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQ STo6T2JqZWN0OjpUeXBlOjpQcm9jZXNzUG9vbD4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxXZWJQ cm9jZXNzUG9vbD4sIHByaXZhdGUgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogcHVibGljOgpAQCAt NDUwLDcgKzQ1MCw3IEBAIHB1YmxpYzoKICAgICBCYWNrZ3JvdW5kV2ViUHJvY2Vzc1Rva2VuIGJh Y2tncm91bmRXZWJQcm9jZXNzVG9rZW4oKSBjb25zdCB7IHJldHVybiBCYWNrZ3JvdW5kV2ViUHJv Y2Vzc1Rva2VuKG1fYmFja2dyb3VuZFdlYlByb2Nlc3NDb3VudGVyLmNvdW50KCkpOyB9CiAjZW5k aWYKIAotICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3NGb3JOYXZpZ2F0aW9uKFdlYlBh Z2VQcm94eSYsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3Nz aWJsZSwgV2ViQ29yZTo6UG9saWN5QWN0aW9uJik7CisgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4g cHJvY2Vzc0Zvck5hdmlnYXRpb24oV2ViUGFnZVByb3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9u JiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgV2ViQ29yZTo6UG9saWN5QWN0aW9uJik7 CiAgICAgdm9pZCByZWdpc3RlclN1c3BlbmRlZFBhZ2VQcm94eShTdXNwZW5kZWRQYWdlUHJveHkm KTsKICAgICB2b2lkIHVucmVnaXN0ZXJTdXNwZW5kZWRQYWdlUHJveHkoU3VzcGVuZGVkUGFnZVBy b3h5Jik7CiAgICAgdm9pZCBkaWRSZWFjaEdvb2RUaW1lVG9QcmV3YXJtKCk7CkBAIC00NzAsNyAr NDcwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3Mo V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYpOwogICAgIHZvaWQgcGxhdGZvcm1JbnZhbGlk YXRlQ29udGV4dCgpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmln YXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24mLCBTaG91 bGRQcm9jZXNzU3dhcElmUG9zc2libGUsIFdlYkNvcmU6OlBvbGljeUFjdGlvbiYpOworICAgIFJl ZjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVBy b3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVu dCwgV2ViQ29yZTo6UG9saWN5QWN0aW9uJik7CiAKICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5 PiB0cnlUYWtlUHJld2FybWVkUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlJik7CiAK