215813 2020-08-25 09:47:58 -0700 syntax error in "DELETE FROM StorageAccessUnderTopFrameDomains" 2020-08-27 09:47:04 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney beidson bfulgham darin sihui_liu webkit-bug-importer wilander oldest_to_newest 1682679 0 katherine_cheney 2020-08-25 09:47:58 -0700 This SQLite query error has been appearing in some logging. 1682685 1 webkit-bug-importer 2020-08-25 09:58:23 -0700 <rdar://problem/67743521> 1682688 2 407202 katherine_cheney 2020-08-25 10:00:32 -0700 Created attachment 407202 Patch 1682689 3 407202 bfulgham 2020-08-25 10:14:50 -0700 Comment on attachment 407202 Patch Looks good! r=me. Do we have a test for User Interaction expiration? (seems like maybe not?) 1682692 4 katherine_cheney 2020-08-25 10:18:39 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 407202 [details] > Patch > > Looks good! r=me. > Thanks! > Do we have a test for User Interaction expiration? (seems like maybe not?) It seems like we don't have one which checks that storage access has been deleted. I filed a radar to add one: rdar://67744552. 1682743 5 ews-feeder 2020-08-25 12:24:13 -0700 Found 1 new test failure: http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-database.html 1683125 6 407336 katherine_cheney 2020-08-26 14:00:12 -0700 Created attachment 407336 Patch 1683128 7 katherine_cheney 2020-08-26 14:01:45 -0700 Looks like this error is occurring in code that should probably just be removed. Fixing the query resulted in incorrect behavior that was previously unnoticed because of the error causing an early return. 1683226 8 407336 wilander 2020-08-26 17:31:50 -0700 Comment on attachment 407336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407336&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:-2576 > - clearExpiredUserInteractions(); Since we will no longer clear expired user interactions here, won't the local variable oldestUserInteraction potentially get older than intended timestamps from mostRecentUserInteractionTime and change the if (!parameters().isRunningTest && now - oldestUserInteraction < parameters().minimumTimeBetweenDataRecordsRemoval) logic? Because oldestUserInteraction is updated before the call to shouldRemoveAllWebsiteDataFor() which in turn calls hasHadUnexpiredRecentUserInteraction(). Since the existing code was broken, I don't think we're making an actual change by removing the call to clearExpiredUserInteractions(), but we should acknowledge it in the change log at minimum. We could potentially move the oldestUserInteraction update to later in the loop so that user interaction timestamps have been clear before. 1683230 9 katherine_cheney 2020-08-26 17:48:10 -0700 (In reply to John Wilander from comment #8) > Comment on attachment 407336 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=407336&action=review > > > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:-2576 > > - clearExpiredUserInteractions(); > > Since we will no longer clear expired user interactions here, won't the > local variable oldestUserInteraction potentially get older than intended > timestamps from mostRecentUserInteractionTime and change the if > (!parameters().isRunningTest && now - oldestUserInteraction < > parameters().minimumTimeBetweenDataRecordsRemoval) logic? Because > oldestUserInteraction is updated before the call to > shouldRemoveAllWebsiteDataFor() which in turn calls > hasHadUnexpiredRecentUserInteraction(). Since the existing code was broken, > I don't think we're making an actual change by removing the call to > clearExpiredUserInteractions(), but we should acknowledge it in the change > log at minimum. We could potentially move the oldestUserInteraction update > to later in the loop so that user interaction timestamps have been clear > before. Isn't the point of that local variable to take into account that expired statistics might need a little more time for users to interact with a website before removing non-cookie website data? So shouldn't we include the expired statistics in that calculation? Potentially I am misunderstanding. 1683398 10 407410 katherine_cheney 2020-08-27 09:19:29 -0700 Created attachment 407410 Patch for landing 1683400 11 katherine_cheney 2020-08-27 09:19:55 -0700 Landing this to fix the SQLite error and because we know the code isn’t doing anything right now. I added a comment in the ChangeLog explaining why we should not clear expired statistics before setting oldestUserInteraction, it would mean that now - oldestUserInteraction would almost always be equal to now, because clearing expired statistics sets the mostRecentUserInteraction time to 0, so we would always clear non-cookie website data without giving the extra time for user interaction. 1683409 12 ews-feeder 2020-08-27 09:47:03 -0700 Committed r266237: <https://trac.webkit.org/changeset/266237> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407410. 407202 2020-08-25 10:00:32 -0700 2020-08-26 14:00:10 -0700 Patch bug-215813-20200825100031.patch text/plain 1838 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MDgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI2MDUxYzQxNzQzNDM5ODVi MmUzYjE0ZTRlNTBjZDZlZWU2NWI4N2UuLjg5MzMxNDEyNzJmMWU5YzQ5N2QyN2Q3NjFlODhjYjFi ZDdmZmJiN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDgtMjUgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgc3ludGF4IGVycm9y IGluICJERUxFVEUgRlJPTSBTdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZURvbWFpbnMiCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3NzQzNTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGVzdGVkIG1hbnVhbGx5LgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEYXRhYmFzZVN0b3JlOjpjbGVhckV4cGlyZWRVc2VySW50ZXJhY3Rpb25zKToKKwogMjAyMC0w OC0yNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgW21h Y09TXSBTaG93IHBpY2tlciBmb3IgZGF0ZSBhbmQgZGF0ZXRpbWUtbG9jYWwgaW5wdXQgdHlwZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUu Y3BwCmluZGV4IDg0NDhhYzc4M2I4MDU0NDI5MDM0YmFkY2ZlN2UxYmIzYjY5OTkyNjIuLjE5MzMy ZDgwYWJiM2RhZGQ3MTQyNTY1M2QyOWEyN2JjOTNlMGZkOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YWJhc2VTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcApAQCAtMjQ3MCw3ICsy NDcwLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6Y2xlYXJF eHBpcmVkVXNlckludGVyYWN0aW9ucygpCiAgICAgaWYgKGNsZWFyRXhwaXJlZEludGVyYWN0aW9u LnByZXBhcmUoKSAhPSBTUUxJVEVfT0spCiAgICAgICAgIHJldHVybjsKIAotICAgIFNRTGl0ZVN0 YXRlbWVudCByZW1vdmVTdG9yYWdlQWNjZXNzKG1fZGF0YWJhc2UsIG1ha2VTdHJpbmcoIkRFTEVU RSBGUk9NIFN0b3JhZ2VBY2Nlc3NVbmRlclRvcEZyYW1lRG9tYWlucyAiLCBleHBpcmVkUmVjb3Jk SURzLCAiKSIpKTsKKyAgICBTUUxpdGVTdGF0ZW1lbnQgcmVtb3ZlU3RvcmFnZUFjY2VzcyhtX2Rh dGFiYXNlLCBtYWtlU3RyaW5nKCJERUxFVEUgRlJPTSBTdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFt ZURvbWFpbnMgV0hFUkUgZG9tYWluSUQgaW4gKCIsIGV4cGlyZWRSZWNvcmRJRHMsICIpIikpOwog ICAgIGlmIChyZW1vdmVTdG9yYWdlQWNjZXNzLnByZXBhcmUoKSAhPSBTUUxJVEVfT0spCiAgICAg ICAgIHJldHVybjsKIAo= 407336 2020-08-26 14:00:12 -0700 2020-08-27 09:19:27 -0700 Patch bug-215813-20200826140011.patch text/plain 8325 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc4MjA1Y2Y2ZGUwNmEwZTM2 N2Q3MGVmZDViNzY3YzI4YjdlYTBiN2EuLjM1YzIzMGU3YjdhMzc1MTNlODRhYjYyZDUwMTQ5NTEy MDNhNjI2YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMDgtMjYgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgc3ludGF4IGVycm9y IGluICJERUxFVEUgRlJPTSBTdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZURvbWFpbnMiCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3NzQzNTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIERlbGV0ZSB1bm5lY2Vzc2FyeSBjb2RlLiBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6Y2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9ucygp CisgICAgICAgIGlzIG5vdCBuZWVkZWQuIFVzZXIgaW50ZXJhY3Rpb24gYW5kIHN0b3JhZ2UgYWNj ZXNzIHdpbGwgYmUgY2xlYXJlZCBmb3IKKyAgICAgICAgZXhwaXJlZCBzdGF0aXN0aWNzIGluCisg ICAgICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpoYXNIYWRVbmV4cGly ZWRSZWNlbnRVc2VySW50ZXJhY3Rpb24oKSwKKyAgICAgICAgd2hpY2ggZXhhY3RseSBtYXRjaGVz IGJlaGF2aW9yIGluIHRoZSBtZW1vcnkgc3RvcmUuCisKKyAgICAgICAgVGhlIG9ubHkgcmVhc29u IHdlIGRpZCBub3Qgbm90aWNlIHRoaXMgZXh0cmEgY29kZSBpcyBiZWNhdXNlIHRoZQorICAgICAg ICBTUUxpdGUgcXVlcnkgaW4gY2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9ucygpIHdhcyBpbmNv cnJlY3QsIGNhdXNpbmcKKyAgICAgICAgYW4gZWFybHkgcmV0dXJuLiBTbyB0aGUgZnVuY3Rpb24g bmV2ZXIgd29ya2VkIHByb3Blcmx5LiBGaXhpbmcgdGhlCisgICAgICAgIHF1ZXJ5IHJldmVhbGVk IGluY29ycmVjdCBiZWhhdmlvci4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJlaGF2aW9yIHNo b3VsZCBub3QgY2hhbmdlIGJlY2F1c2UgdGhpcyBjb2RlIHdhcyBub3QKKyAgICAgICAgYmVpbmcg cnVuIGR1ZSB0byB0aGUgU1FMaXRlIGVycm9yLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Q2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpyZWdpc3Ry YWJsZURvbWFpbnNUb0RlbGV0ZU9yUmVzdHJpY3RXZWJzaXRlRGF0YUZvcik6CisgICAgICAgIChX ZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpmaW5kRXhwaXJlZFVz ZXJJbnRlcmFjdGlvbnMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6Y2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9u cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRh YmFzZVN0b3JlOjpzdGF0aXN0aWNzRXhwaXJhdGlvblRpbWUgY29uc3QpOiBEZWxldGVkLgorCiAy MDIwLTA4LTIwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT04ocjI2NTg1NikgW0dUS11bV1BFXSBoeWJpIHdlYnNvY2tldHMgdGVzdHMgZmFpbGlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9y ZS5jcHAKaW5kZXggODQ0OGFjNzgzYjgwNTQ0MjkwMzRiYWRjZmU3ZTFiYjNiNjk5OTI2Mi4uZWZl MGMwMDVhZWQyOTFkZDNlNTZkOTI1NGQ1ZTFlN2E4ZDQ1Mzg5NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhYmFzZVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNz aWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCkBAIC02NjgsNyAr NjY4LDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZGVzdHJv eVN0YXRlbWVudHMoKQogICAgIG1fdXBkYXRlR3JhbmRmYXRoZXJlZFN0YXRlbWVudCA9IG51bGxw dHI7CiAgICAgbV91cGRhdGVJc1NjaGVkdWxlZEZvckFsbEJ1dENvb2tpZURhdGFSZW1vdmFsU3Rh dGVtZW50ID0gbnVsbHB0cjsKICAgICBtX2lzR3JhbmRmYXRoZXJlZFN0YXRlbWVudCA9IG51bGxw dHI7Ci0gICAgbV9maW5kRXhwaXJlZFVzZXJJbnRlcmFjdGlvblN0YXRlbWVudCA9IG51bGxwdHI7 CiAgICAgbV90b3BGcmFtZUxpbmtEZWNvcmF0aW9uc0Zyb21FeGlzdHNTdGF0ZW1lbnQgPSBudWxs cHRyOwogICAgIG1fdG9wRnJhbWVMb2FkZWRUaGlyZFBhcnR5U2NyaXB0c0V4aXN0c1N0YXRlbWVu dCA9IG51bGxwdHI7CiAgICAgbV9jb3VudFByZXZhbGVudFJlc291cmNlc1N0YXRlbWVudCA9IG51 bGxwdHI7CkBAIC0yNDM2LDUxICsyNDM1LDYgQEAgVmVjdG9yPFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEYXRhYmFzZVN0b3JlOjpEb21haW5EYXRhPiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGEKICAg ICByZXR1cm4gcmVzdWx0czsKIH0KIAotVmVjdG9yPHVuc2lnbmVkPiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZmluZEV4cGlyZWRVc2VySW50ZXJhY3Rpb25zKCkgY29uc3QK LXsKLSAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKLQotICAgIFZlY3Rvcjx1bnNpZ25l ZD4gcmVzdWx0czsKLSAgICBPcHRpb25hbDxTZWNvbmRzPiBleHBpcmF0aW9uRGF0ZVRpbWUgPSBz dGF0aXN0aWNzRXhwaXJhdGlvblRpbWUoKTsKLSAgICBpZiAoIWV4cGlyYXRpb25EYXRlVGltZSkK LSAgICAgICAgcmV0dXJuIHJlc3VsdHM7Ci0gICAgCi0gICAgYXV0byBzY29wZWRTdGF0ZW1lbnQg PSB0aGlzLT5zY29wZWRTdGF0ZW1lbnQobV9maW5kRXhwaXJlZFVzZXJJbnRlcmFjdGlvblN0YXRl bWVudCwgZmluZEV4cGlyZWRVc2VySW50ZXJhY3Rpb25RdWVyeSwgImZpbmRFeHBpcmVkVXNlcklu dGVyYWN0aW9ucyJfcyk7Ci0gICAgaWYgKCFzY29wZWRTdGF0ZW1lbnQKLSAgICAgICAgfHwgc2Nv cGVkU3RhdGVtZW50LT5iaW5kRG91YmxlKDEsIGV4cGlyYXRpb25EYXRlVGltZS52YWx1ZSgpLnZh bHVlKCkpICE9IFNRTElURV9PSykKLSAgICAgICAgcmV0dXJuIHJlc3VsdHM7Ci0KLSAgICB3aGls ZSAoc2NvcGVkU3RhdGVtZW50LT5zdGVwKCkgPT0gU1FMSVRFX1JPVykKLSAgICAgICAgcmVzdWx0 cy5hcHBlbmQoc2NvcGVkU3RhdGVtZW50LT5nZXRDb2x1bW5JbnQoMCkpOwotCi0gICAgcmV0dXJu IHJlc3VsdHM7Ci19Ci0KLXZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6 OmNsZWFyRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMoKQotewotICAgIEFTU0VSVCghUnVuTG9vcDo6 aXNNYWluKCkpOwotCi0gICAgYXV0byBleHBpcmVkUmVjb3JkcyA9IGZpbmRFeHBpcmVkVXNlcklu dGVyYWN0aW9ucygpOwotICAgIGlmIChleHBpcmVkUmVjb3Jkcy5pc0VtcHR5KCkpCi0gICAgICAg IHJldHVybjsKLQotICAgIGF1dG8gZXhwaXJlZFJlY29yZElEcyA9IGJ1aWxkTGlzdChXVEY6Okl0 ZXJhdG9yUmFuZ2U8VmVjdG9yPHVuc2lnbmVkPjo6aXRlcmF0b3I+KGV4cGlyZWRSZWNvcmRzLmJl Z2luKCksIGV4cGlyZWRSZWNvcmRzLmVuZCgpKSk7Ci0KLSAgICBTUUxpdGVTdGF0ZW1lbnQgY2xl YXJFeHBpcmVkSW50ZXJhY3Rpb24obV9kYXRhYmFzZSwgbWFrZVN0cmluZygiVVBEQVRFIE9ic2Vy dmVkRG9tYWlucyBTRVQgbW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgPSAwLCBoYWRVc2Vy SW50ZXJhY3Rpb24gPSAxIFdIRVJFIGRvbWFpbklEIElOICgiLCBleHBpcmVkUmVjb3JkSURzLCAi KSIpKTsKLSAgICBpZiAoY2xlYXJFeHBpcmVkSW50ZXJhY3Rpb24ucHJlcGFyZSgpICE9IFNRTElU RV9PSykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU1FMaXRlU3RhdGVtZW50IHJlbW92ZVN0b3Jh Z2VBY2Nlc3MobV9kYXRhYmFzZSwgbWFrZVN0cmluZygiREVMRVRFIEZST00gU3RvcmFnZUFjY2Vz c1VuZGVyVG9wRnJhbWVEb21haW5zICIsIGV4cGlyZWRSZWNvcmRJRHMsICIpIikpOwotICAgIGlm IChyZW1vdmVTdG9yYWdlQWNjZXNzLnByZXBhcmUoKSAhPSBTUUxJVEVfT0spCi0gICAgICAgIHJl dHVybjsKLQotICAgIGlmIChjbGVhckV4cGlyZWRJbnRlcmFjdGlvbi5zdGVwKCkgIT0gU1FMSVRF X0RPTkUKLSAgICAgICAgfHwgcmVtb3ZlU3RvcmFnZUFjY2Vzcy5zdGVwKCkgIT0gU1FMSVRFX0RP TkUpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTmV0d29yaywgIiVwIC0gUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmNsZWFyRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMg c3RhdGVtZW50KHMpIGZhaWxlZCB0byBzdGVwLCBlcnJvciBtZXNzYWdlOiAle3ByaXZhdGV9cyIs IHRoaXMsIG1fZGF0YWJhc2UubGFzdEVycm9yTXNnKCkpOwotICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKLSAgICB9Ci19Ci0KIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNl U3RvcmU6OmNsZWFyR3JhbmRmYXRoZXJpbmcoVmVjdG9yPHVuc2lnbmVkPiYmIGRvbWFpbklEc1Rv Q2xlYXIpCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CkBAIC0yNTczLDggKzI1 MjcsNiBAQCBSZWdpc3RyYWJsZURvbWFpbnNUb0RlbGV0ZU9yUmVzdHJpY3RXZWJzaXRlRGF0YUZv ciBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhcwogICAgIGlmIChzaG91bGRDbGVhckdyYW5k ZmF0aGVyaW5nKQogICAgICAgICBjbGVhckVuZE9mR3JhbmRmYXRoZXJpbmdUaW1lU3RhbXAoKTsK IAotICAgIGNsZWFyRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMoKTsKLQogICAgIGF1dG8gbm93ID0g V2FsbFRpbWU6Om5vdygpOwogICAgIGF1dG8gb2xkZXN0VXNlckludGVyYWN0aW9uID0gbm93Owog ICAgIFJlZ2lzdHJhYmxlRG9tYWluc1RvRGVsZXRlT3JSZXN0cmljdFdlYnNpdGVEYXRhRm9yIHRv RGVsZXRlT3JSZXN0cmljdEZvcjsKQEAgLTI5OTgsMTkgKzI5NTAsNiBAQCB2b2lkIFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjp1cGRhdGVPcGVyYXRpbmdEYXRlc1BhcmFtZXRl cnMoKQogICAgIG1fbGVhc3RSZWNlbnRPcGVyYXRpbmdEYXRlID0gT3BlcmF0aW5nRGF0ZShnZXRM ZWFzdFJlY2VudE9wZXJhdGluZ0RhdGVTdGF0ZW1lbnQuZ2V0Q29sdW1uSW50KDApLCBnZXRMZWFz dFJlY2VudE9wZXJhdGluZ0RhdGVTdGF0ZW1lbnQuZ2V0Q29sdW1uSW50KDEpLCBnZXRMZWFzdFJl Y2VudE9wZXJhdGluZ0RhdGVTdGF0ZW1lbnQuZ2V0Q29sdW1uSW50KDIpKTsKIH0KIAotT3B0aW9u YWw8U2Vjb25kcz4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OnN0YXRpc3Rp Y3NFeHBpcmF0aW9uVGltZSgpIGNvbnN0Ci17Ci0gICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4o KSk7Ci0KLSAgICBpZiAodGhpcy0+cGFyYW1ldGVycygpLnRpbWVUb0xpdmVVc2VySW50ZXJhY3Rp b24pCi0gICAgICAgIHJldHVybiBXYWxsVGltZTo6bm93KCkuc2Vjb25kc1NpbmNlRXBvY2goKSAt IHRoaXMtPnBhcmFtZXRlcnMoKS50aW1lVG9MaXZlVXNlckludGVyYWN0aW9uLnZhbHVlKCk7Ci0K LSAgICBpZiAobV9vcGVyYXRpbmdEYXRlc1NpemUgPj0gb3BlcmF0aW5nRGF0ZXNXaW5kb3dMb25n KQotICAgICAgICByZXR1cm4gbV9sZWFzdFJlY2VudE9wZXJhdGluZ0RhdGUuc2Vjb25kc1NpbmNl RXBvY2goKTsKLQotICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci19Ci0KIHZvaWQgUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmluY2x1ZGVUb2RheUFzT3BlcmF0aW5nRGF0ZUlm TmVjZXNzYXJ5KCkKIHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9D bGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKaW5kZXggMTlm NzY4YmQzODA5NTRjNzBlMTgzNzY2MGI3YjVmY2JjMDcwZTZjNy4uNzI4NTY3ZjcwN2E5ODdjNjU4 NjNmNzM3NTJlMWIyOWQwMzIxMjNmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmgKQEAgLTE1NCw3ICsxNTQsNiBAQCBwcml2YXRlOgog ICAgIHZvaWQgaW5jbHVkZVRvZGF5QXNPcGVyYXRpbmdEYXRlSWZOZWNlc3NhcnkoKSBvdmVycmlk ZTsKICAgICB2b2lkIGNsZWFyT3BlcmF0aW5nRGF0ZXMoKSBvdmVycmlkZSB7IH0KICAgICBib29s IGhhc1N0YXRpc3RpY3NFeHBpcmVkKFdhbGxUaW1lIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25U aW1lLCBPcGVyYXRpbmdEYXRlc1dpbmRvdykgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgT3B0aW9uYWw8 U2Vjb25kcz4gc3RhdGlzdGljc0V4cGlyYXRpb25UaW1lKCkgY29uc3Q7CiAgICAgdm9pZCB1cGRh dGVPcGVyYXRpbmdEYXRlc1BhcmFtZXRlcnMoKTsKIAogICAgIHZvaWQgb3BlbklUUERhdGFiYXNl KCk7CkBAIC0yMDUsOCArMjA0LDYgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIFZlY3RvcjxEb21h aW5EYXRhPiBkb21haW5zKCkgY29uc3Q7CiAgICAgYm9vbCBoYXNIYWRVbmV4cGlyZWRSZWNlbnRV c2VySW50ZXJhY3Rpb24oY29uc3QgRG9tYWluRGF0YSYsIE9wZXJhdGluZ0RhdGVzV2luZG93KTsK LSAgICBWZWN0b3I8dW5zaWduZWQ+IGZpbmRFeHBpcmVkVXNlckludGVyYWN0aW9ucygpIGNvbnN0 OwotICAgIHZvaWQgY2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9ucygpOwogICAgIHZvaWQgY2xl YXJHcmFuZGZhdGhlcmluZyhWZWN0b3I8dW5zaWduZWQ+JiYpOwogICAgIFdlYkNvcmU6OlN0b3Jh Z2VBY2Nlc3NQcm9tcHRXYXNTaG93biBoYXNVc2VyR3JhbnRlZFN0b3JhZ2VBY2Nlc3NUaHJvdWdo UHJvbXB0KHVuc2lnbmVkIGRvbWFpbklELCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYpIGNvbnN0 OwogICAgIHZvaWQgaW5jcmVtZW50UmVjb3Jkc0RlbGV0ZWRDb3VudEZvckRvbWFpbnMoSGFzaFNl dDxSZWdpc3RyYWJsZURvbWFpbj4mJikgb3ZlcnJpZGU7CkBAIC0yNzEsNyArMjY4LDYgQEAgcHJp dmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX3Vw ZGF0ZUdyYW5kZmF0aGVyZWRTdGF0ZW1lbnQ7CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX3VwZGF0ZUlzU2NoZWR1bGVkRm9yQWxsQnV0Q29v a2llRGF0YVJlbW92YWxTdGF0ZW1lbnQ7CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8V2Vi Q29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX2lzR3JhbmRmYXRoZXJlZFN0YXRlbWVudDsKLSAgICBt dXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fZmluZEV4 cGlyZWRVc2VySW50ZXJhY3Rpb25TdGF0ZW1lbnQ7CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9w dHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX2NvdW50UHJldmFsZW50UmVzb3VyY2VzU3Rh dGVtZW50OwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRl bWVudD4gbV9jb3VudFByZXZhbGVudFJlc291cmNlc1dpdGhVc2VySW50ZXJhY3Rpb25TdGF0ZW1l bnQ7CiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50 PiBtX2NvdW50UHJldmFsZW50UmVzb3VyY2VzV2l0aG91dFVzZXJJbnRlcmFjdGlvblN0YXRlbWVu dDsK 407410 2020-08-27 09:19:29 -0700 2020-08-27 09:47:04 -0700 Patch for landing bug-215813-20200827091928.patch text/plain 8653 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc4MjA1Y2Y2ZGUwNmEwZTM2 N2Q3MGVmZDViNzY3YzI4YjdlYTBiN2EuLjMxY2IwNzlmMzc3NjRhMGRlNzcxYzhjOGVlZTUwNGEx Y2U1MzczM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjAtMDgtMjYgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgc3ludGF4IGVycm9y IGluICJERUxFVEUgRlJPTSBTdG9yYWdlQWNjZXNzVW5kZXJUb3BGcmFtZURvbWFpbnMiCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTU4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzY3NzQzNTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgorCisgICAgICAgIERlbGV0ZSB1bm5lY2Vzc2FyeSBjb2RlLiBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6Y2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9ucygpCisg ICAgICAgIGlzIG5vdCBuZWVkZWQuIFVzZXIgaW50ZXJhY3Rpb24gYW5kIHN0b3JhZ2UgYWNjZXNz IHdpbGwgYmUgY2xlYXJlZCBmb3IKKyAgICAgICAgZXhwaXJlZCBzdGF0aXN0aWNzIGluCisgICAg ICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpoYXNIYWRVbmV4cGlyZWRS ZWNlbnRVc2VySW50ZXJhY3Rpb24oKSwKKyAgICAgICAgd2hpY2ggZXhhY3RseSBtYXRjaGVzIGJl aGF2aW9yIGluIHRoZSBtZW1vcnkgc3RvcmUuIElmIHdlIGNsZWFyIHRoZQorICAgICAgICBleHBp cmVkIHN0YXRpc3RpY3MgYmVmb3JlIHNldHRpbmcgdGhlIGxvY2FsIHZhciBvbGRlc3RVc2VySW50 ZXJhY3Rpb24sCisgICAgICAgIHRoZW4gdGhhdCB2YXIgd2lsbCBsaWtlbHkgYWx3YXlzIGJlIGVx dWFsIHRvIHplcm8sIGFuZCB0aGUgY2hlY2sgZm9yCisgICAgICAgIGlmICghcGFyYW1ldGVycygp LmlzUnVubmluZ1Rlc3QgJiYgbm93IC0gb2xkZXN0VXNlckludGVyYWN0aW9uIDwgcGFyYW1ldGVy cygpLm1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCkKKyAgICAgICAgd2lsbCBh bHdheXMgYmUgZmFsc2UuCisKKyAgICAgICAgVGhlIG9ubHkgcmVhc29uIHdlIGRpZCBub3Qgbm90 aWNlIHRoaXMgZXh0cmEgY29kZSBpcyBiZWNhdXNlIHRoZQorICAgICAgICBTUUxpdGUgcXVlcnkg aW4gY2xlYXJFeHBpcmVkVXNlckludGVyYWN0aW9ucygpIHdhcyBpbmNvcnJlY3QsIGNhdXNpbmcK KyAgICAgICAgYW4gZWFybHkgcmV0dXJuLiBTbyB0aGUgZnVuY3Rpb24gbmV2ZXIgd29ya2VkIHBy b3Blcmx5LiBGaXhpbmcgdGhlCisgICAgICAgIHF1ZXJ5IHJldmVhbGVkIGluY29ycmVjdCBiZWhh dmlvci4gCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWhhdmlvciBzaG91bGQgbm90IGNoYW5n ZSBiZWNhdXNlIHRoaXMgY29kZSB3YXMgbm90CisgICAgICAgIGJlaW5nIHJ1biBkdWUgdG8gdGhl IFNRTGl0ZSBlcnJvci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVz b3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6cmVnaXN0cmFibGVEb21haW5zVG9E ZWxldGVPclJlc3RyaWN0V2Vic2l0ZURhdGFGb3IpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZmluZEV4cGlyZWRVc2VySW50ZXJhY3Rpb25z IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFiYXNlU3RvcmU6OmNsZWFyRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMpOiBEZWxldGVkLgor ICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6c3Rh dGlzdGljc0V4cGlyYXRpb25UaW1lIGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0wOC0yMCAgTGF1 cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjU4 NTYpIFtHVEtdW1dQRV0gaHliaSB3ZWJzb2NrZXRzIHRlc3RzIGZhaWxpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Ns YXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCmluZGV4IDg0 NDhhYzc4M2I4MDU0NDI5MDM0YmFkY2ZlN2UxYmIzYjY5OTkyNjIuLmVmZTBjMDA1YWVkMjkxZGQz ZTU2ZDkyNTRkNWUxZTdhOGQ0NTM4OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcApAQCAtNjY4LDcgKzY2OCw2IEBAIHZvaWQg UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmRlc3Ryb3lTdGF0ZW1lbnRzKCkK ICAgICBtX3VwZGF0ZUdyYW5kZmF0aGVyZWRTdGF0ZW1lbnQgPSBudWxscHRyOwogICAgIG1fdXBk YXRlSXNTY2hlZHVsZWRGb3JBbGxCdXRDb29raWVEYXRhUmVtb3ZhbFN0YXRlbWVudCA9IG51bGxw dHI7CiAgICAgbV9pc0dyYW5kZmF0aGVyZWRTdGF0ZW1lbnQgPSBudWxscHRyOwotICAgIG1fZmlu ZEV4cGlyZWRVc2VySW50ZXJhY3Rpb25TdGF0ZW1lbnQgPSBudWxscHRyOwogICAgIG1fdG9wRnJh bWVMaW5rRGVjb3JhdGlvbnNGcm9tRXhpc3RzU3RhdGVtZW50ID0gbnVsbHB0cjsKICAgICBtX3Rv cEZyYW1lTG9hZGVkVGhpcmRQYXJ0eVNjcmlwdHNFeGlzdHNTdGF0ZW1lbnQgPSBudWxscHRyOwog ICAgIG1fY291bnRQcmV2YWxlbnRSZXNvdXJjZXNTdGF0ZW1lbnQgPSBudWxscHRyOwpAQCAtMjQz Niw1MSArMjQzNSw2IEBAIFZlY3RvcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9y ZTo6RG9tYWluRGF0YT4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhCiAgICAgcmV0dXJuIHJlc3Vs dHM7CiB9CiAKLVZlY3Rvcjx1bnNpZ25lZD4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNl U3RvcmU6OmZpbmRFeHBpcmVkVXNlckludGVyYWN0aW9ucygpIGNvbnN0Ci17Ci0gICAgQVNTRVJU KCFSdW5Mb29wOjppc01haW4oKSk7Ci0KLSAgICBWZWN0b3I8dW5zaWduZWQ+IHJlc3VsdHM7Ci0g ICAgT3B0aW9uYWw8U2Vjb25kcz4gZXhwaXJhdGlvbkRhdGVUaW1lID0gc3RhdGlzdGljc0V4cGly YXRpb25UaW1lKCk7Ci0gICAgaWYgKCFleHBpcmF0aW9uRGF0ZVRpbWUpCi0gICAgICAgIHJldHVy biByZXN1bHRzOwotICAgIAotICAgIGF1dG8gc2NvcGVkU3RhdGVtZW50ID0gdGhpcy0+c2NvcGVk U3RhdGVtZW50KG1fZmluZEV4cGlyZWRVc2VySW50ZXJhY3Rpb25TdGF0ZW1lbnQsIGZpbmRFeHBp cmVkVXNlckludGVyYWN0aW9uUXVlcnksICJmaW5kRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMiX3Mp OwotICAgIGlmICghc2NvcGVkU3RhdGVtZW50Ci0gICAgICAgIHx8IHNjb3BlZFN0YXRlbWVudC0+ YmluZERvdWJsZSgxLCBleHBpcmF0aW9uRGF0ZVRpbWUudmFsdWUoKS52YWx1ZSgpKSAhPSBTUUxJ VEVfT0spCi0gICAgICAgIHJldHVybiByZXN1bHRzOwotCi0gICAgd2hpbGUgKHNjb3BlZFN0YXRl bWVudC0+c3RlcCgpID09IFNRTElURV9ST1cpCi0gICAgICAgIHJlc3VsdHMuYXBwZW5kKHNjb3Bl ZFN0YXRlbWVudC0+Z2V0Q29sdW1uSW50KDApKTsKLQotICAgIHJldHVybiByZXN1bHRzOwotfQot Ci12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpjbGVhckV4cGlyZWRV c2VySW50ZXJhY3Rpb25zKCkKLXsKLSAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKLQot ICAgIGF1dG8gZXhwaXJlZFJlY29yZHMgPSBmaW5kRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMoKTsK LSAgICBpZiAoZXhwaXJlZFJlY29yZHMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvIGV4cGlyZWRSZWNvcmRJRHMgPSBidWlsZExpc3QoV1RGOjpJdGVyYXRvclJhbmdlPFZl Y3Rvcjx1bnNpZ25lZD46Oml0ZXJhdG9yPihleHBpcmVkUmVjb3Jkcy5iZWdpbigpLCBleHBpcmVk UmVjb3Jkcy5lbmQoKSkpOwotCi0gICAgU1FMaXRlU3RhdGVtZW50IGNsZWFyRXhwaXJlZEludGVy YWN0aW9uKG1fZGF0YWJhc2UsIG1ha2VTdHJpbmcoIlVQREFURSBPYnNlcnZlZERvbWFpbnMgU0VU IG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lID0gMCwgaGFkVXNlckludGVyYWN0aW9uID0g MSBXSEVSRSBkb21haW5JRCBJTiAoIiwgZXhwaXJlZFJlY29yZElEcywgIikiKSk7Ci0gICAgaWYg KGNsZWFyRXhwaXJlZEludGVyYWN0aW9uLnByZXBhcmUoKSAhPSBTUUxJVEVfT0spCi0gICAgICAg IHJldHVybjsKLQotICAgIFNRTGl0ZVN0YXRlbWVudCByZW1vdmVTdG9yYWdlQWNjZXNzKG1fZGF0 YWJhc2UsIG1ha2VTdHJpbmcoIkRFTEVURSBGUk9NIFN0b3JhZ2VBY2Nlc3NVbmRlclRvcEZyYW1l RG9tYWlucyAiLCBleHBpcmVkUmVjb3JkSURzLCAiKSIpKTsKLSAgICBpZiAocmVtb3ZlU3RvcmFn ZUFjY2Vzcy5wcmVwYXJlKCkgIT0gU1FMSVRFX09LKQotICAgICAgICByZXR1cm47Ci0KLSAgICBp ZiAoY2xlYXJFeHBpcmVkSW50ZXJhY3Rpb24uc3RlcCgpICE9IFNRTElURV9ET05FCi0gICAgICAg IHx8IHJlbW92ZVN0b3JhZ2VBY2Nlc3Muc3RlcCgpICE9IFNRTElURV9ET05FKSB7Ci0gICAgICAg IFJFTEVBU0VfTE9HX0VSUk9SKE5ldHdvcmssICIlcCAtIFJlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhYmFzZVN0b3JlOjpjbGVhckV4cGlyZWRVc2VySW50ZXJhY3Rpb25zIHN0YXRlbWVudChzKSBm YWlsZWQgdG8gc3RlcCwgZXJyb3IgbWVzc2FnZTogJXtwcml2YXRlfXMiLCB0aGlzLCBtX2RhdGFi YXNlLmxhc3RFcnJvck1zZygpKTsKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg fQotfQotCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpjbGVhckdy YW5kZmF0aGVyaW5nKFZlY3Rvcjx1bnNpZ25lZD4mJiBkb21haW5JRHNUb0NsZWFyKQogewogICAg IEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAtMjU3Myw4ICsyNTI3LDYgQEAgUmVnaXN0 cmFibGVEb21haW5zVG9EZWxldGVPclJlc3RyaWN0V2Vic2l0ZURhdGFGb3IgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXMKICAgICBpZiAoc2hvdWxkQ2xlYXJHcmFuZGZhdGhlcmluZykKICAg ICAgICAgY2xlYXJFbmRPZkdyYW5kZmF0aGVyaW5nVGltZVN0YW1wKCk7CiAKLSAgICBjbGVhckV4 cGlyZWRVc2VySW50ZXJhY3Rpb25zKCk7Ci0KICAgICBhdXRvIG5vdyA9IFdhbGxUaW1lOjpub3co KTsKICAgICBhdXRvIG9sZGVzdFVzZXJJbnRlcmFjdGlvbiA9IG5vdzsKICAgICBSZWdpc3RyYWJs ZURvbWFpbnNUb0RlbGV0ZU9yUmVzdHJpY3RXZWJzaXRlRGF0YUZvciB0b0RlbGV0ZU9yUmVzdHJp Y3RGb3I7CkBAIC0yOTk4LDE5ICsyOTUwLDYgQEAgdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZTo6dXBkYXRlT3BlcmF0aW5nRGF0ZXNQYXJhbWV0ZXJzKCkKICAgICBtX2xl YXN0UmVjZW50T3BlcmF0aW5nRGF0ZSA9IE9wZXJhdGluZ0RhdGUoZ2V0TGVhc3RSZWNlbnRPcGVy YXRpbmdEYXRlU3RhdGVtZW50LmdldENvbHVtbkludCgwKSwgZ2V0TGVhc3RSZWNlbnRPcGVyYXRp bmdEYXRlU3RhdGVtZW50LmdldENvbHVtbkludCgxKSwgZ2V0TGVhc3RSZWNlbnRPcGVyYXRpbmdE YXRlU3RhdGVtZW50LmdldENvbHVtbkludCgyKSk7CiB9CiAKLU9wdGlvbmFsPFNlY29uZHM+IFJl c291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpzdGF0aXN0aWNzRXhwaXJhdGlvblRp bWUoKSBjb25zdAotewotICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwotCi0gICAgaWYg KHRoaXMtPnBhcmFtZXRlcnMoKS50aW1lVG9MaXZlVXNlckludGVyYWN0aW9uKQotICAgICAgICBy ZXR1cm4gV2FsbFRpbWU6Om5vdygpLnNlY29uZHNTaW5jZUVwb2NoKCkgLSB0aGlzLT5wYXJhbWV0 ZXJzKCkudGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbi52YWx1ZSgpOwotCi0gICAgaWYgKG1fb3Bl cmF0aW5nRGF0ZXNTaXplID49IG9wZXJhdGluZ0RhdGVzV2luZG93TG9uZykKLSAgICAgICAgcmV0 dXJuIG1fbGVhc3RSZWNlbnRPcGVyYXRpbmdEYXRlLnNlY29uZHNTaW5jZUVwb2NoKCk7Ci0KLSAg ICByZXR1cm4gV1RGOjpudWxsb3B0OwotfQotCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhYmFzZVN0b3JlOjppbmNsdWRlVG9kYXlBc09wZXJhdGluZ0RhdGVJZk5lY2Vzc2FyeSgpCiB7 CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFi YXNlU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5oCmluZGV4IDE5Zjc2OGJkMzgwOTU0Yzcw ZTE4Mzc2NjBiN2I1ZmNiYzA3MGU2YzcuLjcyODU2N2Y3MDdhOTg3YzY1ODYzZjczNzUyZTFiMjlk MDMyMTIzZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YWJhc2VTdG9yZS5oCkBAIC0xNTQsNyArMTU0LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGluY2x1 ZGVUb2RheUFzT3BlcmF0aW5nRGF0ZUlmTmVjZXNzYXJ5KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBj bGVhck9wZXJhdGluZ0RhdGVzKCkgb3ZlcnJpZGUgeyB9CiAgICAgYm9vbCBoYXNTdGF0aXN0aWNz RXhwaXJlZChXYWxsVGltZSBtb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSwgT3BlcmF0aW5n RGF0ZXNXaW5kb3cpIGNvbnN0IG92ZXJyaWRlOwotICAgIE9wdGlvbmFsPFNlY29uZHM+IHN0YXRp c3RpY3NFeHBpcmF0aW9uVGltZSgpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlT3BlcmF0aW5nRGF0 ZXNQYXJhbWV0ZXJzKCk7CiAKICAgICB2b2lkIG9wZW5JVFBEYXRhYmFzZSgpOwpAQCAtMjA1LDgg KzIwNCw2IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICBWZWN0b3I8RG9tYWluRGF0YT4gZG9tYWlu cygpIGNvbnN0OwogICAgIGJvb2wgaGFzSGFkVW5leHBpcmVkUmVjZW50VXNlckludGVyYWN0aW9u KGNvbnN0IERvbWFpbkRhdGEmLCBPcGVyYXRpbmdEYXRlc1dpbmRvdyk7Ci0gICAgVmVjdG9yPHVu c2lnbmVkPiBmaW5kRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMoKSBjb25zdDsKLSAgICB2b2lkIGNs ZWFyRXhwaXJlZFVzZXJJbnRlcmFjdGlvbnMoKTsKICAgICB2b2lkIGNsZWFyR3JhbmRmYXRoZXJp bmcoVmVjdG9yPHVuc2lnbmVkPiYmKTsKICAgICBXZWJDb3JlOjpTdG9yYWdlQWNjZXNzUHJvbXB0 V2FzU2hvd24gaGFzVXNlckdyYW50ZWRTdG9yYWdlQWNjZXNzVGhyb3VnaFByb21wdCh1bnNpZ25l ZCBkb21haW5JRCwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mKSBjb25zdDsKICAgICB2b2lkIGlu Y3JlbWVudFJlY29yZHNEZWxldGVkQ291bnRGb3JEb21haW5zKEhhc2hTZXQ8UmVnaXN0cmFibGVE b21haW4+JiYpIG92ZXJyaWRlOwpAQCAtMjcxLDcgKzI2OCw2IEBAIHByaXZhdGU6CiAgICAgc3Rk Ojp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV91cGRhdGVHcmFuZGZhdGhl cmVkU3RhdGVtZW50OwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0 ZVN0YXRlbWVudD4gbV91cGRhdGVJc1NjaGVkdWxlZEZvckFsbEJ1dENvb2tpZURhdGFSZW1vdmFs U3RhdGVtZW50OwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0 YXRlbWVudD4gbV9pc0dyYW5kZmF0aGVyZWRTdGF0ZW1lbnQ7Ci0gICAgbXV0YWJsZSBzdGQ6OnVu aXF1ZV9wdHI8V2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50PiBtX2ZpbmRFeHBpcmVkVXNlckludGVy YWN0aW9uU3RhdGVtZW50OwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNR TGl0ZVN0YXRlbWVudD4gbV9jb3VudFByZXZhbGVudFJlc291cmNlc1N0YXRlbWVudDsKICAgICBt dXRhYmxlIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ+IG1fY291bnRQ cmV2YWxlbnRSZXNvdXJjZXNXaXRoVXNlckludGVyYWN0aW9uU3RhdGVtZW50OwogICAgIG11dGFi bGUgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudD4gbV9jb3VudFByZXZh bGVudFJlc291cmNlc1dpdGhvdXRVc2VySW50ZXJhY3Rpb25TdGF0ZW1lbnQ7Cg==