198970 2019-06-18 10:43:36 -0700 Change log channel name from ResourceLoadStatisticsDebug to ITPDebug and remove unnecessary #if !RELEASE_LOG_DISABLED 2019-06-18 13:22:47 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander bfulgham commit-queue webkit-bug-importer oldest_to_newest 1545668 0 wilander 2019-06-18 10:43:36 -0700 We should change the log channel name for ITP from ResourceLoadStatisticsDebug to ITPDebug and remove unnecessary #if !RELEASE_LOG_DISABLED while we're at it. 1545669 1 webkit-bug-importer 2019-06-18 10:44:10 -0700 <rdar://problem/51855836> 1545672 2 372351 wilander 2019-06-18 10:47:37 -0700 Created attachment 372351 Patch 1545680 3 372351 bfulgham 2019-06-18 11:14:12 -0700 Comment on attachment 372351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372351&action=review Looks good, aside from the unused function. r=me if you fix that. > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:-89 > -#endif I think the build will fail (due to unused function warnings) if you remove these #if/defs. 1545691 4 wilander 2019-06-18 11:39:54 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 372351 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372351&action=review > > Looks good, aside from the unused function. r=me if you fix that. > > > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:-89 > > -#endif > > I think the build will fail (due to unused function warnings) if you remove > these #if/defs. Oh, you're saying the RELEASE_LOG_INFO macros will compile out the calls to domainsToString() if release log is disabled and thus cause an unused function build warning/failure? 1545699 5 372357 wilander 2019-06-18 11:49:15 -0700 Created attachment 372357 Patch 1545700 6 wilander 2019-06-18 11:49:59 -0700 Made the change you asked for and now just making sure EWS is happy since it's a compile-time change. 1545703 7 bfulgham 2019-06-18 11:54:58 -0700 (In reply to John Wilander from comment #4) > (In reply to Brent Fulgham from comment #3) > > Comment on attachment 372351 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=372351&action=review > > > > Looks good, aside from the unused function. r=me if you fix that. > > > > > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:-89 > > > -#endif > > > > I think the build will fail (due to unused function warnings) if you remove > > these #if/defs. > > Oh, you're saying the RELEASE_LOG_INFO macros will compile out the calls to > domainsToString() if release log is disabled and thus cause an unused > function build warning/failure? Precisely! It's because we build with warnings-as-errors. 1545736 8 372357 wilander 2019-06-18 12:53:02 -0700 Comment on attachment 372357 Patch Seems fine. Thanks, Brent! 1545763 9 372357 commit-queue 2019-06-18 13:22:46 -0700 Comment on attachment 372357 Patch Clearing flags on attachment: 372357 Committed r246561: <https://trac.webkit.org/changeset/246561> 1545764 10 commit-queue 2019-06-18 13:22:47 -0700 All reviewed patches have been landed. Closing bug. 372351 2019-06-18 10:47:37 -0700 2019-06-18 11:49:14 -0700 Patch bug-198970-20190618104736.patch text/plain 19037 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI0NDVhOGVhNTcxZTczZjJi ZjQwNjFlM2I3Y2RiMjBmNDNlYWM4MDguLjNiNTExYTRiYjUzZWRkMDE1NzNhYTVjN2I5NDk2Y2Qx NmQ1OGQ5ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDYtMTggIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlIGxvZyBjaGFubmVs IG5hbWUgZnJvbSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcgdG8gSVRQRGVidWcgYW5kIHJl bW92ZSB1bm5lY2Vzc2FyeSAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5NzAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUxODU1ODM2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgIChX ZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpyZXF1ZXN0U3RvcmFn ZUFjY2Vzc1VuZGVyT3BlbmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlz dGljc0RhdGFiYXNlU3RvcmU6OmVuc3VyZVByZXZhbGVudFJlc291cmNlc0ZvckRlYnVnTW9kZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjp1 cGRhdGVDb29raWVCbG9ja2luZyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNz KToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpy ZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjplbnN1cmVQcmV2YWxlbnRSZXNvdXJjZXNGb3JE ZWJ1Z01vZGUpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5 U3RvcmU6OnVwZGF0ZUNvb2tpZUJsb2NraW5nKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9D bGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OmRvbWFpbnNUb1N0cmluZyk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6cmVtb3ZlRGF0YVJlY29yZHMpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUp OgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlYnVnTG9n RG9tYWluc0luQmF0Y2hlcyk6CisgICAgICAgICogUGxhdGZvcm0vTG9nZ2luZy5oOgorCiAyMDE5 LTA2LTE4ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAg IEV4cG9zZSBEYXRhRGV0ZWN0b3JzIGNvbnRleHQgZ2VuZXJhdGlvbiBvbiBXS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rh dGFiYXNlU3RvcmUuY3BwCmluZGV4IGI2ODljM2UyNWFkODIzZWNmNmQzMDRlZTc4OWNhOWYzNDVk YTJkNDIuLjNjMmVjZDViYzhjZTU4NjlmNDBiNmM0MzZiYjVkZDEzZTY3NDc2NWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcApA QCAtNzUxLDE2ICs3NTEsMTIgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VT dG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoU3ViRnJhbWVEb21haW4mJgogCiAgICAgc3dpdGNo IChjb29raWVUcmVhdG1lbnRGb3JPcmlnaW4oc3ViRnJhbWVEb21haW4pKSB7CiAgICAgY2FzZSBD b29raWVUcmVhdG1lbnRSZXN1bHQ6OkJsb2NrQW5kUHVyZ2U6IHsKLSNpZiAhUkVMRUFTRV9MT0df RElTQUJMRUQKLSAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVk KCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkNhbm5vdCBncmFudCBzdG9yYWdlIGFj Y2VzcyB0byAle3B1YmxpY31zIHNpbmNlIGl0cyBjb29raWVzIGFyZSBibG9ja2VkIGluIHRoaXJk LXBhcnR5IGNvbnRleHRzIGFuZCBpdCBoYXMgbm90IHJlY2VpdmVkIHVzZXIgaW50ZXJhY3Rpb24g YXMgZmlyc3QtcGFydHkuIiwgc3ViRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7 Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVk KCksIElUUERlYnVnLCAiQ2Fubm90IGdyYW50IHN0b3JhZ2UgYWNjZXNzIHRvICV7cHVibGljfXMg c2luY2UgaXRzIGNvb2tpZXMgYXJlIGJsb2NrZWQgaW4gdGhpcmQtcGFydHkgY29udGV4dHMgYW5k IGl0IGhhcyBub3QgcmVjZWl2ZWQgdXNlciBpbnRlcmFjdGlvbiBhcyBmaXJzdC1wYXJ0eS4iLCBz dWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgY29tcGxldGlv bkhhbmRsZXIoU3RvcmFnZUFjY2Vzc1N0YXR1czo6Q2Fubm90UmVxdWVzdEFjY2Vzcyk7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQ29va2llVHJlYXRtZW50UmVzdWx0OjpC bG9ja0FuZEtlZXA6IHsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgUkVMRUFT RV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEZWJ1ZywgIk5vIG5lZWQgdG8gZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyBz aW5jZSBpdHMgY29va2llcyBhcmUgbm90IGJsb2NrZWQgaW4gdGhpcmQtcGFydHkgY29udGV4dHMu Iiwgc3ViRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAg ICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERlYnVnLCAi Tm8gbmVlZCB0byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHNpbmNlIGl0cyBj b29raWVzIGFyZSBub3QgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cy4iLCBzdWJGcmFt ZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRs ZXIoU3RvcmFnZUFjY2Vzc1N0YXR1czo6SGFzQWNjZXNzKTsKICAgICAgICAgfQogICAgICAgICBy ZXR1cm47CkBAIC03NzEsMTcgKzc2NywxMyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhYmFzZVN0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhTdWJGcmFtZURvbWFpbiYmCiAKICAg ICBhdXRvIHVzZXJXYXNQcm9tcHRlZEVhcmxpZXIgPSBoYXNVc2VyR3JhbnRlZFN0b3JhZ2VBY2Nl c3NUaHJvdWdoUHJvbXB0KHN1YkZyYW1lU3RhdHVzLnNlY29uZCwgdG9wRnJhbWVEb21haW4pOwog ICAgIGlmICh1c2VyV2FzUHJvbXB0ZWRFYXJsaWVyID09IFN0b3JhZ2VBY2Nlc3NQcm9tcHRXYXNT aG93bjo6Tm8pIHsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgUkVMRUFTRV9M T0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1ZywgIkFib3V0IHRvIGFzayB0aGUgdXNlciB3aGV0aGVyIHRoZXkgd2FudCB0byBncmFudCBz dG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHVuZGVyICV7cHVibGljfXMgb3Igbm90LiIsIHN1 YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIHRvcEZyYW1lRG9tYWluLnN0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpOwotI2VuZGlmCisgICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYo ZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBJVFBEZWJ1ZywgIkFib3V0IHRvIGFzayB0aGUgdXNlciB3 aGV0aGVyIHRoZXkgd2FudCB0byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHVu ZGVyICV7cHVibGljfXMgb3Igbm90LiIsIHN1YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5k YXRhKCksIHRvcEZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihTdG9yYWdlQWNjZXNzU3RhdHVzOjpSZXF1aXJlc1VzZXJQcm9tcHQp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAg ICAgaWYgKHVzZXJXYXNQcm9tcHRlZEVhcmxpZXIgPT0gU3RvcmFnZUFjY2Vzc1Byb21wdFdhc1No b3duOjpZZXMpCi0gICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxl ZCgpLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJTdG9yYWdlIGFjY2VzcyB3YXMgZ3Jh bnRlZCB0byAle3B1YmxpY31zIHVuZGVyICV7cHVibGljfXMuIiwgc3ViRnJhbWVEb21haW4uc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEo KSk7Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFi bGVkKCksIElUUERlYnVnLCAiU3RvcmFnZSBhY2Nlc3Mgd2FzIGdyYW50ZWQgdG8gJXtwdWJsaWN9 cyB1bmRlciAle3B1YmxpY31zLiIsIHN1YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRh KCksIHRvcEZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgU1FMaXRl U3RhdGVtZW50IGluY3JlbWVudFN0b3JhZ2VBY2Nlc3MobV9kYXRhYmFzZSwgbWFrZVN0cmluZygi VVBEQVRFIE9ic2VydmVkRG9tYWlucyBTRVQgdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRv U3RvcmFnZUFjY2Vzc0FQSSA9IHRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VB Y2Nlc3NBUEkgKyAxIFdIRVJFIGRvbWFpbklEID0gIiwgU3RyaW5nOjpudW1iZXIoc3ViRnJhbWVT dGF0dXMuc2Vjb25kKSkpOwogICAgIGlmIChpbmNyZW1lbnRTdG9yYWdlQWNjZXNzLnByZXBhcmUo KSAhPSBTUUxJVEVfT0sKQEAgLTgwOCw5ICs4MDAsNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRp c3RpY3NEYXRhYmFzZVN0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKERvbWFp bgogICAgIGlmIChjb29raWVUcmVhdG1lbnRGb3JPcmlnaW4oZG9tYWluSW5OZWVkT2ZTdG9yYWdl QWNjZXNzKSAhPSBDb29raWVUcmVhdG1lbnRSZXN1bHQ6OkFsbG93KQogICAgICAgICByZXR1cm47 CiAKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRl YnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiW1RlbXBv cmFyeSBjb21iYXRpYmlsaXR5IGZpeF0gU3RvcmFnZSBhY2Nlc3Mgd2FzIGdyYW50ZWQgZm9yICV7 cHVibGljfXMgdW5kZXIgb3BlbmVyIHBhZ2UgZnJvbSAle3B1YmxpY31zLCB3aXRoIHVzZXIgaW50 ZXJhY3Rpb24gaW4gdGhlIG9wZW5lZCB3aW5kb3cuIiwgZG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNj ZXNzLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG9wZW5lckRvbWFpbi5zdHJpbmcoKS51dGY4KCku ZGF0YSgpKTsKLSNlbmRpZgorICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5h YmxlZCgpLCBJVFBEZWJ1ZywgIltUZW1wb3JhcnkgY29tYmF0aWJpbGl0eSBmaXhdIFN0b3JhZ2Ug YWNjZXNzIHdhcyBncmFudGVkIGZvciAle3B1YmxpY31zIHVuZGVyIG9wZW5lciBwYWdlIGZyb20g JXtwdWJsaWN9cywgd2l0aCB1c2VyIGludGVyYWN0aW9uIGluIHRoZSBvcGVuZWQgd2luZG93LiIs IGRvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2Vzcy5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBvcGVu ZXJEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgZ3JhbnRTdG9yYWdlQWNjZXNz SW50ZXJuYWwoV1RGTW92ZShkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3MpLCBXVEZNb3ZlKG9w ZW5lckRvbWFpbiksIFdURjo6bnVsbG9wdCwgb3BlbmVyUGFnZUlELCBTdG9yYWdlQWNjZXNzUHJv bXB0V2FzU2hvd246Ok5vLCBbXShTdG9yYWdlQWNjZXNzV2FzR3JhbnRlZCkgeyB9KTsKIH0KIApA QCAtODg3LDkgKzg3Nyw3IEBAIFZlY3RvcjxSZWdpc3RyYWJsZURvbWFpbj4gUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmVuc3VyZVByZXZhbGVudFJlCiAgICAgICAgIGVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclJlZ2lzdHJhYmxlRG9tYWluKGRlYnVnTWFudWFsUHJldmFs ZW50UmVzb3VyY2UoKSk7CiAgICAgICAgIHNldFByZXZhbGVudFJlc291cmNlKGRlYnVnTWFudWFs UHJldmFsZW50UmVzb3VyY2UoKSwgUmVzb3VyY2VMb2FkUHJldmFsZW5jZTo6SGlnaCk7CiAgICAg ICAgIHByaW1hcnlEb21haW5zVG9CbG9jay51bmNoZWNrZWRBcHBlbmQoZGVidWdNYW51YWxQcmV2 YWxlbnRSZXNvdXJjZSgpKTsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgUkVM RUFTRV9MT0dfSU5GTyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJEaWQgc2V0ICV7cHVi bGljfXMgYXMgcHJldmFsZW50IHJlc291cmNlIGZvciB0aGUgcHVycG9zZXMgb2YgSVRQIERlYnVn IE1vZGUuIiwgZGVidWdNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSgpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwotI2VuZGlmCisgICAgICAgIFJFTEVBU0VfTE9HX0lORk8oSVRQRGVidWcsICJEaWQg c2V0ICV7cHVibGljfXMgYXMgcHJldmFsZW50IHJlc291cmNlIGZvciB0aGUgcHVycG9zZXMgb2Yg SVRQIERlYnVnIE1vZGUuIiwgZGVidWdNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KIAogICAgIHJldHVybiBwcmltYXJ5RG9tYWluc1RvQmxv Y2s7CkBAIC0xNDAwLDkgKzEzODgsNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRh YmFzZVN0b3JlOjp1cGRhdGVDb29raWVCbG9ja2luZyhDb21wbGV0aW9uSGFuZGxlcgogICAgICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgICAgICAgICAgICAgaWYgKCF3ZWFr VGhpcykKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotI2lmICFSRUxFQVNFX0xPR19ESVNB QkxFRAotICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYod2Vha1RoaXMtPmRlYnVn TG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiRG9uZSB1cGRh dGluZyBjb29raWUgYmxvY2tpbmcuIik7Ci0jZW5kaWYKKyAgICAgICAgICAgICAgICBSRUxFQVNF X0xPR19JTkZPX0lGKHdlYWtUaGlzLT5kZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERlYnVnLCAi RG9uZSB1cGRhdGluZyBjb29raWUgYmxvY2tpbmcuIik7CiAgICAgICAgICAgICB9KTsKICAgICAg ICAgfSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz TWVtb3J5U3RvcmUuY3BwCmluZGV4IGI4ZWUwOTU3OGEzMDY0ZWU4ZTYzZmZhMjc3YmM1MTgyYzg3 MjBjMjYuLjgyMTM0ZmU3NmQ3MGUzY2Y1MDgyMDlhMTkxY2NlNDRlMDk0YjU3N2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwCkBAIC0y MzAsMzQgKzIzMCwyNiBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6 cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoU3ViRnJhbWVEb21haW4mJiBzdQogCiAgICAgYXV0byYgc3Vi RnJhbWVTdGF0aXN0aWMgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JSZWdpc3RyYWJsZURv bWFpbihzdWJGcmFtZURvbWFpbik7CiAgICAgaWYgKHNob3VsZEJsb2NrQW5kUHVyZ2VDb29raWVz KHN1YkZyYW1lU3RhdGlzdGljKSkgewotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAg ICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RlYnVnLCAiQ2Fubm90IGdyYW50IHN0b3JhZ2UgYWNjZXNzIHRvICV7cHVibGlj fXMgc2luY2UgaXRzIGNvb2tpZXMgYXJlIGJsb2NrZWQgaW4gdGhpcmQtcGFydHkgY29udGV4dHMg YW5kIGl0IGhhcyBub3QgcmVjZWl2ZWQgdXNlciBpbnRlcmFjdGlvbiBhcyBmaXJzdC1wYXJ0eS4i LCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSNlbmRpZgorICAgICAg ICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgSVRQRGVidWcsICJD YW5ub3QgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyBzaW5jZSBpdHMgY29va2ll cyBhcmUgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cyBhbmQgaXQgaGFzIG5vdCByZWNl aXZlZCB1c2VyIGludGVyYWN0aW9uIGFzIGZpcnN0LXBhcnR5LiIsIHN1YkZyYW1lRG9tYWluLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihTdG9yYWdl QWNjZXNzU3RhdHVzOjpDYW5ub3RSZXF1ZXN0QWNjZXNzKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAogICAgIGlmICghc2hvdWxkQmxvY2tBbmRLZWVwQ29va2llcyhzdWJGcmFtZVN0YXRpc3Rp YykpIHsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgUkVMRUFTRV9MT0dfSU5G T19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Zywg Ik5vIG5lZWQgdG8gZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyBzaW5jZSBpdHMg Y29va2llcyBhcmUgbm90IGJsb2NrZWQgaW4gdGhpcmQtcGFydHkgY29udGV4dHMuIiwgc3ViRnJh bWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFT RV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERlYnVnLCAiTm8gbmVlZCB0 byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHNpbmNlIGl0cyBjb29raWVzIGFy ZSBub3QgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cy4iLCBzdWJGcmFtZURvbWFpbi5z dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoU3RvcmFn ZUFjY2Vzc1N0YXR1czo6SGFzQWNjZXNzKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAg IGF1dG8gdXNlcldhc1Byb21wdGVkRWFybGllciA9IGhhc1VzZXJHcmFudGVkU3RvcmFnZUFjY2Vz c1Rocm91Z2hQcm9tcHQoc3ViRnJhbWVTdGF0aXN0aWMsIHRvcEZyYW1lRG9tYWluKTsKICAgICBp ZiAodXNlcldhc1Byb21wdGVkRWFybGllciA9PSBTdG9yYWdlQWNjZXNzUHJvbXB0V2FzU2hvd246 Ok5vKSB7Ci0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0gICAgICAgIFJFTEVBU0VfTE9HX0lO Rk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcs ICJBYm91dCB0byBhc2sgdGhlIHVzZXIgd2hldGhlciB0aGV5IHdhbnQgdG8gZ3JhbnQgc3RvcmFn ZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyB1bmRlciAle3B1YmxpY31zIG9yIG5vdC4iLCBzdWJGcmFt ZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0b3BGcmFtZURvbWFpbi5zdHJpbmcoKS51 dGY4KCkuZGF0YSgpKTsKLSNlbmRpZgorICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVn TG9nZ2luZ0VuYWJsZWQoKSwgSVRQRGVidWcsICJBYm91dCB0byBhc2sgdGhlIHVzZXIgd2hldGhl ciB0aGV5IHdhbnQgdG8gZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyB1bmRlciAl e3B1YmxpY31zIG9yIG5vdC4iLCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgp LCB0b3BGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoU3RvcmFnZUFjY2Vzc1N0YXR1czo6UmVxdWlyZXNVc2VyUHJvbXB0KTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIGlm ICh1c2VyV2FzUHJvbXB0ZWRFYXJsaWVyID09IFN0b3JhZ2VBY2Nlc3NQcm9tcHRXYXNTaG93bjo6 WWVzKQotICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwg UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiU3RvcmFnZSBhY2Nlc3Mgd2FzIGdyYW50ZWQg dG8gJXtwdWJsaWN9cyB1bmRlciAle3B1YmxpY31zLiIsIHN1YkZyYW1lRG9tYWluLnN0cmluZygp LnV0ZjgoKS5kYXRhKCksIHRvcEZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwot I2VuZGlmCisgICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgp LCBJVFBEZWJ1ZywgIlN0b3JhZ2UgYWNjZXNzIHdhcyBncmFudGVkIHRvICV7cHVibGljfXMgdW5k ZXIgJXtwdWJsaWN9cy4iLCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0 b3BGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAogICAgIHN1YkZyYW1lU3Rh dGlzdGljLnRpbWVzQWNjZXNzZWRBc0ZpcnN0UGFydHlEdWVUb1N0b3JhZ2VBY2Nlc3NBUEkrKzsK IApAQCAtMjgxLDkgKzI3Myw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0 b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKERvbWFpbkluCiAgICAgaWYgKCFj b29raWVzQmxvY2tlZEFuZFB1cmdlZCAmJiAhc2hvdWxkQmxvY2tBbmRLZWVwQ29va2llcyhkb21h aW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3NTdGF0aXN0aWMpKQogICAgICAgICByZXR1cm47CiAKLSNp ZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9n Z2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiW1RlbXBvcmFyeSBj b21iYXRpYmlsaXR5IGZpeF0gU3RvcmFnZSBhY2Nlc3Mgd2FzIGdyYW50ZWQgZm9yICV7cHVibGlj fXMgdW5kZXIgb3BlbmVyIHBhZ2UgZnJvbSAle3B1YmxpY31zLCB3aXRoIHVzZXIgaW50ZXJhY3Rp b24gaW4gdGhlIG9wZW5lZCB3aW5kb3cuIiwgZG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNjZXNzLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCksIG9wZW5lckRvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKLSNlbmRpZgorICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgp LCBJVFBEZWJ1ZywgIltUZW1wb3JhcnkgY29tYmF0aWJpbGl0eSBmaXhdIFN0b3JhZ2UgYWNjZXNz IHdhcyBncmFudGVkIGZvciAle3B1YmxpY31zIHVuZGVyIG9wZW5lciBwYWdlIGZyb20gJXtwdWJs aWN9cywgd2l0aCB1c2VyIGludGVyYWN0aW9uIGluIHRoZSBvcGVuZWQgd2luZG93LiIsIGRvbWFp bkluTmVlZE9mU3RvcmFnZUFjY2Vzcy5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBvcGVuZXJEb21h aW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgZ3JhbnRTdG9yYWdlQWNjZXNzSW50ZXJu YWwoV1RGTW92ZShkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3MpLCBXVEZNb3ZlKG9wZW5lckRv bWFpbiksIFdURjo6bnVsbG9wdCwgb3BlbmVyUGFnZUlELCBTdG9yYWdlQWNjZXNzUHJvbXB0V2Fz U2hvd246Ok5vLCBbXShTdG9yYWdlQWNjZXNzV2FzR3JhbnRlZCkgeyB9KTsKIH0KIApAQCAtMzQ4 LDkgKzMzOCw3IEBAIFZlY3RvcjxSZWdpc3RyYWJsZURvbWFpbj4gUmVzb3VyY2VMb2FkU3RhdGlz dGljc01lbW9yeVN0b3JlOjplbnN1cmVQcmV2YWxlbnRSZXNvCiAgICAgICAgIGF1dG8mIG1hbnVh bFJlc291cmNlU3RhdGlzdGljID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVnaXN0cmFi bGVEb21haW4oZGVidWdNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSgpKTsKICAgICAgICAgc2V0UHJl dmFsZW50UmVzb3VyY2UobWFudWFsUmVzb3VyY2VTdGF0aXN0aWMsIFJlc291cmNlTG9hZFByZXZh bGVuY2U6OkhpZ2gpOwogICAgICAgICBkb21haW5zVG9CbG9jay51bmNoZWNrZWRBcHBlbmQoZGVi dWdNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSgpKTsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQK LSAgICAgICAgUkVMRUFTRV9MT0dfSU5GTyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJE aWQgc2V0ICV7cHVibGljfXMgYXMgcHJldmFsZW50IHJlc291cmNlIGZvciB0aGUgcHVycG9zZXMg b2YgSVRQIERlYnVnIE1vZGUuIiwgZGVidWdNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSgpLnN0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpOwotI2VuZGlmCisgICAgICAgIFJFTEVBU0VfTE9HX0lORk8oSVRQ RGVidWcsICJEaWQgc2V0ICV7cHVibGljfXMgYXMgcHJldmFsZW50IHJlc291cmNlIGZvciB0aGUg cHVycG9zZXMgb2YgSVRQIERlYnVnIE1vZGUuIiwgZGVidWdNYW51YWxQcmV2YWxlbnRSZXNvdXJj ZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KICAgICAKICAgICByZXR1cm4gZG9t YWluc1RvQmxvY2s7CkBAIC03NzIsOSArNzYwLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWVtb3J5U3RvcmU6OnVwZGF0ZUNvb2tpZUJsb2NraW5nKENvbXBsZXRpb25IYW5kbGVyPHYK ICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogICAgICAgICAgICAgICAgIGlm ICghd2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSNpZiAhUkVMRUFTRV9M T0dfRElTQUJMRUQKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKHdlYWtUaGlz LT5kZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkRv bmUgdXBkYXRpbmcgY29va2llIGJsb2NraW5nLiIpOwotI2VuZGlmCisgICAgICAgICAgICAgICAg UkVMRUFTRV9MT0dfSU5GT19JRih3ZWFrVGhpcy0+ZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBJVFBE ZWJ1ZywgIkRvbmUgdXBkYXRpbmcgY29va2llIGJsb2NraW5nLiIpOwogICAgICAgICAgICAgfSk7 CiAgICAgICAgIH0pOwogICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAppbmRleCBmODA3OGIzMDgzZDU3YTZmN2I0MTY1MmRkYWJmYTUzN2I4MmVkMDcy Li43Nzg1MWFiMWE4ZGUzZjRkZmFlNGM3ZWRlNDVmYzE0ZDQ2ZGM3NmU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNTMsNyArNTMsNiBAQCBjb25z dGV4cHIgU2Vjb25kcyBtaW5pbXVtU3RhdGlzdGljc1Byb2Nlc3NpbmdJbnRlcnZhbCB7IDVfcyB9 OwogY29uc3RleHByIHVuc2lnbmVkIG9wZXJhdGluZ0RhdGVzV2luZG93TG9uZyB7IDMwIH07CiBj b25zdGV4cHIgdW5zaWduZWQgb3BlcmF0aW5nRGF0ZXNXaW5kb3dTaG9ydCB7IDcgfTsKIAotI2lm ICFSRUxFQVNFX0xPR19ESVNBQkxFRAogc3RhdGljIFN0cmluZyBkb21haW5zVG9TdHJpbmcoY29u c3QgVmVjdG9yPFJlZ2lzdHJhYmxlRG9tYWluPiYgZG9tYWlucykKIHsKICAgICBTdHJpbmdCdWls ZGVyIGJ1aWxkZXI7CkBAIC04Niw3ICs4NSw2IEBAIHN0YXRpYyBTdHJpbmcgZG9tYWluc1RvU3Ry aW5nKGNvbnN0IEhhc2hNYXA8UmVnaXN0cmFibGVEb21haW4sIFdlYnNpdGVEYXRhVG9SZW1vCiAg ICAgfQogICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7CiB9Ci0jZW5kaWYKIAogT3BlcmF0 aW5nRGF0ZSBPcGVyYXRpbmdEYXRlOjpmcm9tV2FsbFRpbWUoV2FsbFRpbWUgdGltZSkKIHsKQEAg LTIwMSw5ICsxOTksNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVtb3Zl RGF0YVJlY29yZHMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBSRUxFQVNFX0xPR19JTkZP X0lGKG1fZGVidWdMb2dnaW5nRW5hYmxlZCwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAi QWJvdXQgdG8gcmVtb3ZlIGRhdGEgcmVjb3JkcyBmb3IgJXtwdWJsaWN9cy4iLCBkb21haW5zVG9T dHJpbmcoZG9tYWluc1RvUmVtb3ZlV2Vic2l0ZURhdGFGb3IpLnV0ZjgoKS5kYXRhKCkpOwotI2Vu ZGlmCisgICAgUkVMRUFTRV9MT0dfSU5GT19JRihtX2RlYnVnTG9nZ2luZ0VuYWJsZWQsIElUUERl YnVnLCAiQWJvdXQgdG8gcmVtb3ZlIGRhdGEgcmVjb3JkcyBmb3IgJXtwdWJsaWN9cy4iLCBkb21h aW5zVG9TdHJpbmcoZG9tYWluc1RvUmVtb3ZlV2Vic2l0ZURhdGFGb3IpLnV0ZjgoKS5kYXRhKCkp OwogCiAgICAgc2V0RGF0YVJlY29yZHNCZWluZ1JlbW92ZWQodHJ1ZSk7CiAKQEAgLTIyMyw5ICsy MTksNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVtb3ZlRGF0YVJlY29y ZHMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmCiAgICAgICAgICAgICAgICAgd2Vha1RoaXMt PnNldERhdGFSZWNvcmRzQmVpbmdSZW1vdmVkKGZhbHNlKTsKICAgICAgICAgICAgICAgICB3ZWFr VGhpcy0+bV9zdG9yZS50cnlEdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpOwogICAgICAgICAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7Ci0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0g ICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRih3ZWFrVGhpcy0+bV9kZWJ1Z0xvZ2dp bmdFbmFibGVkLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJEb25lIHJlbW92aW5nIGRh dGEgcmVjb3Jkcy4iKTsKLSNlbmRpZgorICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lORk9f SUYod2Vha1RoaXMtPm1fZGVidWdMb2dnaW5nRW5hYmxlZCwgSVRQRGVidWcsICJEb25lIHJlbW92 aW5nIGRhdGEgcmVjb3Jkcy4iKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICB9 KTsKQEAgLTI4NywxMCArMjgxLDggQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUoYm9vbCBlbmFibGUKIHsKICAgICBB U1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAog ICAgIGlmIChlbmFibGUpCi0gICAgICAgIFJFTEVBU0VfTE9HX0lORk8oUmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RlYnVnLCAiVHVybmVkIElUUCBEZWJ1ZyBNb2RlIG9uLiIpOwotI2VuZGlmCisgICAg ICAgIFJFTEVBU0VfTE9HX0lORk8oSVRQRGVidWcsICJUdXJuZWQgSVRQIERlYnVnIE1vZGUgb24u Iik7CiAKICAgICBtX2RlYnVnTW9kZUVuYWJsZWQgPSBlbmFibGU7CiAgICAgbV9kZWJ1Z0xvZ2dp bmdFbmFibGVkID0gZW5hYmxlOwpAQCAtNTc3LDEzICs1NjksMTIgQEAgdm9pZCBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmU6OmRpZENyZWF0ZU5ldHdvcmtQcm9jZXNzKCkKIAogdm9pZCBSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmRlYnVnTG9nRG9tYWluc0luQmF0Y2hlcyhjb25zdCBj aGFyKiBhY3Rpb24sIGNvbnN0IFZlY3RvcjxSZWdpc3RyYWJsZURvbWFpbj4mIGRvbWFpbnMpCiB7 Ci0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgc3RhdGljIGNvbnN0IGF1dG8gbWF4TnVt YmVyT2ZEb21haW5zSW5PbmVMb2dTdGF0ZW1lbnQgPSA1MDsKICAgICBpZiAoZG9tYWlucy5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBpZiAoZG9tYWlucy5zaXplKCkgPD0g bWF4TnVtYmVyT2ZEb21haW5zSW5PbmVMb2dTdGF0ZW1lbnQpIHsKLSAgICAgICAgUkVMRUFTRV9M T0dfSU5GTyhSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJBYm91dCB0byAle3B1YmxpY31z IGNvb2tpZXMgaW4gdGhpcmQtcGFydHkgY29udGV4dHMgZm9yOiAle3B1YmxpY31zLiIsIGFjdGlv biwgZG9tYWluc1RvU3RyaW5nKGRvbWFpbnMpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBSRUxF QVNFX0xPR19JTkZPKElUUERlYnVnLCAiQWJvdXQgdG8gJXtwdWJsaWN9cyBjb29raWVzIGluIHRo aXJkLXBhcnR5IGNvbnRleHRzIGZvcjogJXtwdWJsaWN9cy4iLCBhY3Rpb24sIGRvbWFpbnNUb1N0 cmluZyhkb21haW5zKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAg ICAKQEAgLTU5NCwxOCArNTg1LDE0IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpkZWJ1Z0xvZ0RvbWFpbnNJbkJhdGNoZXMoY29uc3QgY2hhciogYWN0aW9uLCBjCiAgICAgCiAg ICAgZm9yIChhdXRvJiBkb21haW4gOiBkb21haW5zKSB7CiAgICAgICAgIGlmIChiYXRjaC5zaXpl KCkgPT0gbWF4TnVtYmVyT2ZEb21haW5zSW5PbmVMb2dTdGF0ZW1lbnQpIHsKLSAgICAgICAgICAg IFJFTEVBU0VfTE9HX0lORk8oUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiQWJvdXQgdG8g JXtwdWJsaWN9cyBjb29raWVzIGluIHRoaXJkLXBhcnR5IGNvbnRleHRzIGZvciAoJXtwdWJsaWN9 ZCBvZiAldSk6ICV7cHVibGljfXMuIiwgYWN0aW9uLCBiYXRjaE51bWJlciwgbnVtYmVyT2ZCYXRj aGVzLCBkb21haW5zVG9TdHJpbmcoYmF0Y2gpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAg UkVMRUFTRV9MT0dfSU5GTyhJVFBEZWJ1ZywgIkFib3V0IHRvICV7cHVibGljfXMgY29va2llcyBp biB0aGlyZC1wYXJ0eSBjb250ZXh0cyBmb3IgKCV7cHVibGljfWQgb2YgJXUpOiAle3B1YmxpY31z LiIsIGFjdGlvbiwgYmF0Y2hOdW1iZXIsIG51bWJlck9mQmF0Y2hlcywgZG9tYWluc1RvU3RyaW5n KGJhdGNoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgICAgIGJhdGNoLnNocmluaygwKTsKICAg ICAgICAgICAgICsrYmF0Y2hOdW1iZXI7CiAgICAgICAgIH0KICAgICAgICAgYmF0Y2guYXBwZW5k KGRvbWFpbik7CiAgICAgfQogICAgIGlmICghYmF0Y2guaXNFbXB0eSgpKQotICAgICAgICBSRUxF QVNFX0xPR19JTkZPKFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkFib3V0IHRvICV7cHVi bGljfXMgY29va2llcyBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cyBmb3IgKCV7cHVibGljfWQgb2Yg JXUpOiAle3B1YmxpY31zLiIsIGFjdGlvbiwgYmF0Y2hOdW1iZXIsIG51bWJlck9mQmF0Y2hlcywg ZG9tYWluc1RvU3RyaW5nKGJhdGNoKS51dGY4KCkuZGF0YSgpKTsKLSNlbHNlCi0gICAgVU5VU0VE X1BBUkFNKGFjdGlvbik7Ci0gICAgVU5VU0VEX1BBUkFNKGRvbWFpbnMpOwotI2VuZGlmCisgICAg ICAgIFJFTEVBU0VfTE9HX0lORk8oSVRQRGVidWcsICJBYm91dCB0byAle3B1YmxpY31zIGNvb2tp ZXMgaW4gdGhpcmQtcGFydHkgY29udGV4dHMgZm9yICgle3B1YmxpY31kIG9mICV1KTogJXtwdWJs aWN9cy4iLCBhY3Rpb24sIGJhdGNoTnVtYmVyLCBudW1iZXJPZkJhdGNoZXMsIGRvbWFpbnNUb1N0 cmluZyhiYXRjaCkudXRmOCgpLmRhdGEoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCBjY2Y0Yzc4MmYxNDMwZTNlMjVkMDU4YzYxYzVl MDZjMWNiNmVkNjExLi5kODM4ZTMwM2FlN2MxOTI1MzE0NDRiY2ZkYjBhMDIzYzFmZmNkNzE5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaApAQCAtNTUsNiArNTUsNyBAQCBleHRlcm4gIkMiIHsK ICAgICBNKEljb25EYXRhYmFzZSkgXAogICAgIE0oSW5kZXhlZERCKSBcCiAgICAgTShJUEMpIFwK KyAgICBNKElUUERlYnVnKSBcCiAgICAgTShLZXlIYW5kbGluZykgXAogICAgIE0oTGF5ZXJzKSBc CiAgICAgTShMYXlvdXQpIFwKQEAgLTc3LDcgKzc4LDYgQEAgZXh0ZXJuICJDIiB7CiAgICAgTShS ZW1vdGVMYXllclRyZWUpIFwKICAgICBNKFJlc2l6ZSkgXAogICAgIE0oUmVzb3VyY2VMb2FkU3Rh dGlzdGljcykgXAotICAgIE0oUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnKSBcCiAgICAgTShT Y3JvbGxpbmcpIFwKICAgICBNKFNlbGVjdGlvbikgXAogICAgIE0oU2VydmljZVdvcmtlcikgXAo= 372357 2019-06-18 11:49:15 -0700 2019-06-18 13:22:46 -0700 Patch bug-198970-20190618114914.patch text/plain 18504 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI0NDVhOGVhNTcxZTczZjJi ZjQwNjFlM2I3Y2RiMjBmNDNlYWM4MDguLjEyZTBlODBhODZlODdhYTdmODkwNWY1MmVlMTQ3YzIw NTYxYWUxOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDYtMTggIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlIGxvZyBjaGFubmVs IG5hbWUgZnJvbSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcgdG8gSVRQRGVidWcgYW5kIHJl bW92ZSB1bm5lY2Vzc2FyeSAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg5NzAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUxODU1ODM2PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0u CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3NEYXRhYmFzZVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RhdGFiYXNlU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdl YktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnJlcXVlc3RTdG9yYWdl QWNjZXNzVW5kZXJPcGVuZXIpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGF0YWJhc2VTdG9yZTo6ZW5zdXJlUHJldmFsZW50UmVzb3VyY2VzRm9yRGVidWdNb2RlKToK KyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnVw ZGF0ZUNvb2tpZUJsb2NraW5nKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3Mp OgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OnJl cXVlc3RTdG9yYWdlQWNjZXNzVW5kZXJPcGVuZXIpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmU6OmVuc3VyZVByZXZhbGVudFJlc291cmNlc0ZvckRl YnVnTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZTo6dXBkYXRlQ29va2llQmxvY2tpbmcpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6ZG9tYWluc1RvU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpyZW1vdmVEYXRhUmVjb3Jkcyk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZGVidWdMb2dE b21haW5zSW5CYXRjaGVzKToKKyAgICAgICAgKiBQbGF0Zm9ybS9Mb2dnaW5nLmg6CisKIDIwMTkt MDYtMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg RXhwb3NlIERhdGFEZXRlY3RvcnMgY29udGV4dCBnZW5lcmF0aW9uIG9uIFdLQ29udGVudFZpZXdJ bnRlcmFjdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFz c2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YWJhc2VTdG9yZS5jcHAKaW5kZXggYjY4OWMzZTI1YWQ4MjNlY2Y2ZDMwNGVlNzg5Y2E5ZjM0NWRh MmQ0Mi4uM2MyZWNkNWJjOGNlNTg2OWY0MGI2YzQzNmJiNWRkMTNlNjc0NzY1ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCkBA IC03NTEsMTYgKzc1MSwxMiBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0 b3JlOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhTdWJGcmFtZURvbWFpbiYmCiAKICAgICBzd2l0Y2gg KGNvb2tpZVRyZWF0bWVudEZvck9yaWdpbihzdWJGcmFtZURvbWFpbikpIHsKICAgICBjYXNlIENv b2tpZVRyZWF0bWVudFJlc3VsdDo6QmxvY2tBbmRQdXJnZTogewotI2lmICFSRUxFQVNFX0xPR19E SVNBQkxFRAotICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQo KSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiQ2Fubm90IGdyYW50IHN0b3JhZ2UgYWNj ZXNzIHRvICV7cHVibGljfXMgc2luY2UgaXRzIGNvb2tpZXMgYXJlIGJsb2NrZWQgaW4gdGhpcmQt cGFydHkgY29udGV4dHMgYW5kIGl0IGhhcyBub3QgcmVjZWl2ZWQgdXNlciBpbnRlcmFjdGlvbiBh cyBmaXJzdC1wYXJ0eS4iLCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK LSNlbmRpZgorICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQo KSwgSVRQRGVidWcsICJDYW5ub3QgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9cyBz aW5jZSBpdHMgY29va2llcyBhcmUgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cyBhbmQg aXQgaGFzIG5vdCByZWNlaXZlZCB1c2VyIGludGVyYWN0aW9uIGFzIGZpcnN0LXBhcnR5LiIsIHN1 YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBjb21wbGV0aW9u SGFuZGxlcihTdG9yYWdlQWNjZXNzU3RhdHVzOjpDYW5ub3RSZXF1ZXN0QWNjZXNzKTsKICAgICAg ICAgfQogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDb29raWVUcmVhdG1lbnRSZXN1bHQ6OkJs b2NrQW5kS2VlcDogewotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICBSRUxFQVNF X0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RlYnVnLCAiTm8gbmVlZCB0byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHNp bmNlIGl0cyBjb29raWVzIGFyZSBub3QgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cy4i LCBzdWJGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSNlbmRpZgorICAgICAg ICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgSVRQRGVidWcsICJO byBuZWVkIHRvIGdyYW50IHN0b3JhZ2UgYWNjZXNzIHRvICV7cHVibGljfXMgc2luY2UgaXRzIGNv b2tpZXMgYXJlIG5vdCBibG9ja2VkIGluIHRoaXJkLXBhcnR5IGNvbnRleHRzLiIsIHN1YkZyYW1l RG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihTdG9yYWdlQWNjZXNzU3RhdHVzOjpIYXNBY2Nlc3MpOwogICAgICAgICB9CiAgICAgICAgIHJl dHVybjsKQEAgLTc3MSwxNyArNzY3LDEzIEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rh dGFiYXNlU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKFN1YkZyYW1lRG9tYWluJiYKIAogICAg IGF1dG8gdXNlcldhc1Byb21wdGVkRWFybGllciA9IGhhc1VzZXJHcmFudGVkU3RvcmFnZUFjY2Vz c1Rocm91Z2hQcm9tcHQoc3ViRnJhbWVTdGF0dXMuc2Vjb25kLCB0b3BGcmFtZURvbWFpbik7CiAg ICAgaWYgKHVzZXJXYXNQcm9tcHRlZEVhcmxpZXIgPT0gU3RvcmFnZUFjY2Vzc1Byb21wdFdhc1No b3duOjpObykgewotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICBSRUxFQVNFX0xP R19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Rl YnVnLCAiQWJvdXQgdG8gYXNrIHRoZSB1c2VyIHdoZXRoZXIgdGhleSB3YW50IHRvIGdyYW50IHN0 b3JhZ2UgYWNjZXNzIHRvICV7cHVibGljfXMgdW5kZXIgJXtwdWJsaWN9cyBvciBub3QuIiwgc3Vi RnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihk ZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERlYnVnLCAiQWJvdXQgdG8gYXNrIHRoZSB1c2VyIHdo ZXRoZXIgdGhleSB3YW50IHRvIGdyYW50IHN0b3JhZ2UgYWNjZXNzIHRvICV7cHVibGljfXMgdW5k ZXIgJXtwdWJsaWN9cyBvciBub3QuIiwgc3ViRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRh dGEoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKFN0b3JhZ2VBY2Nlc3NTdGF0dXM6OlJlcXVpcmVzVXNlclByb21wdCk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAg ICBpZiAodXNlcldhc1Byb21wdGVkRWFybGllciA9PSBTdG9yYWdlQWNjZXNzUHJvbXB0V2FzU2hv d246OlllcykKLSAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVk KCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIlN0b3JhZ2UgYWNjZXNzIHdhcyBncmFu dGVkIHRvICV7cHVibGljfXMgdW5kZXIgJXtwdWJsaWN9cy4iLCBzdWJGcmFtZURvbWFpbi5zdHJp bmcoKS51dGY4KCkuZGF0YSgpLCB0b3BGcmFtZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKLSNlbmRpZgorICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJs ZWQoKSwgSVRQRGVidWcsICJTdG9yYWdlIGFjY2VzcyB3YXMgZ3JhbnRlZCB0byAle3B1YmxpY31z IHVuZGVyICV7cHVibGljfXMuIiwgc3ViRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEo KSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKICAgICBTUUxpdGVT dGF0ZW1lbnQgaW5jcmVtZW50U3RvcmFnZUFjY2VzcyhtX2RhdGFiYXNlLCBtYWtlU3RyaW5nKCJV UERBVEUgT2JzZXJ2ZWREb21haW5zIFNFVCB0aW1lc0FjY2Vzc2VkQXNGaXJzdFBhcnR5RHVlVG9T dG9yYWdlQWNjZXNzQVBJID0gdGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFj Y2Vzc0FQSSArIDEgV0hFUkUgZG9tYWluSUQgPSAiLCBTdHJpbmc6Om51bWJlcihzdWJGcmFtZVN0 YXR1cy5zZWNvbmQpKSk7CiAgICAgaWYgKGluY3JlbWVudFN0b3JhZ2VBY2Nlc3MucHJlcGFyZSgp ICE9IFNRTElURV9PSwpAQCAtODA4LDkgKzgwMCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlz dGljc0RhdGFiYXNlU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzVW5kZXJPcGVuZXIoRG9tYWlu CiAgICAgaWYgKGNvb2tpZVRyZWF0bWVudEZvck9yaWdpbihkb21haW5Jbk5lZWRPZlN0b3JhZ2VB Y2Nlc3MpICE9IENvb2tpZVRyZWF0bWVudFJlc3VsdDo6QWxsb3cpCiAgICAgICAgIHJldHVybjsK IAotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVi dWdMb2dnaW5nRW5hYmxlZCgpLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJbVGVtcG9y YXJ5IGNvbWJhdGliaWxpdHkgZml4XSBTdG9yYWdlIGFjY2VzcyB3YXMgZ3JhbnRlZCBmb3IgJXtw dWJsaWN9cyB1bmRlciBvcGVuZXIgcGFnZSBmcm9tICV7cHVibGljfXMsIHdpdGggdXNlciBpbnRl cmFjdGlvbiBpbiB0aGUgb3BlbmVkIHdpbmRvdy4iLCBkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nl c3Muc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgb3BlbmVyRG9tYWluLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwotI2VuZGlmCisgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFi bGVkKCksIElUUERlYnVnLCAiW1RlbXBvcmFyeSBjb21iYXRpYmlsaXR5IGZpeF0gU3RvcmFnZSBh Y2Nlc3Mgd2FzIGdyYW50ZWQgZm9yICV7cHVibGljfXMgdW5kZXIgb3BlbmVyIHBhZ2UgZnJvbSAl e3B1YmxpY31zLCB3aXRoIHVzZXIgaW50ZXJhY3Rpb24gaW4gdGhlIG9wZW5lZCB3aW5kb3cuIiwg ZG9tYWluSW5OZWVkT2ZTdG9yYWdlQWNjZXNzLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG9wZW5l ckRvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICBncmFudFN0b3JhZ2VBY2Nlc3NJ bnRlcm5hbChXVEZNb3ZlKGRvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2VzcyksIFdURk1vdmUob3Bl bmVyRG9tYWluKSwgV1RGOjpudWxsb3B0LCBvcGVuZXJQYWdlSUQsIFN0b3JhZ2VBY2Nlc3NQcm9t cHRXYXNTaG93bjo6Tm8sIFtdKFN0b3JhZ2VBY2Nlc3NXYXNHcmFudGVkKSB7IH0pOwogfQogCkBA IC04ODcsOSArODc3LDcgQEAgVmVjdG9yPFJlZ2lzdHJhYmxlRG9tYWluPiBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZW5zdXJlUHJldmFsZW50UmUKICAgICAgICAgZW5zdXJl UmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVnaXN0cmFibGVEb21haW4oZGVidWdNYW51YWxQcmV2YWxl bnRSZXNvdXJjZSgpKTsKICAgICAgICAgc2V0UHJldmFsZW50UmVzb3VyY2UoZGVidWdNYW51YWxQ cmV2YWxlbnRSZXNvdXJjZSgpLCBSZXNvdXJjZUxvYWRQcmV2YWxlbmNlOjpIaWdoKTsKICAgICAg ICAgcHJpbWFyeURvbWFpbnNUb0Jsb2NrLnVuY2hlY2tlZEFwcGVuZChkZWJ1Z01hbnVhbFByZXZh bGVudFJlc291cmNlKCkpOwotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICBSRUxF QVNFX0xPR19JTkZPKFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkRpZCBzZXQgJXtwdWJs aWN9cyBhcyBwcmV2YWxlbnQgcmVzb3VyY2UgZm9yIHRoZSBwdXJwb3NlcyBvZiBJVFAgRGVidWcg TW9kZS4iLCBkZWJ1Z01hbnVhbFByZXZhbGVudFJlc291cmNlKCkuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GTyhJVFBEZWJ1ZywgIkRpZCBz ZXQgJXtwdWJsaWN9cyBhcyBwcmV2YWxlbnQgcmVzb3VyY2UgZm9yIHRoZSBwdXJwb3NlcyBvZiBJ VFAgRGVidWcgTW9kZS4iLCBkZWJ1Z01hbnVhbFByZXZhbGVudFJlc291cmNlKCkuc3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHByaW1hcnlEb21haW5zVG9CbG9j azsKQEAgLTE0MDAsOSArMTM4OCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFi YXNlU3RvcmU6OnVwZGF0ZUNvb2tpZUJsb2NraW5nKENvbXBsZXRpb25IYW5kbGVyCiAgICAgICAg ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKICAgICAgICAgICAgICAgICBpZiAoIXdlYWtU aGlzKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0jaWYgIVJFTEVBU0VfTE9HX0RJU0FC TEVECi0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRih3ZWFrVGhpcy0+ZGVidWdM b2dnaW5nRW5hYmxlZCgpLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJEb25lIHVwZGF0 aW5nIGNvb2tpZSBibG9ja2luZy4iKTsKLSNlbmRpZgorICAgICAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0lORk9fSUYod2Vha1RoaXMtPmRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgSVRQRGVidWcsICJE b25lIHVwZGF0aW5nIGNvb2tpZSBibG9ja2luZy4iKTsKICAgICAgICAgICAgIH0pOwogICAgICAg ICB9KTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Q2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3RvcmUuY3BwIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NN ZW1vcnlTdG9yZS5jcHAKaW5kZXggYjhlZTA5NTc4YTMwNjRlZThlNjNmZmEyNzdiYzUxODJjODcy MGMyNi4uODIxMzRmZTc2ZDcwZTNjZjUwODIwOWExOTFjY2U0NGUwOTRiNTc3ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKQEAgLTIz MCwzNCArMjMwLDI2IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjpy ZXF1ZXN0U3RvcmFnZUFjY2VzcyhTdWJGcmFtZURvbWFpbiYmIHN1CiAKICAgICBhdXRvJiBzdWJG cmFtZVN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclJlZ2lzdHJhYmxlRG9t YWluKHN1YkZyYW1lRG9tYWluKTsKICAgICBpZiAoc2hvdWxkQmxvY2tBbmRQdXJnZUNvb2tpZXMo c3ViRnJhbWVTdGF0aXN0aWMpKSB7Ci0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECi0gICAgICAg IFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGVidWcsICJDYW5ub3QgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgdG8gJXtwdWJsaWN9 cyBzaW5jZSBpdHMgY29va2llcyBhcmUgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cyBh bmQgaXQgaGFzIG5vdCByZWNlaXZlZCB1c2VyIGludGVyYWN0aW9uIGFzIGZpcnN0LXBhcnR5LiIs IHN1YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotI2VuZGlmCisgICAgICAg IFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBJVFBEZWJ1ZywgIkNh bm5vdCBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHNpbmNlIGl0cyBjb29raWVz IGFyZSBibG9ja2VkIGluIHRoaXJkLXBhcnR5IGNvbnRleHRzIGFuZCBpdCBoYXMgbm90IHJlY2Vp dmVkIHVzZXIgaW50ZXJhY3Rpb24gYXMgZmlyc3QtcGFydHkuIiwgc3ViRnJhbWVEb21haW4uc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFN0b3JhZ2VB Y2Nlc3NTdGF0dXM6OkNhbm5vdFJlcXVlc3RBY2Nlc3MpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCiAgICAgaWYgKCFzaG91bGRCbG9ja0FuZEtlZXBDb29raWVzKHN1YkZyYW1lU3RhdGlzdGlj KSkgewotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICBSRUxFQVNFX0xPR19JTkZP X0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAi Tm8gbmVlZCB0byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHNpbmNlIGl0cyBj b29raWVzIGFyZSBub3QgYmxvY2tlZCBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cy4iLCBzdWJGcmFt ZURvbWFpbi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSNlbmRpZgorICAgICAgICBSRUxFQVNF X0xPR19JTkZPX0lGKGRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgSVRQRGVidWcsICJObyBuZWVkIHRv IGdyYW50IHN0b3JhZ2UgYWNjZXNzIHRvICV7cHVibGljfXMgc2luY2UgaXRzIGNvb2tpZXMgYXJl IG5vdCBibG9ja2VkIGluIHRoaXJkLXBhcnR5IGNvbnRleHRzLiIsIHN1YkZyYW1lRG9tYWluLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihTdG9yYWdl QWNjZXNzU3RhdHVzOjpIYXNBY2Nlc3MpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAg YXV0byB1c2VyV2FzUHJvbXB0ZWRFYXJsaWVyID0gaGFzVXNlckdyYW50ZWRTdG9yYWdlQWNjZXNz VGhyb3VnaFByb21wdChzdWJGcmFtZVN0YXRpc3RpYywgdG9wRnJhbWVEb21haW4pOwogICAgIGlm ICh1c2VyV2FzUHJvbXB0ZWRFYXJsaWVyID09IFN0b3JhZ2VBY2Nlc3NQcm9tcHRXYXNTaG93bjo6 Tm8pIHsKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgUkVMRUFTRV9MT0dfSU5G T19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Zywg IkFib3V0IHRvIGFzayB0aGUgdXNlciB3aGV0aGVyIHRoZXkgd2FudCB0byBncmFudCBzdG9yYWdl IGFjY2VzcyB0byAle3B1YmxpY31zIHVuZGVyICV7cHVibGljfXMgb3Igbm90LiIsIHN1YkZyYW1l RG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIHRvcEZyYW1lRG9tYWluLnN0cmluZygpLnV0 ZjgoKS5kYXRhKCkpOwotI2VuZGlmCisgICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdM b2dnaW5nRW5hYmxlZCgpLCBJVFBEZWJ1ZywgIkFib3V0IHRvIGFzayB0aGUgdXNlciB3aGV0aGVy IHRoZXkgd2FudCB0byBncmFudCBzdG9yYWdlIGFjY2VzcyB0byAle3B1YmxpY31zIHVuZGVyICV7 cHVibGljfXMgb3Igbm90LiIsIHN1YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCks IHRvcEZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihTdG9yYWdlQWNjZXNzU3RhdHVzOjpSZXF1aXJlc1VzZXJQcm9tcHQpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgaWYg KHVzZXJXYXNQcm9tcHRlZEVhcmxpZXIgPT0gU3RvcmFnZUFjY2Vzc1Byb21wdFdhc1Nob3duOjpZ ZXMpCi0gICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dnaW5nRW5hYmxlZCgpLCBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJTdG9yYWdlIGFjY2VzcyB3YXMgZ3JhbnRlZCB0 byAle3B1YmxpY31zIHVuZGVyICV7cHVibGljfXMuIiwgc3ViRnJhbWVEb21haW4uc3RyaW5nKCku dXRmOCgpLmRhdGEoKSwgdG9wRnJhbWVEb21haW4uc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0j ZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCks IElUUERlYnVnLCAiU3RvcmFnZSBhY2Nlc3Mgd2FzIGdyYW50ZWQgdG8gJXtwdWJsaWN9cyB1bmRl ciAle3B1YmxpY31zLiIsIHN1YkZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIHRv cEZyYW1lRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgc3ViRnJhbWVTdGF0 aXN0aWMudGltZXNBY2Nlc3NlZEFzRmlyc3RQYXJ0eUR1ZVRvU3RvcmFnZUFjY2Vzc0FQSSsrOwog CkBAIC0yODEsOSArMjczLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtb3J5U3Rv cmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzVW5kZXJPcGVuZXIoRG9tYWluSW4KICAgICBpZiAoIWNv b2tpZXNCbG9ja2VkQW5kUHVyZ2VkICYmICFzaG91bGRCbG9ja0FuZEtlZXBDb29raWVzKGRvbWFp bkluTmVlZE9mU3RvcmFnZUFjY2Vzc1N0YXRpc3RpYykpCiAgICAgICAgIHJldHVybjsKIAotI2lm ICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgIFJFTEVBU0VfTE9HX0lORk9fSUYoZGVidWdMb2dn aW5nRW5hYmxlZCgpLCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWcsICJbVGVtcG9yYXJ5IGNv bWJhdGliaWxpdHkgZml4XSBTdG9yYWdlIGFjY2VzcyB3YXMgZ3JhbnRlZCBmb3IgJXtwdWJsaWN9 cyB1bmRlciBvcGVuZXIgcGFnZSBmcm9tICV7cHVibGljfXMsIHdpdGggdXNlciBpbnRlcmFjdGlv biBpbiB0aGUgb3BlbmVkIHdpbmRvdy4iLCBkb21haW5Jbk5lZWRPZlN0b3JhZ2VBY2Nlc3Muc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSwgb3BlbmVyRG9tYWluLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkp OwotI2VuZGlmCisgICAgUkVMRUFTRV9MT0dfSU5GT19JRihkZWJ1Z0xvZ2dpbmdFbmFibGVkKCks IElUUERlYnVnLCAiW1RlbXBvcmFyeSBjb21iYXRpYmlsaXR5IGZpeF0gU3RvcmFnZSBhY2Nlc3Mg d2FzIGdyYW50ZWQgZm9yICV7cHVibGljfXMgdW5kZXIgb3BlbmVyIHBhZ2UgZnJvbSAle3B1Ymxp Y31zLCB3aXRoIHVzZXIgaW50ZXJhY3Rpb24gaW4gdGhlIG9wZW5lZCB3aW5kb3cuIiwgZG9tYWlu SW5OZWVkT2ZTdG9yYWdlQWNjZXNzLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG9wZW5lckRvbWFp bi5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICBncmFudFN0b3JhZ2VBY2Nlc3NJbnRlcm5h bChXVEZNb3ZlKGRvbWFpbkluTmVlZE9mU3RvcmFnZUFjY2VzcyksIFdURk1vdmUob3BlbmVyRG9t YWluKSwgV1RGOjpudWxsb3B0LCBvcGVuZXJQYWdlSUQsIFN0b3JhZ2VBY2Nlc3NQcm9tcHRXYXNT aG93bjo6Tm8sIFtdKFN0b3JhZ2VBY2Nlc3NXYXNHcmFudGVkKSB7IH0pOwogfQogCkBAIC0zNDgs OSArMzM4LDcgQEAgVmVjdG9yPFJlZ2lzdHJhYmxlRG9tYWluPiBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWVtb3J5U3RvcmU6OmVuc3VyZVByZXZhbGVudFJlc28KICAgICAgICAgYXV0byYgbWFudWFs UmVzb3VyY2VTdGF0aXN0aWMgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JSZWdpc3RyYWJs ZURvbWFpbihkZWJ1Z01hbnVhbFByZXZhbGVudFJlc291cmNlKCkpOwogICAgICAgICBzZXRQcmV2 YWxlbnRSZXNvdXJjZShtYW51YWxSZXNvdXJjZVN0YXRpc3RpYywgUmVzb3VyY2VMb2FkUHJldmFs ZW5jZTo6SGlnaCk7CiAgICAgICAgIGRvbWFpbnNUb0Jsb2NrLnVuY2hlY2tlZEFwcGVuZChkZWJ1 Z01hbnVhbFByZXZhbGVudFJlc291cmNlKCkpOwotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAot ICAgICAgICBSRUxFQVNFX0xPR19JTkZPKFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkRp ZCBzZXQgJXtwdWJsaWN9cyBhcyBwcmV2YWxlbnQgcmVzb3VyY2UgZm9yIHRoZSBwdXJwb3NlcyBv ZiBJVFAgRGVidWcgTW9kZS4iLCBkZWJ1Z01hbnVhbFByZXZhbGVudFJlc291cmNlKCkuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7Ci0jZW5kaWYKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GTyhJVFBE ZWJ1ZywgIkRpZCBzZXQgJXtwdWJsaWN9cyBhcyBwcmV2YWxlbnQgcmVzb3VyY2UgZm9yIHRoZSBw dXJwb3NlcyBvZiBJVFAgRGVidWcgTW9kZS4iLCBkZWJ1Z01hbnVhbFByZXZhbGVudFJlc291cmNl KCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogICAgIAogICAgIHJldHVybiBkb21h aW5zVG9CbG9jazsKQEAgLTc3Miw5ICs3NjAsNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NNZW1vcnlTdG9yZTo6dXBkYXRlQ29va2llQmxvY2tpbmcoQ29tcGxldGlvbkhhbmRsZXI8dgog ICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgICAgICAgICAgICAgaWYg KCF3ZWFrVGhpcykKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotI2lmICFSRUxFQVNFX0xP R19ESVNBQkxFRAotICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lORk9fSUYod2Vha1RoaXMt PmRlYnVnTG9nZ2luZ0VuYWJsZWQoKSwgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnLCAiRG9u ZSB1cGRhdGluZyBjb29raWUgYmxvY2tpbmcuIik7Ci0jZW5kaWYKKyAgICAgICAgICAgICAgICBS RUxFQVNFX0xPR19JTkZPX0lGKHdlYWtUaGlzLT5kZWJ1Z0xvZ2dpbmdFbmFibGVkKCksIElUUERl YnVnLCAiRG9uZSB1cGRhdGluZyBjb29raWUgYmxvY2tpbmcuIik7CiAgICAgICAgICAgICB9KTsK ICAgICAgICAgfSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmUuY3BwCmluZGV4IGY4MDc4YjMwODNkNTdhNmY3YjQxNjUyZGRhYmZhNTM3YjgyZWQwNzIu LjkyMDJmZTdmMTdlMWU5MzZkODhkZTJiOWM2YzNlNWYwNzE2OGU3NDggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmll ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC0yMDEsOSArMjAxLDcgQEAgdm9p ZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4mJgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0jaWYgIVJFTEVB U0VfTE9HX0RJU0FCTEVECi0gICAgUkVMRUFTRV9MT0dfSU5GT19JRihtX2RlYnVnTG9nZ2luZ0Vu YWJsZWQsIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkFib3V0IHRvIHJlbW92ZSBkYXRh IHJlY29yZHMgZm9yICV7cHVibGljfXMuIiwgZG9tYWluc1RvU3RyaW5nKGRvbWFpbnNUb1JlbW92 ZVdlYnNpdGVEYXRhRm9yKS51dGY4KCkuZGF0YSgpKTsKLSNlbmRpZgorICAgIFJFTEVBU0VfTE9H X0lORk9fSUYobV9kZWJ1Z0xvZ2dpbmdFbmFibGVkLCBJVFBEZWJ1ZywgIkFib3V0IHRvIHJlbW92 ZSBkYXRhIHJlY29yZHMgZm9yICV7cHVibGljfXMuIiwgZG9tYWluc1RvU3RyaW5nKGRvbWFpbnNU b1JlbW92ZVdlYnNpdGVEYXRhRm9yKS51dGY4KCkuZGF0YSgpKTsKIAogICAgIHNldERhdGFSZWNv cmRzQmVpbmdSZW1vdmVkKHRydWUpOwogCkBAIC0yMjMsOSArMjIxLDcgQEAgdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJgogICAgICAgICAgICAgICAgIHdlYWtUaGlzLT5zZXREYXRhUmVjb3Jkc0JlaW5n UmVtb3ZlZChmYWxzZSk7CiAgICAgICAgICAgICAgICAgd2Vha1RoaXMtPm1fc3RvcmUudHJ5RHVt cFJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcigpOwotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgICAgICAgICAgICAgIFJFTEVB U0VfTE9HX0lORk9fSUYod2Vha1RoaXMtPm1fZGVidWdMb2dnaW5nRW5hYmxlZCwgUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RlYnVnLCAiRG9uZSByZW1vdmluZyBkYXRhIHJlY29yZHMuIik7Ci0jZW5k aWYKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JTkZPX0lGKHdlYWtUaGlzLT5tX2RlYnVn TG9nZ2luZ0VuYWJsZWQsIElUUERlYnVnLCAiRG9uZSByZW1vdmluZyBkYXRhIHJlY29yZHMuIik7 CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAgICAgfSk7CkBAIC0yODcsMTAgKzI4Myw4 IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGVidWdNb2RlKGJvb2wgZW5hYmxlCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01h aW4oKSk7CiAKLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBpZiAoZW5hYmxlKQotICAg ICAgICBSRUxFQVNFX0xPR19JTkZPKFJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIlR1cm5l ZCBJVFAgRGVidWcgTW9kZSBvbi4iKTsKLSNlbmRpZgorICAgICAgICBSRUxFQVNFX0xPR19JTkZP KElUUERlYnVnLCAiVHVybmVkIElUUCBEZWJ1ZyBNb2RlIG9uLiIpOwogCiAgICAgbV9kZWJ1Z01v ZGVFbmFibGVkID0gZW5hYmxlOwogICAgIG1fZGVidWdMb2dnaW5nRW5hYmxlZCA9IGVuYWJsZTsK QEAgLTU3NywxMyArNTcxLDEyIEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpk aWRDcmVhdGVOZXR3b3JrUHJvY2VzcygpCiAKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpkZWJ1Z0xvZ0RvbWFpbnNJbkJhdGNoZXMoY29uc3QgY2hhciogYWN0aW9uLCBjb25zdCBW ZWN0b3I8UmVnaXN0cmFibGVEb21haW4+JiBkb21haW5zKQogewotI2lmICFSRUxFQVNFX0xPR19E SVNBQkxFRAogICAgIHN0YXRpYyBjb25zdCBhdXRvIG1heE51bWJlck9mRG9tYWluc0luT25lTG9n U3RhdGVtZW50ID0gNTA7CiAgICAgaWYgKGRvbWFpbnMuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAgICAgCiAgICAgaWYgKGRvbWFpbnMuc2l6ZSgpIDw9IG1heE51bWJlck9mRG9tYWluc0lu T25lTG9nU3RhdGVtZW50KSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lORk8oUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RlYnVnLCAiQWJvdXQgdG8gJXtwdWJsaWN9cyBjb29raWVzIGluIHRoaXJkLXBh cnR5IGNvbnRleHRzIGZvcjogJXtwdWJsaWN9cy4iLCBhY3Rpb24sIGRvbWFpbnNUb1N0cmluZyhk b21haW5zKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfSU5GTyhJVFBEZWJ1 ZywgIkFib3V0IHRvICV7cHVibGljfXMgY29va2llcyBpbiB0aGlyZC1wYXJ0eSBjb250ZXh0cyBm b3I6ICV7cHVibGljfXMuIiwgYWN0aW9uLCBkb21haW5zVG9TdHJpbmcoZG9tYWlucykudXRmOCgp LmRhdGEoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCkBAIC01OTQsMTggKzU4Nywx NCBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZGVidWdMb2dEb21haW5zSW5C YXRjaGVzKGNvbnN0IGNoYXIqIGFjdGlvbiwgYwogICAgIAogICAgIGZvciAoYXV0byYgZG9tYWlu IDogZG9tYWlucykgewogICAgICAgICBpZiAoYmF0Y2guc2l6ZSgpID09IG1heE51bWJlck9mRG9t YWluc0luT25lTG9nU3RhdGVtZW50KSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19JTkZPKFJl c291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZywgIkFib3V0IHRvICV7cHVibGljfXMgY29va2llcyBp biB0aGlyZC1wYXJ0eSBjb250ZXh0cyBmb3IgKCV7cHVibGljfWQgb2YgJXUpOiAle3B1YmxpY31z LiIsIGFjdGlvbiwgYmF0Y2hOdW1iZXIsIG51bWJlck9mQmF0Y2hlcywgZG9tYWluc1RvU3RyaW5n KGJhdGNoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lORk8oSVRQ RGVidWcsICJBYm91dCB0byAle3B1YmxpY31zIGNvb2tpZXMgaW4gdGhpcmQtcGFydHkgY29udGV4 dHMgZm9yICgle3B1YmxpY31kIG9mICV1KTogJXtwdWJsaWN9cy4iLCBhY3Rpb24sIGJhdGNoTnVt YmVyLCBudW1iZXJPZkJhdGNoZXMsIGRvbWFpbnNUb1N0cmluZyhiYXRjaCkudXRmOCgpLmRhdGEo KSk7CiAgICAgICAgICAgICBiYXRjaC5zaHJpbmsoMCk7CiAgICAgICAgICAgICArK2JhdGNoTnVt YmVyOwogICAgICAgICB9CiAgICAgICAgIGJhdGNoLmFwcGVuZChkb21haW4pOwogICAgIH0KICAg ICBpZiAoIWJhdGNoLmlzRW1wdHkoKSkKLSAgICAgICAgUkVMRUFTRV9MT0dfSU5GTyhSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGVidWcsICJBYm91dCB0byAle3B1YmxpY31zIGNvb2tpZXMgaW4gdGhp cmQtcGFydHkgY29udGV4dHMgZm9yICgle3B1YmxpY31kIG9mICV1KTogJXtwdWJsaWN9cy4iLCBh Y3Rpb24sIGJhdGNoTnVtYmVyLCBudW1iZXJPZkJhdGNoZXMsIGRvbWFpbnNUb1N0cmluZyhiYXRj aCkudXRmOCgpLmRhdGEoKSk7Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJBTShhY3Rpb24pOwotICAg IFVOVVNFRF9QQVJBTShkb21haW5zKTsKLSNlbmRpZgorICAgICAgICBSRUxFQVNFX0xPR19JTkZP KElUUERlYnVnLCAiQWJvdXQgdG8gJXtwdWJsaWN9cyBjb29raWVzIGluIHRoaXJkLXBhcnR5IGNv bnRleHRzIGZvciAoJXtwdWJsaWN9ZCBvZiAldSk6ICV7cHVibGljfXMuIiwgYWN0aW9uLCBiYXRj aE51bWJlciwgbnVtYmVyT2ZCYXRjaGVzLCBkb21haW5zVG9TdHJpbmcoYmF0Y2gpLnV0ZjgoKS5k YXRhKCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9Mb2dnaW5n LmgKaW5kZXggY2NmNGM3ODJmMTQzMGUzZTI1ZDA1OGM2MWM1ZTA2YzFjYjZlZDYxMS4uZDgzOGUz MDNhZTdjMTkyNTMxNDQ0YmNmZGIwYTAyM2MxZmZjZDcxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9QbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9Mb2dn aW5nLmgKQEAgLTU1LDYgKzU1LDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgTShJY29uRGF0YWJhc2Up IFwKICAgICBNKEluZGV4ZWREQikgXAogICAgIE0oSVBDKSBcCisgICAgTShJVFBEZWJ1ZykgXAog ICAgIE0oS2V5SGFuZGxpbmcpIFwKICAgICBNKExheWVycykgXAogICAgIE0oTGF5b3V0KSBcCkBA IC03Nyw3ICs3OCw2IEBAIGV4dGVybiAiQyIgewogICAgIE0oUmVtb3RlTGF5ZXJUcmVlKSBcCiAg ICAgTShSZXNpemUpIFwKICAgICBNKFJlc291cmNlTG9hZFN0YXRpc3RpY3MpIFwKLSAgICBNKFJl c291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1ZykgXAogICAgIE0oU2Nyb2xsaW5nKSBcCiAgICAgTShT ZWxlY3Rpb24pIFwKICAgICBNKFNlcnZpY2VXb3JrZXIpIFwK