191488 2018-11-09 14:55:38 -0800 Suspended page persists even after back/forward list item is gone 2018-11-09 16:24:17 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez commit-queue ggaren webkit-bug-importer oldest_to_newest 1477119 0 cdumez 2018-11-09 14:55:38 -0800 Suspended page persists even after back/forward list item is gone. 1477120 1 cdumez 2018-11-09 14:55:54 -0800 <rdar://problem/45953006> 1477129 2 354393 cdumez 2018-11-09 15:02:06 -0800 Created attachment 354393 Patch 1477130 3 354393 ggaren 2018-11-09 15:08:49 -0800 Comment on attachment 354393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354393&action=review > Source/WebKit/Shared/WebBackForwardListItem.cpp:129 > +void WebBackForwardListItem::suspendedPageIsNoLongerNeeded() I would call this removeSuspendedPageFromProcessPool. > Source/WebKit/UIProcess/WebProcessPool.cpp:2273 > +void WebProcessPool::removeSuspendedPageProxy(SuspendedPageProxy& suspendedPage) I would call this removeSuspendedPage. 1477131 4 354393 ggaren 2018-11-09 15:09:14 -0800 Comment on attachment 354393 Patch r=me 1477149 5 354399 cdumez 2018-11-09 15:47:35 -0800 Created attachment 354399 Patch 1477174 6 354399 commit-queue 2018-11-09 16:24:16 -0800 Comment on attachment 354399 Patch Clearing flags on attachment: 354399 Committed r238061: <https://trac.webkit.org/changeset/238061> 1477175 7 commit-queue 2018-11-09 16:24:17 -0800 All reviewed patches have been landed. Closing bug. 354393 2018-11-09 15:02:06 -0800 2018-11-09 15:47:34 -0800 Patch bug-191488-20181109150205.patch text/plain 11262 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg1ZGI3NTFjZGI4ZmYwNWM0 M2M1NjQ5Nzc1Yzg5NjI5ZjM0NjMyZDMuLmRkYTcyYzMwOTFlYjUyZWVmMTUyY2IxYmVmM2Q1MTli MGY2NThlNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTEtMDkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTdXNwZW5kZWQgcGFnZSBwZXJzaXN0 cyBldmVuIGFmdGVyIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gaXMgZ29uZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDg4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80NTk1MzAwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDdXJyZW50bHksIHRoZSBXZWJQcm9jZXNzUG9vbCBvd25zIHRoZSBTdXNw ZW5kZWRQYWdlUHJveHkgb2JqZWN0cyBhbmQgbWFrZXMgc3VyZSB3ZSBjYXAgaG93CisgICAgICAg IG1hbnkgd2UgY2FuIGhhdmUuIFRoZSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtIG1lcmVseSBoYXMg YSBXZWFrUHRyIHRvIGl0cyBhc3NvY2lhdGVkCisgICAgICAgIFN1c3BlbmRlZFBhZ2VQcm94eS4g SG93ZXZlciwgdGhlcmUgaXMgbm8gcG9pbnQgaW4gaGF2aW5nIHRoZSBXZWJQcm9jZXNzUG9vbCBr ZWVwaW5nIGEKKyAgICAgICAgU3VzcGVuZGVkUGFnZVByb3h5IG9iamVjdCBhbGl2ZSBpZiB0aGVy ZSBpcyBubyBsb25nZXIgYW55IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0gcG9pbnRpbmcKKyAgICAg ICAgdG8gaXQuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0gbm93cyB0ZWxscyB0aGUgV2ViUHJvY2Vzc1Bvb2wgdG8gZGVzdHJveQorICAgICAg ICBpdHMgU3VzcGVuZGVkUGFnZVByb3h5IHdoZW4gbmVjZXNzYXJ5LiBXZWJCYWNrRm9yd2FyZExp c3QgYWxzbyB0YWtlcyBjYXJlIG9mIG51bGxpbmcKKyAgICAgICAgb3V0IHRoZSBXZWJCYWNrRm9y d2FyZExpc3RJdGVtJ3MgU3VzcGVuZGVkUGFnZVByb3h5IGFmdGVyIHRoZSBpdGVtIGhhcyBiZWVu IHJlbW92ZWQKKyAgICAgICAgZnJvbSB0aGUgbGlzdCAoaW4gY2FzZSBzb21lYm9keSBrZWVwcyB0 aGUgaXRlbSBhbGl2ZSkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRl bS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06On5XZWJCYWNr Rm9yd2FyZExpc3RJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bTo6c2V0U3VzcGVuZGVkUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlz dEl0ZW06OnN1c3BlbmRlZFBhZ2VJc05vTG9uZ2VyTmVlZGVkKToKKyAgICAgICAgKiBTaGFyZWQv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3Bl bmRlZFBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdDo6ZGlkUmVtb3ZlSXRlbSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OnJlbW92ZVN1c3BlbmRlZFBhZ2VQcm94eSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisKIDIwMTgtMTEtMDkgIEJhc3VrZSBTdXp1a2kg IDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAgIFtDdXJsXVtXZWJLaXRdIEltcGxl bWVudCBQcm94eSBjb25maWd1cmF0aW9uIEFQSS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKaW5kZXggNjEyZGIyMzI2OTcyOTNiYzBhZWE1NGY2 MDBkZDcxNzY2NzIwMjcxYi4uMmJmNmQzODYxZjU1YzI0YzAzMDFjZTVkZDI2NjFkODRhN2Y4OTE3 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRl bS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5j cHAKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgi CiAKICNpbmNsdWRlICJTdXNwZW5kZWRQYWdlUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNz UG9vbC5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogI2luY2x1ZGUgPFdlYkNvcmUv VVJMLmg+CiAjaW5jbHVkZSA8d3RmL0RlYnVnVXRpbGl0aWVzLmg+CiAKQEAgLTUxLDYgKzUzLDgg QEAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6fldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oKQogewog ICAgIEFTU0VSVChhbGxJdGVtcygpLmdldChtX2l0ZW1TdGF0ZS5pZGVudGlmaWVyKSA9PSB0aGlz KTsKICAgICBhbGxJdGVtcygpLnJlbW92ZShtX2l0ZW1TdGF0ZS5pZGVudGlmaWVyKTsKKworICAg IHN1c3BlbmRlZFBhZ2VJc05vTG9uZ2VyTmVlZGVkKCk7CiB9CiAKIEhhc2hNYXA8QmFja0Zvcndh cmRJdGVtSWRlbnRpZmllciwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSo+JiBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjphbGxJdGVtcygpCkBAIC0xMTMsMTEgKzExNywyNCBAQCBib29sIFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW06Oml0ZW1Jc0luU2FtZURvY3VtZW50KGNvbnN0IFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mCiAgICAgcmV0dXJuIGRvY3VtZW50VHJlZXNBcmVFcXVhbChtYWluRnJhbWVTdGF0 ZSwgb3RoZXJNYWluRnJhbWVTdGF0ZSk7CiB9CiAKLXZvaWQgV2ViQmFja0ZvcndhcmRMaXN0SXRl bTo6c2V0U3VzcGVuZGVkUGFnZShTdXNwZW5kZWRQYWdlUHJveHkmIHBhZ2UpCit2b2lkIFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW06OnNldFN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5KiBw YWdlKQogeworICAgIGlmIChtX3N1c3BlbmRlZFBhZ2UgPT0gcGFnZSkKKyAgICAgICAgcmV0dXJu OworCisgICAgc3VzcGVuZGVkUGFnZUlzTm9Mb25nZXJOZWVkZWQoKTsKICAgICBtX3N1c3BlbmRl ZFBhZ2UgPSBtYWtlV2Vha1B0cihwYWdlKTsKIH0KIAordm9pZCBXZWJCYWNrRm9yd2FyZExpc3RJ dGVtOjpzdXNwZW5kZWRQYWdlSXNOb0xvbmdlck5lZWRlZCgpCit7CisgICAgaWYgKCFtX3N1c3Bl bmRlZFBhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIG1fc3VzcGVuZGVkUGFnZS0+cHJvY2Vz cygpLnByb2Nlc3NQb29sKCkucmVtb3ZlU3VzcGVuZGVkUGFnZVByb3h5KCptX3N1c3BlbmRlZFBh Z2UpOworICAgIEFTU0VSVCghbV9zdXNwZW5kZWRQYWdlKTsKK30KKwogI2lmICFMT0dfRElTQUJM RUQKIGNvbnN0IGNoYXIqIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmxvZ2dpbmdTdHJpbmcoKQog ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRl bS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCmluZGV4 IDQzNzY2NDgzOTZjNGVmZWI4YjY0MjM4MGJkNDAzMzEyODkxZjM4NDQuLjgyNzU5OTY4NTZlMTgx MmE3NTc0NTdjZmIyNDFlMWQ1NDMyOWU5YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKQEAgLTY5LDcgKzY5LDcgQEAgcHVibGljOgogICAgIFZp ZXdTbmFwc2hvdCogc25hcHNob3QoKSBjb25zdCB7IHJldHVybiBtX2l0ZW1TdGF0ZS5zbmFwc2hv dC5nZXQoKTsgfQogICAgIHZvaWQgc2V0U25hcHNob3QoUmVmUHRyPFZpZXdTbmFwc2hvdD4mJiBz bmFwc2hvdCkgeyBtX2l0ZW1TdGF0ZS5zbmFwc2hvdCA9IFdURk1vdmUoc25hcHNob3QpOyB9CiAj ZW5kaWYKLSAgICB2b2lkIHNldFN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5Jik7Cisg ICAgdm9pZCBzZXRTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSopOwogICAgIFN1c3Bl bmRlZFBhZ2VQcm94eSogc3VzcGVuZGVkUGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3VzcGVuZGVk UGFnZS5nZXQoKTsgfQogCiAjaWYgIUxPR19ESVNBQkxFRApAQCAtNzksNiArNzksOCBAQCBwdWJs aWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oQmFja0Zv cndhcmRMaXN0SXRlbVN0YXRlJiYsIHVpbnQ2NF90IHBhZ2VJRCk7CiAKKyAgICB2b2lkIHN1c3Bl bmRlZFBhZ2VJc05vTG9uZ2VyTmVlZGVkKCk7CisKICAgICBCYWNrRm9yd2FyZExpc3RJdGVtU3Rh dGUgbV9pdGVtU3RhdGU7CiAgICAgdWludDY0X3QgbV9wYWdlSUQ7CiAgICAgV2Vha1B0cjxTdXNw ZW5kZWRQYWdlUHJveHk+IG1fc3VzcGVuZGVkUGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IDk0OTU4MjZiMWY4NmM4YmI2MzgzYWZi YjFhMDczMDE1NzVlYzllM2QuLmRkZjBlMTUyOTRhYTc2MWZjNGExZGE3YzA2ZmVmNGFjNGZhODli MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNw cApAQCAtODAsNyArODAsNyBAQCBTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94 eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JgogICAgICwgbV9tYWlu RnJhbWVJRChtYWluRnJhbWVJRCkKICAgICAsIG1fcmVnaXN0cmFibGVEb21haW4odG9SZWdpc3Ry YWJsZURvbWFpbihVUkwoVVJMKCksIGl0ZW0udXJsKCkpKSkKIHsKLSAgICBpdGVtLnNldFN1c3Bl bmRlZFBhZ2UoKnRoaXMpOworICAgIGl0ZW0uc2V0U3VzcGVuZGVkUGFnZSh0aGlzKTsKICAgICBt X3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNz YWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS5wYWdlSUQoKSwgKnRoaXMpOwogCiAgICAgbV9wcm9j ZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRJc1N1c3BlbmRlZCh0cnVlKSwgbV9wYWdl LnBhZ2VJRCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tG b3J3YXJkTGlzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExp c3QuY3BwCmluZGV4IGJjM2I0YWMyZTE1NzAxOTg1OTgxMmRjMjkxOGQxZDFkN2M4ZDk3ZDAuLjIy Y2E0YzNkYjRmNmQwMzFlNjA2OTc4M2MxZDc4YmNmZjZmZTE5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0LmNwcApAQCAtNDY3LDYgKzQ2Nyw3IEBA IHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0OjpkaWRSZW1vdmVJdGVtKFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW0mIGJhY2tGb3J3YXJkTGlzdEl0CiB7CiAgICAgbV9wYWdlLT5iYWNrRm9yd2FyZFJlbW92 ZWRJdGVtKGJhY2tGb3J3YXJkTGlzdEl0ZW0uaXRlbUlEKCkpOwogCisgICAgYmFja0ZvcndhcmRM aXN0SXRlbS5zZXRTdXNwZW5kZWRQYWdlKG51bGxwdHIpOwogI2lmIFBMQVRGT1JNKENPQ09BKQog ICAgIGJhY2tGb3J3YXJkTGlzdEl0ZW0uc2V0U25hcHNob3QobnVsbHB0cik7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBlNGE4NzcwNDc1 NzhjNDhmNDBkNzFjNjkyN2M5NjVkYjk2MmI3OTQwLi5iYjdhNGQ3ZjNmYTM1MTE3MTgyYjNhOWQ1 MjEzYmY0NWQ3NTIwNWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wuY3BwCkBAIC0yMjcwLDYgKzIyNzAsMTUgQEAgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBh Z2VQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnRha2VTdXNwZW5kZWRQYWdlUHJveHkoU3VzcGUKICAg ICB9KTsKIH0KIAordm9pZCBXZWJQcm9jZXNzUG9vbDo6cmVtb3ZlU3VzcGVuZGVkUGFnZVByb3h5 KFN1c3BlbmRlZFBhZ2VQcm94eSYgc3VzcGVuZGVkUGFnZSkKK3sKKyAgICBhdXRvIGl0ID0gbV9z dXNwZW5kZWRQYWdlcy5maW5kSWYoWyZzdXNwZW5kZWRQYWdlXShhdXRvJiBpdGVtKSB7CisgICAg ICAgIHJldHVybiBpdGVtLmdldCgpID09ICZzdXNwZW5kZWRQYWdlOworICAgIH0pOworICAgIGlm IChpdCAhPSBtX3N1c3BlbmRlZFBhZ2VzLmVuZCgpKQorICAgICAgICBtX3N1c3BlbmRlZFBhZ2Vz LnJlbW92ZShpdCk7Cit9CisKIGJvb2wgV2ViUHJvY2Vzc1Bvb2w6Omhhc1N1c3BlbmRlZFBhZ2VQ cm94eUZvcihXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1f c3VzcGVuZGVkUGFnZXMuZmluZElmKFsmcHJvY2Vzc10oYXV0byYgc3VzcGVuZGVkUGFnZSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggZDNhOGQ4ZTViMGFm ZGY2YWU0ZTUzMDZmNDkzYThiOWNiNTBjMjVlZC4uM2EwOWNmZDIxMTFkZjA0ZDAzYThlZDEzNzZm ODg5MjFlZjY3OTM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o CkBAIC00NDksNiArNDQ5LDcgQEAgcHVibGljOgogICAgIHZvaWQgYWRkU3VzcGVuZGVkUGFnZVBy b3h5KHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+JiYpOwogICAgIHZvaWQgcmVt b3ZlQWxsU3VzcGVuZGVkUGFnZVByb3hpZXNGb3JQYWdlKFdlYlBhZ2VQcm94eSYpOwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IHRha2VTdXNwZW5kZWRQYWdlUHJveHko U3VzcGVuZGVkUGFnZVByb3h5Jik7CisgICAgdm9pZCByZW1vdmVTdXNwZW5kZWRQYWdlUHJveHko U3VzcGVuZGVkUGFnZVByb3h5Jik7CiAgICAgYm9vbCBoYXNTdXNwZW5kZWRQYWdlUHJveHlGb3Io V2ViUHJvY2Vzc1Byb3h5JikgY29uc3Q7CiAgICAgdW5zaWduZWQgbWF4U3VzcGVuZGVkUGFnZUNv dW50KCkgY29uc3QgeyByZXR1cm4gbV9tYXhTdXNwZW5kZWRQYWdlQ291bnQ7IH0KIApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlmZWM5ZDgxNGJj OWY3N2ZhNGUxNjE3MWQ2OWRlZmE3MTZmNDM2NGIuLjQxZmRkMGUyMWQwMzk2OGJjYzA3MDQwZDky YWFjODFlNWNlNGYwMmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0xMS0wOSAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgorCisgICAgICAgIFN1c3BlbmRlZCBwYWdlIHBlcnNpc3RzIGV2ZW4gYWZ0 ZXIgYmFjay9mb3J3YXJkIGxpc3QgaXRlbSBpcyBnb25lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE0ODgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ1OTUzMDA2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBBUEkgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisKIDIwMTgtMTEtMDkg IEJhc3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAgIFtDdXJs XVtXZWJLaXRdIEltcGxlbWVudCBQcm94eSBjb25maWd1cmF0aW9uIEFQSS4KZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NT d2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGIyZWM5MjUxNWM0NjlkYzM0ZDk4MWJlNjA1NjA5NWJh Yzc1YWYyMTcuLmZiZThhY2M1NDZmYzBmYTY5Nzk1ZWMzYWNmNzA5NTM0YzcyMzE3ZTIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNjIzLDYgKzYyMyw2NSBAQCBURVNUKFBy b2Nlc3NTd2FwLCBCYWNrKQogICAgICAgICBFWFBFQ1RfRVEoNXUsIHNlZW5QSURzLnNpemUoKSk7 CiB9CiAKK1RFU1QoUHJvY2Vzc1N3YXAsIFN1c3BlbmRlZFBhZ2VEaWVzQWZ0ZXJCYWNrRm9yd2Fy ZExpc3RJdGVtSXNHb25lKQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0g YWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAg IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24g PSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFs bG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQo KV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZp ZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9u IHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBh ZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJh dGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiUFNP TiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZp ZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQ U09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2 aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKworICAgIEVYUEVDVF9HVChbcHJvY2Vz c1Bvb2wgX21heGltdW1TdXNwZW5kZWRQYWdlQ291bnRdLCAwVSk7CisKKyAgICBOU1VSTFJlcXVl c3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRo U3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmll dyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm ZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byB3ZWJraXRQSUQgPSBbd2ViVmll dyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNv bS9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKwor ICAgIGF1dG8gYXBwbGVQSUQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAg IEVYUEVDVF9ORSh3ZWJraXRQSUQsIGFwcGxlUElEKTsKKworICAgIC8vIHdlYmtpdC5vcmcgKyBh cHBsZS5jb20gcHJvY2Vzc2VzLgorICAgIEVYUEVDVF9FUSgyVSwgW3Byb2Nlc3NQb29sIF93ZWJQ cm9jZXNzQ291bnRJZ25vcmluZ1ByZXdhcm1lZF0pOworCisgICAgW3dlYlZpZXcgZ29CYWNrXTsg Ly8gQmFjayB0byB3ZWJraXQub3JnLgorICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQRUNUX0VRKHdlYmtpdFBJRCwgW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisKKyAgICAvLyB3ZWJraXQub3JnICsgYXBwbGUu Y29tIHByb2Nlc3Nlcy4KKyAgICBFWFBFQ1RfRVEoMlUsIFtwcm9jZXNzUG9vbCBfd2ViUHJvY2Vz c0NvdW50SWdub3JpbmdQcmV3YXJtZWRdKTsKKworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0 IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQu b3JnL21haW4yLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsK KworICAgIEVYUEVDVF9FUSh3ZWJraXRQSUQsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl0pOworCisgICAgLy8gYXBwbGUuY29tIGlzIG5vdCBsb25nZXIgcHJlc2VudCBpbiB0aGUgYmFj ay9mb3J3YXJkIGxpc3QgYW5kIHRoZXJlIHNob3VsZCB0aGVyZWZvcmUgYmUgbm8tc3VzcGVuZGVk IHBhZ2UgZm9yIGl0LgorICAgIHdoaWxlIChbcHJvY2Vzc1Bvb2wgX3dlYlByb2Nlc3NDb3VudEln bm9yaW5nUHJld2FybWVkXSA+IDF1KQorICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGlu UnVuTG9vcCgpOworfQorCiAjaWYgUExBVEZPUk0oTUFDKQogVEVTVChQcm9jZXNzU3dhcCwgU3Vz cGVuZGVkUGFnZXNJbkFjdGl2aXR5TW9uaXRvcikKIHsK 354399 2018-11-09 15:47:35 -0800 2018-11-09 16:24:16 -0800 Patch bug-191488-20181109154735.patch text/plain 15586 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhY2ZmMzQ4ZGVjMGUwZmMz NWMwNTU2N2E1ZWMxMWIxZWFlNTc2NmEuLmZjYTVhZGU1M2JkY2EzZjg2YTM2NWNhODg0ODQ1NDBj ODE0MTUxYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTEtMDkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTdXNwZW5kZWQgcGFnZSBwZXJzaXN0 cyBldmVuIGFmdGVyIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gaXMgZ29uZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDg4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80NTk1MzAwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJl bi4KKworICAgICAgICBDdXJyZW50bHksIHRoZSBXZWJQcm9jZXNzUG9vbCBvd25zIHRoZSBTdXNw ZW5kZWRQYWdlUHJveHkgb2JqZWN0cyBhbmQgbWFrZXMgc3VyZSB3ZSBjYXAgaG93CisgICAgICAg IG1hbnkgd2UgY2FuIGhhdmUuIFRoZSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtIG1lcmVseSBoYXMg YSBXZWFrUHRyIHRvIGl0cyBhc3NvY2lhdGVkCisgICAgICAgIFN1c3BlbmRlZFBhZ2VQcm94eS4g SG93ZXZlciwgdGhlcmUgaXMgbm8gcG9pbnQgaW4gaGF2aW5nIHRoZSBXZWJQcm9jZXNzUG9vbCBr ZWVwaW5nIGEKKyAgICAgICAgU3VzcGVuZGVkUGFnZVByb3h5IG9iamVjdCBhbGl2ZSBpZiB0aGVy ZSBpcyBubyBsb25nZXIgYW55IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0gcG9pbnRpbmcKKyAgICAg ICAgdG8gaXQuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUsIFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0gbm93cyB0ZWxscyB0aGUgV2ViUHJvY2Vzc1Bvb2wgdG8gZGVzdHJveQorICAgICAg ICBpdHMgU3VzcGVuZGVkUGFnZVByb3h5IHdoZW4gbmVjZXNzYXJ5LiBXZWJCYWNrRm9yd2FyZExp c3QgYWxzbyB0YWtlcyBjYXJlIG9mIG51bGxpbmcKKyAgICAgICAgb3V0IHRoZSBXZWJCYWNrRm9y d2FyZExpc3RJdGVtJ3MgU3VzcGVuZGVkUGFnZVByb3h5IGFmdGVyIHRoZSBpdGVtIGhhcyBiZWVu IHJlbW92ZWQKKyAgICAgICAgZnJvbSB0aGUgbGlzdCAoaW4gY2FzZSBzb21lYm9keSBrZWVwcyB0 aGUgaXRlbSBhbGl2ZSkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRl bS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06On5XZWJCYWNr Rm9yd2FyZExpc3RJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bTo6c2V0U3VzcGVuZGVkUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlz dEl0ZW06OnN1c3BlbmRlZFBhZ2VJc05vTG9uZ2VyTmVlZGVkKToKKyAgICAgICAgKiBTaGFyZWQv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdXNwZW5kZWRQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3Bl bmRlZFBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdDo6ZGlkUmVtb3ZlSXRlbSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Bvb2w6OnJlbW92ZVN1c3BlbmRlZFBhZ2VQcm94eSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisKIDIwMTgtMTEtMDkgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBJbXBsZW1lbnQgU1BJ IG9uIFdLV2ViVmlldyB0byBpbmNyZWFzZSBhbmQgZGVjcmVhc2UgbGlzdCBsZXZlbHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKaW5kZXggNjEy ZGIyMzI2OTcyOTNiYzBhZWE1NGY2MDBkZDcxNzY2NzIwMjcxYi4uYTY2NjIzNjllNzlmZjY0MTlh YTg0ZmEzMzk2MjI3MmQwNTQ5NDkwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi QmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJXZWJC YWNrRm9yd2FyZExpc3RJdGVtLmgiCiAKICNpbmNsdWRlICJTdXNwZW5kZWRQYWdlUHJveHkuaCIK KyNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5o IgogI2luY2x1ZGUgPFdlYkNvcmUvVVJMLmg+CiAjaW5jbHVkZSA8d3RmL0RlYnVnVXRpbGl0aWVz Lmg+CiAKQEAgLTUxLDYgKzUzLDggQEAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6fldlYkJhY2tG b3J3YXJkTGlzdEl0ZW0oKQogewogICAgIEFTU0VSVChhbGxJdGVtcygpLmdldChtX2l0ZW1TdGF0 ZS5pZGVudGlmaWVyKSA9PSB0aGlzKTsKICAgICBhbGxJdGVtcygpLnJlbW92ZShtX2l0ZW1TdGF0 ZS5pZGVudGlmaWVyKTsKKworICAgIHJlbW92ZVN1c3BlbmRlZFBhZ2VGcm9tUHJvY2Vzc1Bvb2wo KTsKIH0KIAogSGFzaE1hcDxCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyLCBXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtKj4mIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OmFsbEl0ZW1zKCkKQEAgLTExMywx MSArMTE3LDI0IEBAIGJvb2wgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6aXRlbUlzSW5TYW1lRG9j dW1lbnQoY29uc3QgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYKICAgICByZXR1cm4gZG9jdW1lbnRU cmVlc0FyZUVxdWFsKG1haW5GcmFtZVN0YXRlLCBvdGhlck1haW5GcmFtZVN0YXRlKTsKIH0KIAot dm9pZCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpzZXRTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBh Z2VQcm94eSYgcGFnZSkKK3ZvaWQgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6c2V0U3VzcGVuZGVk UGFnZShTdXNwZW5kZWRQYWdlUHJveHkqIHBhZ2UpCiB7CisgICAgaWYgKG1fc3VzcGVuZGVkUGFn ZSA9PSBwYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICByZW1vdmVTdXNwZW5kZWRQYWdlRnJv bVByb2Nlc3NQb29sKCk7CiAgICAgbV9zdXNwZW5kZWRQYWdlID0gbWFrZVdlYWtQdHIocGFnZSk7 CiB9CiAKK3ZvaWQgV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6cmVtb3ZlU3VzcGVuZGVkUGFnZUZy b21Qcm9jZXNzUG9vbCgpCit7CisgICAgaWYgKCFtX3N1c3BlbmRlZFBhZ2UpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fc3VzcGVuZGVkUGFnZS0+cHJvY2VzcygpLnByb2Nlc3NQb29sKCkucmVt b3ZlU3VzcGVuZGVkUGFnZSgqbV9zdXNwZW5kZWRQYWdlKTsKKyAgICBBU1NFUlQoIW1fc3VzcGVu ZGVkUGFnZSk7Cit9CisKICNpZiAhTE9HX0RJU0FCTEVECiBjb25zdCBjaGFyKiBXZWJCYWNrRm9y d2FyZExpc3RJdGVtOjpsb2dnaW5nU3RyaW5nKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAppbmRleCA0Mzc2NjQ4Mzk2YzRlZmViOGI2NDIzODBi ZDQwMzMxMjg5MWYzODQ0Li4zZGFkOWI3OGQ4MjE0MzI4ZmM3YWQ2ZGU5Yzg4YWI2MDFiMzMxZTJm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJCYWNrRm9yd2FyZExpc3RJdGVt LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCkBA IC02OSw3ICs2OSw3IEBAIHB1YmxpYzoKICAgICBWaWV3U25hcHNob3QqIHNuYXBzaG90KCkgY29u c3QgeyByZXR1cm4gbV9pdGVtU3RhdGUuc25hcHNob3QuZ2V0KCk7IH0KICAgICB2b2lkIHNldFNu YXBzaG90KFJlZlB0cjxWaWV3U25hcHNob3Q+JiYgc25hcHNob3QpIHsgbV9pdGVtU3RhdGUuc25h cHNob3QgPSBXVEZNb3ZlKHNuYXBzaG90KTsgfQogI2VuZGlmCi0gICAgdm9pZCBzZXRTdXNwZW5k ZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSYpOworICAgIHZvaWQgc2V0U3VzcGVuZGVkUGFnZShT dXNwZW5kZWRQYWdlUHJveHkqKTsKICAgICBTdXNwZW5kZWRQYWdlUHJveHkqIHN1c3BlbmRlZFBh Z2UoKSBjb25zdCB7IHJldHVybiBtX3N1c3BlbmRlZFBhZ2UuZ2V0KCk7IH0KIAogI2lmICFMT0df RElTQUJMRUQKQEAgLTc5LDYgKzc5LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNp dCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKEJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYmLCB1aW50 NjRfdCBwYWdlSUQpOwogCisgICAgdm9pZCByZW1vdmVTdXNwZW5kZWRQYWdlRnJvbVByb2Nlc3NQ b29sKCk7CisKICAgICBCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUgbV9pdGVtU3RhdGU7CiAgICAg dWludDY0X3QgbV9wYWdlSUQ7CiAgICAgV2Vha1B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IG1fc3Vz cGVuZGVkUGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRl ZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9TdXNwZW5kZWRQYWdlUHJv eHkuY3BwCmluZGV4IDk0OTU4MjZiMWY4NmM4YmI2MzgzYWZiYjFhMDczMDE1NzVlYzllM2QuLmRk ZjBlMTUyOTRhYTc2MWZjNGExZGE3YzA2ZmVmNGFjNGZhODliMzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApAQCAtODAsNyArODAsNyBAQCBT dXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2Us IFJlZjxXZWJQcm9jZXNzUHJveHk+JgogICAgICwgbV9tYWluRnJhbWVJRChtYWluRnJhbWVJRCkK ICAgICAsIG1fcmVnaXN0cmFibGVEb21haW4odG9SZWdpc3RyYWJsZURvbWFpbihVUkwoVVJMKCks IGl0ZW0udXJsKCkpKSkKIHsKLSAgICBpdGVtLnNldFN1c3BlbmRlZFBhZ2UoKnRoaXMpOworICAg IGl0ZW0uc2V0U3VzcGVuZGVkUGFnZSh0aGlzKTsKICAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VS ZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1f cGFnZS5wYWdlSUQoKSwgKnRoaXMpOwogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpTZXRJc1N1c3BlbmRlZCh0cnVlKSwgbV9wYWdlLnBhZ2VJRCgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuY3BwCmluZGV4IGJjM2I0YWMy ZTE1NzAxOTg1OTgxMmRjMjkxOGQxZDFkN2M4ZDk3ZDAuLjIyY2E0YzNkYjRmNmQwMzFlNjA2OTc4 M2MxZDc4YmNmZjZmZTE5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkJhY2tGb3J3YXJkTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQmFj a0ZvcndhcmRMaXN0LmNwcApAQCAtNDY3LDYgKzQ2Nyw3IEBAIHZvaWQgV2ViQmFja0ZvcndhcmRM aXN0OjpkaWRSZW1vdmVJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGJhY2tGb3J3YXJkTGlz dEl0CiB7CiAgICAgbV9wYWdlLT5iYWNrRm9yd2FyZFJlbW92ZWRJdGVtKGJhY2tGb3J3YXJkTGlz dEl0ZW0uaXRlbUlEKCkpOwogCisgICAgYmFja0ZvcndhcmRMaXN0SXRlbS5zZXRTdXNwZW5kZWRQ YWdlKG51bGxwdHIpOwogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGJhY2tGb3J3YXJkTGlzdEl0 ZW0uc2V0U25hcHNob3QobnVsbHB0cik7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IDgzNzVjYTM4NjVjNzc4NDZkNDhkYjI2NDc4OTY0OWMzNzdl YzVhMDguLmY2ZmRhNzUzZjljMzY0ZjBjMzUyMThhNjJlOTE0ZGQ3MGM2MzgyNTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzI5LDcgKzcyOSw3IEBAIGJv b2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2aWdh dGlvbiYgbmF2aWdhdGlvbiwgc3RkCiAKICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiV2ViUGFn ZVByb3h5ICUiIFBSSXU2NCAiIGNyZWF0ZWQgc3VzcGVuZGVkIHBhZ2UgJXMgZm9yIHByb2Nlc3Mg cGlkICVpLCBiYWNrL2ZvcndhcmQgaXRlbSAlcyIgUFJJdTY0LCBwYWdlSUQoKSwgc3VzcGVuZGVk UGFnZS0+bG9nZ2luZ1N0cmluZygpLCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCksIGN1 cnJlbnRJdGVtLT5pdGVtSUQoKS5sb2dTdHJpbmcoKSk7CiAKLSAgICBtX3Byb2Nlc3MtPnByb2Nl c3NQb29sKCkuYWRkU3VzcGVuZGVkUGFnZVByb3h5KFdURk1vdmUoc3VzcGVuZGVkUGFnZSkpOwor ICAgIG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5hZGRTdXNwZW5kZWRQYWdlKFdURk1vdmUoc3Vz cGVuZGVkUGFnZSkpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC03NDEsNyArNzQxLDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OnN3YXBUb1dlYlByb2Nlc3MoUmVmPFdlYlByb2Nlc3NQcm94eT4m JiBwcm9jZXNzLCBBUEk6Ok5hdmlnYXQKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2U7CiAgICAgaWYgKGF1dG8qIGJhY2tGb3J3 YXJkTGlzdEl0ZW0gPSBuYXZpZ2F0aW9uLnRhcmdldEl0ZW0oKSkgewogICAgICAgICBpZiAoYmFj a0ZvcndhcmRMaXN0SXRlbS0+c3VzcGVuZGVkUGFnZSgpICYmICZiYWNrRm9yd2FyZExpc3RJdGVt LT5zdXNwZW5kZWRQYWdlKCktPnByb2Nlc3MoKSA9PSBwcm9jZXNzLnB0cigpKSB7Ci0gICAgICAg ICAgICBkZXN0aW5hdGlvblN1c3BlbmRlZFBhZ2UgPSB0aGlzLT5wcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS50YWtlU3VzcGVuZGVkUGFnZVByb3h5KCpiYWNrRm9yd2FyZExpc3RJdGVtLT5zdXNwZW5k ZWRQYWdlKCkpOworICAgICAgICAgICAgZGVzdGluYXRpb25TdXNwZW5kZWRQYWdlID0gdGhpcy0+ cHJvY2VzcygpLnByb2Nlc3NQb29sKCkudGFrZVN1c3BlbmRlZFBhZ2UoKmJhY2tGb3J3YXJkTGlz dEl0ZW0tPnN1c3BlbmRlZFBhZ2UoKSk7CiAgICAgICAgICAgICBBU1NFUlQoZGVzdGluYXRpb25T dXNwZW5kZWRQYWdlKTsKICAgICAgICAgICAgIGRlc3RpbmF0aW9uU3VzcGVuZGVkUGFnZS0+dW5z dXNwZW5kKCk7CiAgICAgICAgIH0KQEAgLTk0MCw3ICs5NDAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6Y2xvc2UoKQogCiAgICAgbV93ZWJQcm9jZXNzTGlmZXRpbWVUcmFja2VyLnBhZ2VXYXNJbnZh bGlkYXRlZCgpOwogCi0gICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnJlbW92ZUFsbFN1c3Bl bmRlZFBhZ2VQcm94aWVzRm9yUGFnZSgqdGhpcyk7CisgICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9v bCgpLnJlbW92ZUFsbFN1c3BlbmRlZFBhZ2VzRm9yUGFnZSgqdGhpcyk7CiAKICAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNsb3NlKCksIG1fcGFnZUlEKTsKICAgICBtX3By b2Nlc3MtPnJlbW92ZVdlYlBhZ2UoKnRoaXMsIG1fcGFnZUlEKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCBlNGE4NzcwNDc1NzhjNDhmNDBkNzFjNjky N2M5NjVkYjk2MmI3OTQwLi5hNDJiMDEzMWM0NmEyN2JmYjk5ZDZhNDI0ZDAyYWEyMmQzNzFkOWVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0yMjQ4 LDcgKzIyNDgsNyBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vz c0Zvck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmCiAgICAgcmV0dXJuIGNyZWF0ZU5l d1dlYlByb2Nlc3MocGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkpOwogfQogCi12b2lkIFdlYlByb2Nl c3NQb29sOjphZGRTdXNwZW5kZWRQYWdlUHJveHkoc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBh Z2VQcm94eT4mJiBzdXNwZW5kZWRQYWdlKQordm9pZCBXZWJQcm9jZXNzUG9vbDo6YWRkU3VzcGVu ZGVkUGFnZShzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1c3BlbmRlZFBh Z2UpCiB7CiAgICAgaWYgKG1fc3VzcGVuZGVkUGFnZXMuc2l6ZSgpID49IG1fbWF4U3VzcGVuZGVk UGFnZUNvdW50KQogICAgICAgICBtX3N1c3BlbmRlZFBhZ2VzLnJlbW92ZUZpcnN0KCk7CkBAIC0y MjU2LDIxICsyMjU2LDMwIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmFkZFN1c3BlbmRlZFBhZ2VQ cm94eShzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmCiAgICAgbV9zdXNwZW5k ZWRQYWdlcy5hcHBlbmQoV1RGTW92ZShzdXNwZW5kZWRQYWdlKSk7CiB9CiAKLXZvaWQgV2ViUHJv Y2Vzc1Bvb2w6OnJlbW92ZUFsbFN1c3BlbmRlZFBhZ2VQcm94aWVzRm9yUGFnZShXZWJQYWdlUHJv eHkmIHBhZ2UpCit2b2lkIFdlYlByb2Nlc3NQb29sOjpyZW1vdmVBbGxTdXNwZW5kZWRQYWdlc0Zv clBhZ2UoV2ViUGFnZVByb3h5JiBwYWdlKQogewogICAgIG1fc3VzcGVuZGVkUGFnZXMucmVtb3Zl QWxsTWF0Y2hpbmcoWyZwYWdlXShhdXRvJiBzdXNwZW5kZWRQYWdlKSB7CiAgICAgICAgIHJldHVy biAmc3VzcGVuZGVkUGFnZS0+cGFnZSgpID09ICZwYWdlOwogICAgIH0pOwogfQogCi1zdGQ6OnVu aXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6dGFrZVN1c3BlbmRl ZFBhZ2VQcm94eShTdXNwZW5kZWRQYWdlUHJveHkmIHN1c3BlbmRlZFBhZ2UpCitzdGQ6OnVuaXF1 ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6dGFrZVN1c3BlbmRlZFBh Z2UoU3VzcGVuZGVkUGFnZVByb3h5JiBzdXNwZW5kZWRQYWdlKQogewogICAgIHJldHVybiBtX3N1 c3BlbmRlZFBhZ2VzLnRha2VGaXJzdChbJnN1c3BlbmRlZFBhZ2VdKGF1dG8mIGl0ZW0pIHsKICAg ICAgICAgcmV0dXJuIGl0ZW0uZ2V0KCkgPT0gJnN1c3BlbmRlZFBhZ2U7CiAgICAgfSk7CiB9CiAK LWJvb2wgV2ViUHJvY2Vzc1Bvb2w6Omhhc1N1c3BlbmRlZFBhZ2VQcm94eUZvcihXZWJQcm9jZXNz UHJveHkmIHByb2Nlc3MpIGNvbnN0Cit2b2lkIFdlYlByb2Nlc3NQb29sOjpyZW1vdmVTdXNwZW5k ZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSYgc3VzcGVuZGVkUGFnZSkKK3sKKyAgICBhdXRvIGl0 ID0gbV9zdXNwZW5kZWRQYWdlcy5maW5kSWYoWyZzdXNwZW5kZWRQYWdlXShhdXRvJiBpdGVtKSB7 CisgICAgICAgIHJldHVybiBpdGVtLmdldCgpID09ICZzdXNwZW5kZWRQYWdlOworICAgIH0pOwor ICAgIGlmIChpdCAhPSBtX3N1c3BlbmRlZFBhZ2VzLmVuZCgpKQorICAgICAgICBtX3N1c3BlbmRl ZFBhZ2VzLnJlbW92ZShpdCk7Cit9CisKK2Jvb2wgV2ViUHJvY2Vzc1Bvb2w6Omhhc1N1c3BlbmRl ZFBhZ2VGb3IoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKSBjb25zdAogewogICAgIHJldHVybiBt X3N1c3BlbmRlZFBhZ2VzLmZpbmRJZihbJnByb2Nlc3NdKGF1dG8mIHN1c3BlbmRlZFBhZ2UpIHsK ICAgICAgICAgcmV0dXJuICZzdXNwZW5kZWRQYWdlLT5wcm9jZXNzKCkgPT0gJnByb2Nlc3M7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCBkM2E4ZDhlNWIwYWZk ZjZhZTRlNTMwNmY0OTNhOGI5Y2I1MGMyNWVkLi41NTNkYWM1ZTQxZjg2ZTBjN2M2YmU3YWYxNzll NDdiMWMwZTdlNzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgK QEAgLTQ0NiwxMCArNDQ2LDExIEBAIHB1YmxpYzoKICAgICBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBw cm9jZXNzRm9yTmF2aWdhdGlvbihXZWJQYWdlUHJveHkmLCBjb25zdCBBUEk6Ok5hdmlnYXRpb24m LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBTdHJpbmcmIHJlYXNvbik7CiAKICAgICAv LyBTdXNwZW5kZWRQYWdlUHJveHkgbWFuYWdlbWVudC4KLSAgICB2b2lkIGFkZFN1c3BlbmRlZFBh Z2VQcm94eShzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmKTsKLSAgICB2b2lk IHJlbW92ZUFsbFN1c3BlbmRlZFBhZ2VQcm94aWVzRm9yUGFnZShXZWJQYWdlUHJveHkmKTsKLSAg ICBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiB0YWtlU3VzcGVuZGVkUGFnZVBy b3h5KFN1c3BlbmRlZFBhZ2VQcm94eSYpOwotICAgIGJvb2wgaGFzU3VzcGVuZGVkUGFnZVByb3h5 Rm9yKFdlYlByb2Nlc3NQcm94eSYpIGNvbnN0OworICAgIHZvaWQgYWRkU3VzcGVuZGVkUGFnZShz dGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmKTsKKyAgICB2b2lkIHJlbW92ZUFs bFN1c3BlbmRlZFBhZ2VzRm9yUGFnZShXZWJQYWdlUHJveHkmKTsKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8U3VzcGVuZGVkUGFnZVByb3h5PiB0YWtlU3VzcGVuZGVkUGFnZShTdXNwZW5kZWRQYWdlUHJv eHkmKTsKKyAgICB2b2lkIHJlbW92ZVN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5Jik7 CisgICAgYm9vbCBoYXNTdXNwZW5kZWRQYWdlRm9yKFdlYlByb2Nlc3NQcm94eSYpIGNvbnN0Owog ICAgIHVuc2lnbmVkIG1heFN1c3BlbmRlZFBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fbWF4 U3VzcGVuZGVkUGFnZUNvdW50OyB9CiAKICAgICB2b2lkIGRpZFJlYWNoR29vZFRpbWVUb1ByZXdh cm0oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4 IDE5OWM1YTAxNmRiNWYzYmYxZWY3ZDQ1ZjUyMWJjZTdjZTQ2YTRhNTQuLjFjMDVmMzQ5ZTY2NjY1 Njc4ZjgzZDIxMjc4NGJmOGZmYTZlODhhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtODY1LDcgKzg2NSw3IEBAIHZvaWQgV2ViUHJvY2Vzc1By b3h5OjptYXliZVNodXREb3duKCkKIAogYm9vbCBXZWJQcm9jZXNzUHJveHk6OmNhblRlcm1pbmF0 ZUNoaWxkUHJvY2VzcygpCiB7Ci0gICAgaWYgKCFtX3BhZ2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJv Y2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VQcm94eUZvcigqdGhpcykpCisgICAgaWYgKCFtX3Bh Z2VNYXAuaXNFbXB0eSgpIHx8IG1fcHJvY2Vzc1Bvb2wtPmhhc1N1c3BlbmRlZFBhZ2VGb3IoKnRo aXMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIW1fcHJvY2Vzc1Bvb2wtPnNo b3VsZFRlcm1pbmF0ZSh0aGlzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBkM2VlNTMyMjE4M2RkZjQzZjhkODFmNWVkNGIwZDc1MDRmOGUzNTUw Li5jMDU4YTJhMTBlNjg1YjY3ZWUxYmU5MTFmZTc2NTdhNmQ5OTQ0YzBmIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTgtMTEtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTdXNw ZW5kZWQgcGFnZSBwZXJzaXN0cyBldmVuIGFmdGVyIGJhY2svZm9yd2FyZCBsaXN0IGl0ZW0gaXMg Z29uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkx NDg4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTk1MzAwNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBHZW9mZnJleSBHYXJlbi4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25O YXZpZ2F0aW9uLm1tOgorCiAyMDE4LTExLTA5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA YXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gSW1wbGVtZW50IFNQSSBvbiBXS1dlYlZpZXcg dG8gaW5jcmVhc2UgYW5kIGRlY3JlYXNlIGxpc3QgbGV2ZWxzCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2 aWdhdGlvbi5tbQppbmRleCBiMmVjOTI1MTVjNDY5ZGMzNGQ5ODFiZTYwNTYwOTViYWM3NWFmMjE3 Li5mYmU4YWNjNTQ2ZmMwZmE2OTc5NWVjM2FjZjcwOTUzNGM3MjMxN2UyIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0 aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTYyMyw2ICs2MjMsNjUgQEAgVEVTVChQcm9jZXNzU3dh cCwgQmFjaykKICAgICAgICAgRVhQRUNUX0VRKDV1LCBzZWVuUElEcy5zaXplKCkpOwogfQogCitU RVNUKFByb2Nlc3NTd2FwLCBTdXNwZW5kZWRQYWdlRGllc0FmdGVyQmFja0ZvcndhcmRMaXN0SXRl bUlzR29uZSkKK3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMo W1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNz UG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOwor ICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2lu aXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKwor ICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9j ZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhb W1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0 VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIlBTT04iXTsKKwor ICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmln dXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmln YXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25E ZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBFWFBFQ1RfR1QoW3Byb2Nlc3NQb29sIF9t YXhpbXVtU3VzcGVuZGVkUGFnZUNvdW50XSwgMFUpOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1 ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor ICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gd2Via2l0UElEID0gW3dlYlZpZXcgX3dlYlBy b2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RX aXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vbWFpbi5o dG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBhdXRv IGFwcGxlUElEID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBFWFBFQ1Rf TkUod2Via2l0UElELCBhcHBsZVBJRCk7CisKKyAgICAvLyB3ZWJraXQub3JnICsgYXBwbGUuY29t IHByb2Nlc3Nlcy4KKyAgICBFWFBFQ1RfRVEoMlUsIFtwcm9jZXNzUG9vbCBfd2ViUHJvY2Vzc0Nv dW50SWdub3JpbmdQcmV3YXJtZWRdKTsKKworICAgIFt3ZWJWaWV3IGdvQmFja107IC8vIEJhY2sg dG8gd2Via2l0Lm9yZy4KKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAg IGRvbmUgPSBmYWxzZTsKKworICAgIEVYUEVDVF9FUSh3ZWJraXRQSUQsIFt3ZWJWaWV3IF93ZWJQ cm9jZXNzSWRlbnRpZmllcl0pOworCisgICAgLy8gd2Via2l0Lm9yZyArIGFwcGxlLmNvbSBwcm9j ZXNzZXMuCisgICAgRVhQRUNUX0VRKDJVLCBbcHJvY2Vzc1Bvb2wgX3dlYlByb2Nlc3NDb3VudEln bm9yaW5nUHJld2FybWVkXSk7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0 V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWlu Mi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBF WFBFQ1RfRVEod2Via2l0UElELCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKwor ICAgIC8vIGFwcGxlLmNvbSBpcyBub3QgbG9uZ2VyIHByZXNlbnQgaW4gdGhlIGJhY2svZm9yd2Fy ZCBsaXN0IGFuZCB0aGVyZSBzaG91bGQgdGhlcmVmb3JlIGJlIG5vLXN1c3BlbmRlZCBwYWdlIGZv ciBpdC4KKyAgICB3aGlsZSAoW3Byb2Nlc3NQb29sIF93ZWJQcm9jZXNzQ291bnRJZ25vcmluZ1By ZXdhcm1lZF0gPiAxdSkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3Ao KTsKK30KKwogI2lmIFBMQVRGT1JNKE1BQykKIFRFU1QoUHJvY2Vzc1N3YXAsIFN1c3BlbmRlZFBh Z2VzSW5BY3Rpdml0eU1vbml0b3IpCiB7Cg==