200505 2019-08-07 08:51:43 -0700 Add more threading assertions to ITP code 2019-08-07 10:23:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen bfulgham commit-queue ggaren webkit-bug-importer wilander oldest_to_newest 1559129 0 cdumez 2019-08-07 08:51:43 -0700 Add more threading assertions to ITP code to help cache bugs and protect against future bad usage. 1559130 1 375700 cdumez 2019-08-07 08:52:28 -0700 Created attachment 375700 Patch 1559137 2 375700 bfulgham 2019-08-07 09:23:25 -0700 Comment on attachment 375700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375700&action=review r=mews. > Source/WebKit/ChangeLog:8 > + Add more threading assertions to ITP code to help cache bugs and protect against future bad usage. cache bugs? or catch bugs? 1559140 3 375703 cdumez 2019-08-07 09:27:43 -0700 Created attachment 375703 Patch 1559162 4 commit-queue 2019-08-07 10:21:59 -0700 The commit-queue encountered the following flaky tests while processing attachment 375703: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1559165 5 375703 commit-queue 2019-08-07 10:22:45 -0700 Comment on attachment 375703 Patch Clearing flags on attachment: 375703 Committed r248372: <https://trac.webkit.org/changeset/248372> 1559166 6 commit-queue 2019-08-07 10:22:46 -0700 All reviewed patches have been landed. Closing bug. 1559167 7 webkit-bug-importer 2019-08-07 10:23:26 -0700 <rdar://problem/54039018> 375700 2019-08-07 08:52:28 -0700 2019-08-07 09:27:42 -0700 Patch bug-200505-20190807085227.patch text/plain 14764 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE3NzMwOTBlNGEyOGE5NDlm YjRjN2RjYzA4NTkxMDJjZmY3MDNiYTUuLjE5ODFiNWNhZjA1N2MwNDNkZGQ5MmJlOWM3NWQwNzJk NTkzYWRhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTktMDgtMDcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbW9yZSB0aHJlYWRpbmcgYXNz ZXJ0aW9ucyB0byBJVFAgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjAwNTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIG1vcmUgdGhyZWFkaW5nIGFzc2VydGlvbnMgdG8gSVRQIGNvZGUgdG8g aGVscCBjYWNoZSBidWdzIGFuZCBwcm90ZWN0IGFnYWluc3QgZnV0dXJlIGJhZCB1c2FnZS4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlOjppc0VtcHR5IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VM b2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpzZXRQZXJzaXN0ZW50U3RvcmFnZSk6CisgICAgICAg IChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6aW5jcmVtZW50UmVj b3Jkc0RlbGV0ZWRDb3VudEZvckRvbWFpbnMpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmNsYXNzaWZ5UHJldmFsZW50UmVzb3VyY2VzKToKKyAg ICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpzeW5jU3Rv cmFnZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01l bW9yeVN0b3JlOjpzeW5jU3RvcmFnZUltbWVkaWF0ZWx5KToKKyAgICAgICAgKFdlYktpdDo6UmVz b3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpncmFuZGZhdGhlckRhdGFGb3JEb21haW5z KToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpl bnN1cmVQcmV2YWxlbnRSZXNvdXJjZXNGb3JEZWJ1Z01vZGUpOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGF0aXN0aWNzRXBpcmF0 aW9uVGltZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6bWVyZ2VPcGVyYXRpbmdEYXRlcyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3NGb3JG cmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 cmVxdWVzdFN0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6YXBwbGljYXRpb25XaWxsVGVybWluYXRlKToK KyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dGcmFt ZU5hdmlnYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OmxvZ1dlYlNvY2tldExvYWRpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1N1YnJlc291cmNlTG9hZGluZyk6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nU3VicmVzb3VyY2VSZWRp cmVjdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 aGFzSGFkVXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpyZW1vdmVQcmV2YWxlbnREb21haW5zKToKKyAgICAgICAgKFdlYktp dDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpuZXR3b3JrU2Vzc2lvbik6CisgICAg ICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aW52YWxpZGF0ZUFu ZENhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6c2VuZERpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpub3RpZnlQYWdlU3RhdGlzdGljc1Rl bGVtZXRyeUZpbmlzaGVkIGNvbnN0KToKKwogMjAxOS0wOC0wNiAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbaVBhZE9TXSBzbGlkZXMuZ29vZ2xlLmNvbTogdGFw cGluZyBuZWFyIGN1cnNvciBpbiBhIHNsaWRlIHRpdGxlIGZvY3VzZXMgdGhlIHNwZWFrZXIgbm90 ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9S ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5j cHAKaW5kZXggNzMwNWM1MTAyMzZhNGM4YTNhMzZmNjA1MDVmOTYxMTgyZTRlZTczNi4uOTAzZDc1 ODAwMGEyMGJmYTY5YWNjNzg3MTkzNTc4OWM4Nzc2OWJkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1v cnlTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKQEAgLTgyLDExICs4MiwxNSBA QCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NNZW1vcnlTdG9yZShXZWJSZXNvdXJjZQogCiBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NN ZW1vcnlTdG9yZTo6aXNFbXB0eSgpIGNvbnN0CiB7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01h aW4oKSk7CisKICAgICByZXR1cm4gbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuaXNFbXB0eSgpOwog fQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6c2V0UGVyc2lzdGVu dFN0b3JhZ2UoUmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlJiBwZXJzaXN0 ZW50U3RvcmFnZSkKIHsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIG1f cGVyc2lzdGVudFN0b3JhZ2UgPSBtYWtlV2Vha1B0cihwZXJzaXN0ZW50U3RvcmFnZSk7CiB9CiAK QEAgLTEwMCw2ICsxMDQsOCBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZTo6Y2FsY3VsYXRlQW5kU3VibWl0VGVsZW1ldHJ5KCkgY29uc3QKIAogdm9pZCBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmluY3JlbWVudFJlY29yZHNEZWxldGVkQ291bnRGb3JE b21haW5zKEhhc2hTZXQ8UmVnaXN0cmFibGVEb21haW4+JiYgZG9tYWluc1dpdGhEZWxldGVkV2Vi c2l0ZURhdGEpCiB7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBmb3Ig KGF1dG8mIGRvbWFpbiA6IGRvbWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRhKSB7CiAgICAgICAg IGF1dG8mIHN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclJlZ2lzdHJhYmxl RG9tYWluKGRvbWFpbik7CiAgICAgICAgICsrc3RhdGlzdGljLmRhdGFSZWNvcmRzUmVtb3ZlZDsK QEAgLTE3Miw2ICsxNzgsOCBAQCBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZTo6aXNQcmV2YWxlbnREdWVUb0RlYnVnTW9kZShSZXNvdXJjZUxvYWRTdAogCiB2b2lkIFJlc291 cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6Y2xhc3NpZnlQcmV2YWxlbnRSZXNvdXJjZXMo KQogeworICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgZm9yIChhdXRvJiBy ZXNvdXJjZVN0YXRpc3RpYyA6IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwLnZhbHVlcygpKSB7CiAg ICAgICAgIGlmIChzaG91bGRTa2lwKHJlc291cmNlU3RhdGlzdGljLnJlZ2lzdHJhYmxlRG9tYWlu KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMTg5LDEyICsxOTcsMTYgQEAgdm9pZCBSZXNv dXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmNsYXNzaWZ5UHJldmFsZW50UmVzb3VyY2Vz KCkKIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OnN5bmNTdG9yYWdl SWZOZWVkZWQoKQogeworICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgaWYg KG1fcGVyc2lzdGVudFN0b3JhZ2UpCiAgICAgICAgIG1fcGVyc2lzdGVudFN0b3JhZ2UtPnNjaGVk dWxlT3JXcml0ZU1lbW9yeVN0b3JlKFJlc291cmNlTG9hZFN0YXRpc3RpY3NQZXJzaXN0ZW50U3Rv cmFnZTo6Rm9yY2VJbW1lZGlhdGVXcml0ZTo6Tm8pOwogfQogCiB2b2lkIFJlc291cmNlTG9hZFN0 YXRpc3RpY3NNZW1vcnlTdG9yZTo6c3luY1N0b3JhZ2VJbW1lZGlhdGVseSgpCiB7CisgICAgQVNT RVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBpZiAobV9wZXJzaXN0ZW50U3RvcmFnZSkK ICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFnZS0+c2NoZWR1bGVPcldyaXRlTWVtb3J5U3RvcmUo UmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9yYWdlOjpGb3JjZUltbWVkaWF0ZVdy aXRlOjpZZXMpOwogfQpAQCAtMzE1LDYgKzMyNyw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3NJbnRlcm5hbChTdWJGcmFtZURvbWFp CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpncmFuZGZhdGhlckRh dGFGb3JEb21haW5zKGNvbnN0IEhhc2hTZXQ8UmVnaXN0cmFibGVEb21haW4+JiBkb21haW5zKQog eworICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgZm9yIChhdXRvJiBkb21h aW4gOiBkb21haW5zKSB7CiAgICAgICAgIGF1dG8mIHN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNl U3RhdGlzdGljc0ZvclJlZ2lzdHJhYmxlRG9tYWluKGRvbWFpbik7CiAgICAgICAgIHN0YXRpc3Rp Yy5ncmFuZGZhdGhlcmVkID0gdHJ1ZTsKQEAgLTMyMyw2ICszMzcsOCBAQCB2b2lkIFJlc291cmNl TG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6Z3JhbmRmYXRoZXJEYXRhRm9yRG9tYWlucyhjb25z dCBIYXNoU2V0PAogCiBWZWN0b3I8UmVnaXN0cmFibGVEb21haW4+IFJlc291cmNlTG9hZFN0YXRp c3RpY3NNZW1vcnlTdG9yZTo6ZW5zdXJlUHJldmFsZW50UmVzb3VyY2VzRm9yRGVidWdNb2RlKCkK IHsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGlmICghZGVidWdNb2Rl RW5hYmxlZCgpKQogICAgICAgICByZXR1cm4geyB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUuY3BwCmluZGV4IDAwYjRmYTRkZmQ4YzdiYzhhMGM0MWU2ZGM4Y2E3 ZTM5NzNjZmMwZmQuLmI5M2YwN2RhNDFkNTVjMjNhMDc2ZDBiNWZkOGY0M2U0ZDM5NTQ5MDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC00NDUsNiAr NDQ1LDggQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNsZWFyQmxvY2tpbmdT dGF0ZUZvckRvbWFpbnMoY29uc3QgVmVjdG9yPFJlZ2kKIAogT3B0aW9uYWw8U2Vjb25kcz4gUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzdGF0aXN0aWNzRXBpcmF0aW9uVGltZSgpIGNvbnN0 CiB7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBpZiAobV9wYXJhbWV0 ZXJzLnRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pCiAgICAgICAgIHJldHVybiBXYWxsVGltZTo6 bm93KCkuc2Vjb25kc1NpbmNlRXBvY2goKSAtIG1fcGFyYW1ldGVycy50aW1lVG9MaXZlVXNlcklu dGVyYWN0aW9uLnZhbHVlKCk7CiAgICAgCkBAIC00NzUsNiArNDc3LDggQEAgVmVjdG9yPE9wZXJh dGluZ0RhdGU+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyZ2VPcGVyYXRpbmdEYXRl cyhjb25zdCBWZWMKIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om1lcmdlT3Bl cmF0aW5nRGF0ZXMoVmVjdG9yPE9wZXJhdGluZ0RhdGU+JiYgbmV3RGF0ZXMpCiB7CisgICAgQVNT RVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBtX29wZXJhdGluZ0RhdGVzID0gbWVyZ2VP cGVyYXRpbmdEYXRlcyhtX29wZXJhdGluZ0RhdGVzLCBXVEZNb3ZlKG5ld0RhdGVzKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXgg ODFkOTRmYTI5Yzc1ZGM5ZDI2NmZlYzU3YjZlNDM5NmJlZGYwYzk2Mi4uMGY2NzJmZDNmNGEzZTIy NTBiZjAwNGYyZGRmOWJkYmQwYmE1YTYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTMwNiwxMCArMzA2LDE0IEBAIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYXNTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJh YmxlRG9tYWluJiBzCiAKIGJvb2wgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYXNT dG9yYWdlQWNjZXNzRm9yRnJhbWUoY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHJlc291cmNlRG9t YWluLCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgZmlyc3RQYXJ0eURvbWFpbiwgdWludDY0X3Qg ZnJhbWVJRCwgUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogewotICAgIGlmIChtX25ldHdvcmtTZXNz aW9uKSB7Ci0gICAgICAgIGlmIChhdXRvKiBzdG9yYWdlU2Vzc2lvbiA9IG1fbmV0d29ya1Nlc3Np b24tPm5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpKQotICAgICAgICAgICAgcmV0dXJuIHN0b3JhZ2VT ZXNzaW9uLT5oYXNTdG9yYWdlQWNjZXNzKHJlc291cmNlRG9tYWluLCBmaXJzdFBhcnR5RG9tYWlu LCBmcmFtZUlELCBwYWdlSUQpOwotICAgIH0KKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkp OworCisgICAgaWYgKCFtX25ldHdvcmtTZXNzaW9uKQorICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICBpZiAoYXV0byogc3RvcmFnZVNlc3Npb24gPSBtX25ldHdvcmtTZXNzaW9uLT5uZXR3b3Jr U3RvcmFnZVNlc3Npb24oKSkKKyAgICAgICAgcmV0dXJuIHN0b3JhZ2VTZXNzaW9uLT5oYXNTdG9y YWdlQWNjZXNzKHJlc291cmNlRG9tYWluLCBmaXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELCBwYWdl SUQpOworCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC0zMjksNiArMzMzLDggQEAgdm9pZCBX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNhbGxIYXNTdG9yYWdlQWNjZXNzRm9yRnJh bWVIYW5kbGVyKGNvbnN0IFIKIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnJlcXVlc3RTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBzdWJGcmFtZURv bWFpbiwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHRvcEZyYW1lRG9tYWluLCB1aW50NjRfdCBm cmFtZUlELCBQYWdlSWRlbnRpZmllciBwYWdlSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3Rv cmFnZUFjY2Vzc1dhc0dyYW50ZWQsIFN0b3JhZ2VBY2Nlc3NQcm9tcHRXYXNTaG93bik+JiYgY29t cGxldGlvbkhhbmRsZXIpCiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAg IGlmIChzdWJGcmFtZURvbWFpbiA9PSB0b3BGcmFtZURvbWFpbikgewogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihTdG9yYWdlQWNjZXNzV2FzR3JhbnRlZDo6WWVzLCBTdG9yYWdlQWNjZXNzUHJv bXB0V2FzU2hvd246Ok5vKTsKICAgICAgICAgcmV0dXJuOwpAQCAtNDA5LDYgKzQxNSw4IEBAIHZv aWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3MoY29u c3QgUmVnaXN0cmFibGVEb21haW4mCiAKIFN0b3JhZ2VBY2Nlc3NXYXNHcmFudGVkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKGNvbnN0IFJlZ2lzdHJh YmxlRG9tYWluJiByZXNvdXJjZURvbWFpbiwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mIGZpcnN0 UGFydHlEb21haW4sIE9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCBQYWdlSWRlbnRpZmllciBw YWdlSUQpCiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGJvb2wgaXNT dG9yYWdlR3JhbnRlZCA9IGZhbHNlOwogCiAgICAgaWYgKG1fbmV0d29ya1Nlc3Npb24pIHsKQEAg LTQ1NCw2ICs0NjIsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVt b3ZlQWxsU3RvcmFnZUFjY2VzcyhDb21wbGV0aW9uSGFuZGxlcjx2bwogCiB2b2lkIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6YXBwbGljYXRpb25XaWxsVGVybWluYXRlKCkKIHsKKyAg ICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIGZsdXNoQW5kRGVzdHJveVBlcnNpc3Rl bnRTdG9yZSgpOwogfQogCkBAIC01MTMsNiArNTIyLDggQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBXZWJGcmFtZVByb3h5JiBm cmEKIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ0ZyYW1lTmF2aWdh dGlvbihjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgdGFyZ2V0RG9tYWluLCBjb25zdCBSZWdpc3Ry YWJsZURvbWFpbiYgdG9wRnJhbWVEb21haW4sIGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBzb3Vy Y2VEb21haW4sIGJvb2wgaXNSZWRpcmVjdCwgYm9vbCBpc01haW5GcmFtZSkKIHsKKyAgICBBU1NF UlQoUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgcG9zdFRhc2soW3RoaXMsIHRhcmdldERvbWFp biA9IHRhcmdldERvbWFpbi5pc29sYXRlZENvcHkoKSwgdG9wRnJhbWVEb21haW4gPSB0b3BGcmFt ZURvbWFpbi5pc29sYXRlZENvcHkoKSwgc291cmNlRG9tYWluID0gc291cmNlRG9tYWluLmlzb2xh dGVkQ29weSgpLCBpc1JlZGlyZWN0LCBpc01haW5GcmFtZV0gewogICAgICAgICBpZiAobV9zdGF0 aXN0aWNzU3RvcmUpCiAgICAgICAgICAgICBtX3N0YXRpc3RpY3NTdG9yZS0+bG9nRnJhbWVOYXZp Z2F0aW9uKHRhcmdldERvbWFpbiwgdG9wRnJhbWVEb21haW4sIHNvdXJjZURvbWFpbiwgaXNSZWRp cmVjdCwgaXNNYWluRnJhbWUpOwpAQCAtNTIxLDYgKzUzMiw4IEBAIHZvaWQgV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgUmVnaXN0cmFibGVE b21haW4mCiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dXZWJTb2Nr ZXRMb2FkaW5nKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiB0YXJnZXREb21haW4sIGNvbnN0IFJl Z2lzdHJhYmxlRG9tYWluJiB0b3BGcmFtZURvbWFpbiwgV2FsbFRpbWUgbGFzdFNlZW4sIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBBU1NFUlQo UnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgcG9zdFRhc2soW3RoaXMsIHRhcmdldERvbWFpbiA9 IHRhcmdldERvbWFpbi5pc29sYXRlZENvcHkoKSwgdG9wRnJhbWVEb21haW4gPSB0b3BGcmFtZURv bWFpbi5pc29sYXRlZENvcHkoKSwgbGFzdFNlZW4sIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgIGlmIChtX3N0YXRpc3Rp Y3NTdG9yZSkKICAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5sb2dTdWJyZXNvdXJjZUxv YWRpbmcodGFyZ2V0RG9tYWluLCB0b3BGcmFtZURvbWFpbiwgbGFzdFNlZW4pOwpAQCAtNTMxLDYg KzU0NCw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dXZWJTb2Nr ZXRMb2FkaW5nKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluCiAKIHZvaWQgV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcoY29uc3QgU3ViUmVzb3VyY2VE b21haW4mIHRhcmdldERvbWFpbiwgY29uc3QgVG9wRnJhbWVEb21haW4mIHRvcEZyYW1lRG9tYWlu LCBXYWxsVGltZSBsYXN0U2VlbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogeworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBwb3N0 VGFzayhbdGhpcywgdGFyZ2V0RG9tYWluID0gdGFyZ2V0RG9tYWluLmlzb2xhdGVkQ29weSgpLCB0 b3BGcmFtZURvbWFpbiA9IHRvcEZyYW1lRG9tYWluLmlzb2xhdGVkQ29weSgpLCBsYXN0U2Vlbiwg Y29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxl IHsKICAgICAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3JlKQogICAgICAgICAgICAgbV9zdGF0aXN0 aWNzU3RvcmUtPmxvZ1N1YnJlc291cmNlTG9hZGluZyh0YXJnZXREb21haW4sIHRvcEZyYW1lRG9t YWluLCBsYXN0U2Vlbik7CkBAIC01NDEsNiArNTU2LDggQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OmxvZ1N1YnJlc291cmNlTG9hZGluZyhjb25zdCBTdWJSZXNvdXJjZURv bWEKIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1N1YnJlc291cmNl UmVkaXJlY3QoY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHNvdXJjZURvbWFpbiwgY29uc3QgUmVn aXN0cmFibGVEb21haW4mIHRhcmdldERvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisK ICAgICBwb3N0VGFzayhbdGhpcywgc291cmNlRG9tYWluID0gc291cmNlRG9tYWluLmlzb2xhdGVk Q29weSgpLCB0YXJnZXREb21haW4gPSB0YXJnZXREb21haW4uaXNvbGF0ZWRDb3B5KCksIGNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAg ICAgICAgIGlmIChtX3N0YXRpc3RpY3NTdG9yZSkKICAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0 b3JlLT5sb2dTdWJyZXNvdXJjZVJlZGlyZWN0KHNvdXJjZURvbWFpbiwgdGFyZ2V0RG9tYWluKTsK QEAgLTU4NCw2ICs2MDEsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 Y2xlYXJVc2VySW50ZXJhY3Rpb24oY29uc3QgUmVnaXN0cmFibGVEb21haQogCiB2b2lkIFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkVXNlckludGVyYWN0aW9uKGNvbnN0IFJl Z2lzdHJhYmxlRG9tYWluJiBkb21haW4sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwog ICAgIHBvc3RUYXNrKFt0aGlzLCBkb21haW4sIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CiAgICAgICAgIGJvb2wgaGFkVXNlckludGVy YWN0aW9uID0gbV9zdGF0aXN0aWNzU3RvcmUgPyBtX3N0YXRpc3RpY3NTdG9yZS0+aGFzSGFkVXNl ckludGVyYWN0aW9uKGRvbWFpbiwgT3BlcmF0aW5nRGF0ZXNXaW5kb3c6OkxvbmcpIDogZmFsc2U7 CiAgICAgICAgIHBvc3RUYXNrUmVwbHkoW2hhZFVzZXJJbnRlcmFjdGlvbiwgY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKQEAgLTk1NCwx MCArOTczLDEyIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjYWxsVXBk YXRlUHJldmFsZW50RG9tYWluc1RvQmxvY2tDb29raWVzRm9yCiAKIHZvaWQgV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpyZW1vdmVQcmV2YWxlbnREb21haW5zKGNvbnN0IFZlY3RvcjxS ZWdpc3RyYWJsZURvbWFpbj4mIGRvbWFpbnMpCiB7Ci0gICAgaWYgKG1fbmV0d29ya1Nlc3Npb24p IHsKLSAgICAgICAgaWYgKGF1dG8qIHN0b3JhZ2VTZXNzaW9uID0gbV9uZXR3b3JrU2Vzc2lvbi0+ bmV0d29ya1N0b3JhZ2VTZXNzaW9uKCkpCi0gICAgICAgICAgICBzdG9yYWdlU2Vzc2lvbi0+cmVt b3ZlUHJldmFsZW50RG9tYWlucyhkb21haW5zKTsKLSAgICB9CisgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKKyAgICBpZiAoIW1fbmV0d29ya1Nlc3Npb24pCisgICAgICAgIHJldHVybjsK KworICAgIGlmIChhdXRvKiBzdG9yYWdlU2Vzc2lvbiA9IG1fbmV0d29ya1Nlc3Npb24tPm5ldHdv cmtTdG9yYWdlU2Vzc2lvbigpKQorICAgICAgICBzdG9yYWdlU2Vzc2lvbi0+cmVtb3ZlUHJldmFs ZW50RG9tYWlucyhkb21haW5zKTsKIH0KIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OmNhbGxSZW1vdmVEb21haW5zSGFuZGxlcihjb25zdCBWZWN0b3I8UmVnaXN0cmFibGVE b21haW4+JiBkb21haW5zKQpAQCAtMTAyMCwxMSArMTA0MSwxMyBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6bm90aWZ5UmVzb3VyY2VMb2FkU3RhdGlzdGljc1Byb2Nlc3Nl ZCgpCiAKIE5ldHdvcmtTZXNzaW9uKiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om5l dHdvcmtTZXNzaW9uKCkKIHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIHJl dHVybiBtX25ldHdvcmtTZXNzaW9uLmdldCgpOwogfQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6aW52YWxpZGF0ZUFuZENhbmNlbCgpCiB7CisgICAgQVNTRVJUKFJ1bkxv b3A6OmlzTWFpbigpKTsKICAgICBtX25ldHdvcmtTZXNzaW9uID0gbnVsbHB0cjsKIH0KIApAQCAt MTA1NCwxMiArMTA3NywxNCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 cmVnaXN0cmFibGVEb21haW5zV2l0aFdlYnNpdGVEYXRhKE9wdGlvblNldAogCiB2b2lkIFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2VuZERpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVl KGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgdW5zaWdu ZWQgdmFsdWUsIHVuc2lnbmVkIHNpZ0RpZ2l0cywgV2ViQ29yZTo6U2hvdWxkU2FtcGxlIHNob3Vs ZFNhbXBsZSkgY29uc3QKIHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIGlm IChtX25ldHdvcmtTZXNzaW9uKQogICAgICAgICBjb25zdF9jYXN0PFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZSo+KHRoaXMpLT5uZXR3b3JrU2Vzc2lvbigpLT5sb2dEaWFnbm9zdGljTWVz c2FnZVdpdGhWYWx1ZShtZXNzYWdlLCBkZXNjcmlwdGlvbiwgdmFsdWUsIHNpZ0RpZ2l0cywgc2hv dWxkU2FtcGxlKTsKIH0KIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om5v dGlmeVBhZ2VTdGF0aXN0aWNzVGVsZW1ldHJ5RmluaXNoZWQodW5zaWduZWQgdG90YWxQcmV2YWxl bnRSZXNvdXJjZXMsIHVuc2lnbmVkIHRvdGFsUHJldmFsZW50UmVzb3VyY2VzV2l0aFVzZXJJbnRl cmFjdGlvbiwgdW5zaWduZWQgdG9wM1N1YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMpIGNvbnN0 CiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBpZiAobV9uZXR3b3JrU2Vz c2lvbikKICAgICAgICAgY29uc3RfY2FzdDxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUq Pih0aGlzKS0+bmV0d29ya1Nlc3Npb24oKS0+bm90aWZ5UGFnZVN0YXRpc3RpY3NUZWxlbWV0cnlG aW5pc2hlZCh0b3RhbFByZXZhbGVudFJlc291cmNlcywgdG90YWxQcmV2YWxlbnRSZXNvdXJjZXNX aXRoVXNlckludGVyYWN0aW9uLCB0b3AzU3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucyk7CiB9 Cg== 375703 2019-08-07 09:27:43 -0700 2019-08-07 10:22:45 -0700 Patch bug-200505-20190807092743.patch text/plain 14763 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE3NzMwOTBlNGEyOGE5NDlm YjRjN2RjYzA4NTkxMDJjZmY3MDNiYTUuLjE0NjU3NzQ4MjIyYmIyYWQ5YjMwNGFjYjgzMDc3NWJh MTU1ZjE3OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTktMDgtMDcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbW9yZSB0aHJlYWRpbmcgYXNz ZXJ0aW9ucyB0byBJVFAgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjAwNTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4K KworICAgICAgICBBZGQgbW9yZSB0aHJlYWRpbmcgYXNzZXJ0aW9ucyB0byBJVFAgY29kZSB0byBo ZWxwIGNhdGNoIGJ1Z3MgYW5kIHByb3RlY3QgYWdhaW5zdCBmdXR1cmUgYmFkIHVzYWdlLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz TWVtb3J5U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNz TWVtb3J5U3RvcmU6OmlzRW1wdHkgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OnNldFBlcnNpc3RlbnRTdG9yYWdlKToKKyAgICAgICAg KFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjppbmNyZW1lbnRSZWNv cmRzRGVsZXRlZENvdW50Rm9yRG9tYWlucyk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6Y2xhc3NpZnlQcmV2YWxlbnRSZXNvdXJjZXMpOgorICAg ICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OnN5bmNTdG9y YWdlSWZOZWVkZWQpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVt b3J5U3RvcmU6OnN5bmNTdG9yYWdlSW1tZWRpYXRlbHkpOgorICAgICAgICAoV2ViS2l0OjpSZXNv dXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmdyYW5kZmF0aGVyRGF0YUZvckRvbWFpbnMp OgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmVu c3VyZVByZXZhbGVudFJlc291cmNlc0ZvckRlYnVnTW9kZSk6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAg ICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0YXRpc3RpY3NFcGlyYXRp b25UaW1lIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjptZXJnZU9wZXJhdGluZ0RhdGVzKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFz c2lmaWVyL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzU3RvcmFnZUFjY2Vzc0ZvckZy YW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpy ZXF1ZXN0U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ0ZyYW1l TmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6bG9nV2ViU29ja2V0TG9hZGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nU3VicmVzb3VyY2VMb2FkaW5nKToKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dTdWJyZXNvdXJjZVJlZGly ZWN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpo YXNIYWRVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OnJlbW92ZVByZXZhbGVudERvbWFpbnMpOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om5ldHdvcmtTZXNzaW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjppbnZhbGlkYXRlQW5k Q2FuY2VsKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZW5kRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Om5vdGlmeVBhZ2VTdGF0aXN0aWNzVGVs ZW1ldHJ5RmluaXNoZWQgY29uc3QpOgorCiAyMDE5LTA4LTA2ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtpUGFkT1NdIHNsaWRlcy5nb29nbGUuY29tOiB0YXBw aW5nIG5lYXIgY3Vyc29yIGluIGEgc2xpZGUgdGl0bGUgZm9jdXNlcyB0aGUgc3BlYWtlciBub3Rl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNw cAppbmRleCA3MzA1YzUxMDIzNmE0YzhhM2EzNmY2MDUwNWY5NjExODJlNGVlNzM2Li45MDNkNzU4 MDAwYTIwYmZhNjlhY2M3ODcxOTM1Nzg5Yzg3NzY5YmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9y eVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIv UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcApAQCAtODIsMTEgKzgyLDE1IEBA IFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj c01lbW9yeVN0b3JlKFdlYlJlc291cmNlCiAKIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01l bW9yeVN0b3JlOjppc0VtcHR5KCkgY29uc3QKIHsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFp bigpKTsKKwogICAgIHJldHVybiBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5pc0VtcHR5KCk7CiB9 CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpzZXRQZXJzaXN0ZW50 U3RvcmFnZShSZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2UmIHBlcnNpc3Rl bnRTdG9yYWdlKQogeworICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgbV9w ZXJzaXN0ZW50U3RvcmFnZSA9IG1ha2VXZWFrUHRyKHBlcnNpc3RlbnRTdG9yYWdlKTsKIH0KIApA QCAtMTAwLDYgKzEwNCw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3Jl OjpjYWxjdWxhdGVBbmRTdWJtaXRUZWxlbWV0cnkoKSBjb25zdAogCiB2b2lkIFJlc291cmNlTG9h ZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6aW5jcmVtZW50UmVjb3Jkc0RlbGV0ZWRDb3VudEZvckRv bWFpbnMoSGFzaFNldDxSZWdpc3RyYWJsZURvbWFpbj4mJiBkb21haW5zV2l0aERlbGV0ZWRXZWJz aXRlRGF0YSkKIHsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGZvciAo YXV0byYgZG9tYWluIDogZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpIHsKICAgICAgICAg YXV0byYgc3RhdGlzdGljID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVnaXN0cmFibGVE b21haW4oZG9tYWluKTsKICAgICAgICAgKytzdGF0aXN0aWMuZGF0YVJlY29yZHNSZW1vdmVkOwpA QCAtMTcyLDYgKzE3OCw4IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3Jl Ojppc1ByZXZhbGVudER1ZVRvRGVidWdNb2RlKFJlc291cmNlTG9hZFN0CiAKIHZvaWQgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpjbGFzc2lmeVByZXZhbGVudFJlc291cmNlcygp CiB7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBmb3IgKGF1dG8mIHJl c291cmNlU3RhdGlzdGljIDogbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAudmFsdWVzKCkpIHsKICAg ICAgICAgaWYgKHNob3VsZFNraXAocmVzb3VyY2VTdGF0aXN0aWMucmVnaXN0cmFibGVEb21haW4p KQogICAgICAgICAgICAgY29udGludWU7CkBAIC0xODksMTIgKzE5NywxNiBAQCB2b2lkIFJlc291 cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6Y2xhc3NpZnlQcmV2YWxlbnRSZXNvdXJjZXMo KQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6c3luY1N0b3JhZ2VJ Zk5lZWRlZCgpCiB7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBpZiAo bV9wZXJzaXN0ZW50U3RvcmFnZSkKICAgICAgICAgbV9wZXJzaXN0ZW50U3RvcmFnZS0+c2NoZWR1 bGVPcldyaXRlTWVtb3J5U3RvcmUoUmVzb3VyY2VMb2FkU3RhdGlzdGljc1BlcnNpc3RlbnRTdG9y YWdlOjpGb3JjZUltbWVkaWF0ZVdyaXRlOjpObyk7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc01lbW9yeVN0b3JlOjpzeW5jU3RvcmFnZUltbWVkaWF0ZWx5KCkKIHsKKyAgICBBU1NF UlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGlmIChtX3BlcnNpc3RlbnRTdG9yYWdlKQog ICAgICAgICBtX3BlcnNpc3RlbnRTdG9yYWdlLT5zY2hlZHVsZU9yV3JpdGVNZW1vcnlTdG9yZShS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGVyc2lzdGVudFN0b3JhZ2U6OkZvcmNlSW1tZWRpYXRlV3Jp dGU6Olllcyk7CiB9CkBAIC0zMTUsNiArMzI3LDggQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWVtb3J5U3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzc0ludGVybmFsKFN1YkZyYW1lRG9tYWkK IAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmdyYW5kZmF0aGVyRGF0 YUZvckRvbWFpbnMoY29uc3QgSGFzaFNldDxSZWdpc3RyYWJsZURvbWFpbj4mIGRvbWFpbnMpCiB7 CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBmb3IgKGF1dG8mIGRvbWFp biA6IGRvbWFpbnMpIHsKICAgICAgICAgYXV0byYgc3RhdGlzdGljID0gZW5zdXJlUmVzb3VyY2VT dGF0aXN0aWNzRm9yUmVnaXN0cmFibGVEb21haW4oZG9tYWluKTsKICAgICAgICAgc3RhdGlzdGlj LmdyYW5kZmF0aGVyZWQgPSB0cnVlOwpAQCAtMzIzLDYgKzMzNyw4IEBAIHZvaWQgUmVzb3VyY2VM b2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpncmFuZGZhdGhlckRhdGFGb3JEb21haW5zKGNvbnN0 IEhhc2hTZXQ8CiAKIFZlY3RvcjxSZWdpc3RyYWJsZURvbWFpbj4gUmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlOjplbnN1cmVQcmV2YWxlbnRSZXNvdXJjZXNGb3JEZWJ1Z01vZGUoKQog eworICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgaWYgKCFkZWJ1Z01vZGVF bmFibGVkKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5jcHAKaW5kZXggMDBiNGZhNGRmZDhjN2JjOGEwYzQxZTZkYzhjYTdl Mzk3M2NmYzBmZC4uYjkzZjA3ZGE0MWQ1NWMyM2EwNzZkMGI1ZmQ4ZjQzZTRkMzk1NDkwMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTQ0NSw2ICs0 NDUsOCBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2xlYXJCbG9ja2luZ1N0 YXRlRm9yRG9tYWlucyhjb25zdCBWZWN0b3I8UmVnaQogCiBPcHRpb25hbDxTZWNvbmRzPiBSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnN0YXRpc3RpY3NFcGlyYXRpb25UaW1lKCkgY29uc3QK IHsKKyAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIGlmIChtX3BhcmFtZXRl cnMudGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbikKICAgICAgICAgcmV0dXJuIFdhbGxUaW1lOjpu b3coKS5zZWNvbmRzU2luY2VFcG9jaCgpIC0gbV9wYXJhbWV0ZXJzLnRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24udmFsdWUoKTsKICAgICAKQEAgLTQ3NSw2ICs0NzcsOCBAQCBWZWN0b3I8T3BlcmF0 aW5nRGF0ZT4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjptZXJnZU9wZXJhdGluZ0RhdGVz KGNvbnN0IFZlYwogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bWVyZ2VPcGVy YXRpbmdEYXRlcyhWZWN0b3I8T3BlcmF0aW5nRGF0ZT4mJiBuZXdEYXRlcykKIHsKKyAgICBBU1NF UlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIG1fb3BlcmF0aW5nRGF0ZXMgPSBtZXJnZU9w ZXJhdGluZ0RhdGVzKG1fb3BlcmF0aW5nRGF0ZXMsIFdURk1vdmUobmV3RGF0ZXMpKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCA4 MWQ5NGZhMjljNzVkYzlkMjY2ZmVjNTdiNmU0Mzk2YmVkZjBjOTYyLi4wZjY3MmZkM2Y0YTNlMjI1 MGJmMDA0ZjJkZGY5YmRiZDBiYTVhNjFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtMzA2LDEwICszMDYsMTQgQEAgdm9pZCBXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3MoY29uc3QgUmVnaXN0cmFi bGVEb21haW4mIHMKIAogYm9vbCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc1N0 b3JhZ2VBY2Nlc3NGb3JGcmFtZShjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVzb3VyY2VEb21h aW4sIGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiBmaXJzdFBhcnR5RG9tYWluLCB1aW50NjRfdCBm cmFtZUlELCBQYWdlSWRlbnRpZmllciBwYWdlSUQpCiB7Ci0gICAgaWYgKG1fbmV0d29ya1Nlc3Np b24pIHsKLSAgICAgICAgaWYgKGF1dG8qIHN0b3JhZ2VTZXNzaW9uID0gbV9uZXR3b3JrU2Vzc2lv bi0+bmV0d29ya1N0b3JhZ2VTZXNzaW9uKCkpCi0gICAgICAgICAgICByZXR1cm4gc3RvcmFnZVNl c3Npb24tPmhhc1N0b3JhZ2VBY2Nlc3MocmVzb3VyY2VEb21haW4sIGZpcnN0UGFydHlEb21haW4s IGZyYW1lSUQsIHBhZ2VJRCk7Ci0gICAgfQorICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 CisKKyAgICBpZiAoIW1fbmV0d29ya1Nlc3Npb24pCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIGlmIChhdXRvKiBzdG9yYWdlU2Vzc2lvbiA9IG1fbmV0d29ya1Nlc3Npb24tPm5ldHdvcmtT dG9yYWdlU2Vzc2lvbigpKQorICAgICAgICByZXR1cm4gc3RvcmFnZVNlc3Npb24tPmhhc1N0b3Jh Z2VBY2Nlc3MocmVzb3VyY2VEb21haW4sIGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQsIHBhZ2VJ RCk7CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTMyOSw2ICszMzMsOCBAQCB2b2lkIFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2FsbEhhc1N0b3JhZ2VBY2Nlc3NGb3JGcmFt ZUhhbmRsZXIoY29uc3QgUgogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHN1YkZyYW1lRG9t YWluLCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgdG9wRnJhbWVEb21haW4sIHVpbnQ2NF90IGZy YW1lSUQsIFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdG9y YWdlQWNjZXNzV2FzR3JhbnRlZCwgU3RvcmFnZUFjY2Vzc1Byb21wdFdhc1Nob3duKT4mJiBjb21w bGV0aW9uSGFuZGxlcikKIHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAg aWYgKHN1YkZyYW1lRG9tYWluID09IHRvcEZyYW1lRG9tYWluKSB7CiAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyKFN0b3JhZ2VBY2Nlc3NXYXNHcmFudGVkOjpZZXMsIFN0b3JhZ2VBY2Nlc3NQcm9t cHRXYXNTaG93bjo6Tm8pOwogICAgICAgICByZXR1cm47CkBAIC00MDksNiArNDE1LDggQEAgdm9p ZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzcyhjb25z dCBSZWdpc3RyYWJsZURvbWFpbiYKIAogU3RvcmFnZUFjY2Vzc1dhc0dyYW50ZWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3MoY29uc3QgUmVnaXN0cmFi bGVEb21haW4mIHJlc291cmNlRG9tYWluLCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgZmlyc3RQ YXJ0eURvbWFpbiwgT3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIFBhZ2VJZGVudGlmaWVyIHBh Z2VJRCkKIHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworCiAgICAgYm9vbCBpc1N0 b3JhZ2VHcmFudGVkID0gZmFsc2U7CiAKICAgICBpZiAobV9uZXR3b3JrU2Vzc2lvbikgewpAQCAt NDU0LDYgKzQ2Miw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZW1v dmVBbGxTdG9yYWdlQWNjZXNzKENvbXBsZXRpb25IYW5kbGVyPHZvCiAKIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUoKQogeworICAg IEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgZmx1c2hBbmREZXN0cm95UGVyc2lzdGVu dFN0b3JlKCk7CiB9CiAKQEAgLTUxMyw2ICs1MjIsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IFdlYkZyYW1lUHJveHkmIGZy YQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nRnJhbWVOYXZpZ2F0 aW9uKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiB0YXJnZXREb21haW4sIGNvbnN0IFJlZ2lzdHJh YmxlRG9tYWluJiB0b3BGcmFtZURvbWFpbiwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHNvdXJj ZURvbWFpbiwgYm9vbCBpc1JlZGlyZWN0LCBib29sIGlzTWFpbkZyYW1lKQogeworICAgIEFTU0VS VChSdW5Mb29wOjppc01haW4oKSk7CisKICAgICBwb3N0VGFzayhbdGhpcywgdGFyZ2V0RG9tYWlu ID0gdGFyZ2V0RG9tYWluLmlzb2xhdGVkQ29weSgpLCB0b3BGcmFtZURvbWFpbiA9IHRvcEZyYW1l RG9tYWluLmlzb2xhdGVkQ29weSgpLCBzb3VyY2VEb21haW4gPSBzb3VyY2VEb21haW4uaXNvbGF0 ZWRDb3B5KCksIGlzUmVkaXJlY3QsIGlzTWFpbkZyYW1lXSB7CiAgICAgICAgIGlmIChtX3N0YXRp c3RpY3NTdG9yZSkKICAgICAgICAgICAgIG1fc3RhdGlzdGljc1N0b3JlLT5sb2dGcmFtZU5hdmln YXRpb24odGFyZ2V0RG9tYWluLCB0b3BGcmFtZURvbWFpbiwgc291cmNlRG9tYWluLCBpc1JlZGly ZWN0LCBpc01haW5GcmFtZSk7CkBAIC01MjEsNiArNTMyLDggQEAgdm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBSZWdpc3RyYWJsZURv bWFpbiYKIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1dlYlNvY2tl dExvYWRpbmcoY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHRhcmdldERvbWFpbiwgY29uc3QgUmVn aXN0cmFibGVEb21haW4mIHRvcEZyYW1lRG9tYWluLCBXYWxsVGltZSBsYXN0U2VlbiwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIEFTU0VSVChS dW5Mb29wOjppc01haW4oKSk7CisKICAgICBwb3N0VGFzayhbdGhpcywgdGFyZ2V0RG9tYWluID0g dGFyZ2V0RG9tYWluLmlzb2xhdGVkQ29weSgpLCB0b3BGcmFtZURvbWFpbiA9IHRvcEZyYW1lRG9t YWluLmlzb2xhdGVkQ29weSgpLCBsYXN0U2VlbiwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKG1fc3RhdGlzdGlj c1N0b3JlKQogICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3RvcmUtPmxvZ1N1YnJlc291cmNlTG9h ZGluZyh0YXJnZXREb21haW4sIHRvcEZyYW1lRG9tYWluLCBsYXN0U2Vlbik7CkBAIC01MzEsNiAr NTQ0LDggQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmxvZ1dlYlNvY2tl dExvYWRpbmcoY29uc3QgUmVnaXN0cmFibGVEb21haW4KIAogdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OmxvZ1N1YnJlc291cmNlTG9hZGluZyhjb25zdCBTdWJSZXNvdXJjZURv bWFpbiYgdGFyZ2V0RG9tYWluLCBjb25zdCBUb3BGcmFtZURvbWFpbiYgdG9wRnJhbWVEb21haW4s IFdhbGxUaW1lIGxhc3RTZWVuLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlv bkhhbmRsZXIpCiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwogICAgIHBvc3RU YXNrKFt0aGlzLCB0YXJnZXREb21haW4gPSB0YXJnZXREb21haW4uaXNvbGF0ZWRDb3B5KCksIHRv cEZyYW1lRG9tYWluID0gdG9wRnJhbWVEb21haW4uaXNvbGF0ZWRDb3B5KCksIGxhc3RTZWVuLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUg ewogICAgICAgICBpZiAobV9zdGF0aXN0aWNzU3RvcmUpCiAgICAgICAgICAgICBtX3N0YXRpc3Rp Y3NTdG9yZS0+bG9nU3VicmVzb3VyY2VMb2FkaW5nKHRhcmdldERvbWFpbiwgdG9wRnJhbWVEb21h aW4sIGxhc3RTZWVuKTsKQEAgLTU0MSw2ICs1NTYsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6bG9nU3VicmVzb3VyY2VMb2FkaW5nKGNvbnN0IFN1YlJlc291cmNlRG9t YQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bG9nU3VicmVzb3VyY2VS ZWRpcmVjdChjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgc291cmNlRG9tYWluLCBjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYgdGFyZ2V0RG9tYWluLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwog ICAgIHBvc3RUYXNrKFt0aGlzLCBzb3VyY2VEb21haW4gPSBzb3VyY2VEb21haW4uaXNvbGF0ZWRD b3B5KCksIHRhcmdldERvbWFpbiA9IHRhcmdldERvbWFpbi5pc29sYXRlZENvcHkoKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAg ICAgICAgaWYgKG1fc3RhdGlzdGljc1N0b3JlKQogICAgICAgICAgICAgbV9zdGF0aXN0aWNzU3Rv cmUtPmxvZ1N1YnJlc291cmNlUmVkaXJlY3Qoc291cmNlRG9tYWluLCB0YXJnZXREb21haW4pOwpA QCAtNTg0LDYgKzYwMSw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpj bGVhclVzZXJJbnRlcmFjdGlvbihjb25zdCBSZWdpc3RyYWJsZURvbWFpCiAKIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYXNIYWRVc2VySW50ZXJhY3Rpb24oY29uc3QgUmVn aXN0cmFibGVEb21haW4mIGRvbWFpbiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBj b21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworCiAg ICAgcG9zdFRhc2soW3RoaXMsIGRvbWFpbiwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgYm9vbCBoYWRVc2VySW50ZXJh Y3Rpb24gPSBtX3N0YXRpc3RpY3NTdG9yZSA/IG1fc3RhdGlzdGljc1N0b3JlLT5oYXNIYWRVc2Vy SW50ZXJhY3Rpb24oZG9tYWluLCBPcGVyYXRpbmdEYXRlc1dpbmRvdzo6TG9uZykgOiBmYWxzZTsK ICAgICAgICAgcG9zdFRhc2tSZXBseShbaGFkVXNlckludGVyYWN0aW9uLCBjb21wbGV0aW9uSGFu ZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewpAQCAtOTU0LDEw ICs5NzMsMTIgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNhbGxVcGRh dGVQcmV2YWxlbnREb21haW5zVG9CbG9ja0Nvb2tpZXNGb3IKIAogdm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZVByZXZhbGVudERvbWFpbnMoY29uc3QgVmVjdG9yPFJl Z2lzdHJhYmxlRG9tYWluPiYgZG9tYWlucykKIHsKLSAgICBpZiAobV9uZXR3b3JrU2Vzc2lvbikg ewotICAgICAgICBpZiAoYXV0byogc3RvcmFnZVNlc3Npb24gPSBtX25ldHdvcmtTZXNzaW9uLT5u ZXR3b3JrU3RvcmFnZVNlc3Npb24oKSkKLSAgICAgICAgICAgIHN0b3JhZ2VTZXNzaW9uLT5yZW1v dmVQcmV2YWxlbnREb21haW5zKGRvbWFpbnMpOwotICAgIH0KKyAgICBBU1NFUlQoUnVuTG9vcDo6 aXNNYWluKCkpOworICAgIGlmICghbV9uZXR3b3JrU2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOwor CisgICAgaWYgKGF1dG8qIHN0b3JhZ2VTZXNzaW9uID0gbV9uZXR3b3JrU2Vzc2lvbi0+bmV0d29y a1N0b3JhZ2VTZXNzaW9uKCkpCisgICAgICAgIHN0b3JhZ2VTZXNzaW9uLT5yZW1vdmVQcmV2YWxl bnREb21haW5zKGRvbWFpbnMpOwogfQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6Y2FsbFJlbW92ZURvbWFpbnNIYW5kbGVyKGNvbnN0IFZlY3RvcjxSZWdpc3RyYWJsZURv bWFpbj4mIGRvbWFpbnMpCkBAIC0xMDIwLDExICsxMDQxLDEzIEBAIHZvaWQgV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpub3RpZnlSZXNvdXJjZUxvYWRTdGF0aXN0aWNzUHJvY2Vzc2Vk KCkKIAogTmV0d29ya1Nlc3Npb24qIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bmV0 d29ya1Nlc3Npb24oKQogeworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgcmV0 dXJuIG1fbmV0d29ya1Nlc3Npb24uZ2V0KCk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjppbnZhbGlkYXRlQW5kQ2FuY2VsKCkKIHsKKyAgICBBU1NFUlQoUnVuTG9v cDo6aXNNYWluKCkpOwogICAgIG1fbmV0d29ya1Nlc3Npb24gPSBudWxscHRyOwogfQogCkBAIC0x MDU0LDEyICsxMDc3LDE0IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpy ZWdpc3RyYWJsZURvbWFpbnNXaXRoV2Vic2l0ZURhdGEoT3B0aW9uU2V0CiAKIHZvaWQgV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZW5kRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUo Y29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uLCB1bnNpZ25l ZCB2YWx1ZSwgdW5zaWduZWQgc2lnRGlnaXRzLCBXZWJDb3JlOjpTaG91bGRTYW1wbGUgc2hvdWxk U2FtcGxlKSBjb25zdAogeworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgaWYg KG1fbmV0d29ya1Nlc3Npb24pCiAgICAgICAgIGNvbnN0X2Nhc3Q8V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlKj4odGhpcyktPm5ldHdvcmtTZXNzaW9uKCktPmxvZ0RpYWdub3N0aWNNZXNz YWdlV2l0aFZhbHVlKG1lc3NhZ2UsIGRlc2NyaXB0aW9uLCB2YWx1ZSwgc2lnRGlnaXRzLCBzaG91 bGRTYW1wbGUpOwogfQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6bm90 aWZ5UGFnZVN0YXRpc3RpY3NUZWxlbWV0cnlGaW5pc2hlZCh1bnNpZ25lZCB0b3RhbFByZXZhbGVu dFJlc291cmNlcywgdW5zaWduZWQgdG90YWxQcmV2YWxlbnRSZXNvdXJjZXNXaXRoVXNlckludGVy YWN0aW9uLCB1bnNpZ25lZCB0b3AzU3ViZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2lucykgY29uc3QK IHsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIGlmIChtX25ldHdvcmtTZXNz aW9uKQogICAgICAgICBjb25zdF9jYXN0PFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSo+ KHRoaXMpLT5uZXR3b3JrU2Vzc2lvbigpLT5ub3RpZnlQYWdlU3RhdGlzdGljc1RlbGVtZXRyeUZp bmlzaGVkKHRvdGFsUHJldmFsZW50UmVzb3VyY2VzLCB0b3RhbFByZXZhbGVudFJlc291cmNlc1dp dGhVc2VySW50ZXJhY3Rpb24sIHRvcDNTdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW5zKTsKIH0K