229323 2021-08-19 23:08:09 -0700 Make UIEventAttribution tests less platform dependent 2021-08-20 16:03:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen webkit-bug-importer wilander oldest_to_newest 1785702 0 achristensen 2021-08-19 23:08:09 -0700 Make UIEventAttribution tests less platform dependent 1785703 1 435943 achristensen 2021-08-19 23:09:00 -0700 Created attachment 435943 Patch 1785847 2 wilander 2021-08-20 08:48:51 -0700 TestWebKitAPI.EventAttribution.Basic is timing out on iOS. 1785849 3 435943 wilander 2021-08-20 08:53:20 -0700 Comment on attachment 435943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435943&action=review r=me as long as the broken iOS test is fixed. > Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm:58 > +- (void)_addEventAttributionWithSourceID:(uint8_t)sourceID destinationURL:(NSURL *)destination sourceDescription:(NSString *)sourceDescription purchaser:(NSString *)purchaser reportEndpoint:(NSURL *)reportEndpoint nonce:(NSString *)nonce Should we call the nonce parameter optionalNonce? > Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:265 > + [webView _addEventAttributionWithSourceID:42 destinationURL:exampleURL() sourceDescription:@"test source description" purchaser:@"test purchaser" reportEndpoint:serverURL nonce:@"ABCDEFabcdef0123456789"]; Where did 42 come from? Did it come from MockEventAttribution before? 1785968 4 achristensen 2021-08-20 13:41:54 -0700 This test seems to have been timing out since r277447, which was refactored significantly in r279514 1786017 5 436034 achristensen 2021-08-20 15:15:45 -0700 Created attachment 436034 Patch 1786028 6 436034 achristensen 2021-08-20 15:50:29 -0700 Comment on attachment 436034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436034&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:129 > +#if HAVE(UI_EVENT_ATTRIBUTION) I verified on Monterey that this is not needed. The test is no longer dependent on UIEventAttribution. 1786035 7 achristensen 2021-08-20 16:02:12 -0700 http://trac.webkit.org/r281349 1786038 8 webkit-bug-importer 2021-08-20 16:03:36 -0700 <rdar://problem/82189489> 435943 2021-08-19 23:09:00 -0700 2021-08-20 15:15:43 -0700 Patch bug-229323-20210819230859.patch text/plain 11505 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIwN2FjMzcwOTk1MDI3MGRh NTFhNmE1NmFlZmNhMzk1ZjAzZWNjMWIuLmIzOGYyNTk2YjcxYTExMjgyZGVhYTM0N2MwN2FlMzcx ZDBlMmM4MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDgtMTkgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIFVJRXZl bnRBdHRyaWJ1dGlvbiB0ZXN0cyBsZXNzIHBsYXRmb3JtIGRlcGVuZGVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBhbGxvd3MgbWUgdG8gcnVu IHRoZSBVSUV2ZW50QXR0cmlidXRpb24gdGVzdHMgb24gbWFjT1MuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tOgorICAgICAgICAoLVtXS1dl YlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRoU291cmNlSUQ6ZGVzdGluYXRpb25VUkw6c291 cmNlRGVzY3JpcHRpb246cHVyY2hhc2VyOnJlcG9ydEVuZHBvaW50Om5vbmNlOl0pOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nSU9TLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3VGVzdGluZ0lPUy5tbToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9zZXRVSUV2ZW50QXR0cmlidXRpb25Gb3JUZXN0aW5nOndpdGhOb25j ZTpdKTogRGVsZXRlZC4KKwogMjAyMS0wOC0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSZW1vdmUgc3VwcG9ydCBmb3IgdGhlIG1lYW5p bmdmdWwgdGFwIGhldXJpc3RpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaAppbmRleCA0MDg3 NDg0NjZlZWJjOWQyNjI5OGM1ZTQyMjhhZjRjZDhiZTY3MmYzLi45MTMyZWRjY2NlMWY4NzczMWUz MmQxNTJlYTc4YjJmZjdiYjYyOGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaApAQCAt NDQsNiArNDQsOCBAQCBzdHJ1Y3QgV0tBcHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEgewogCiBA aW50ZXJmYWNlIFdLV2ViVmlldyAoV0tUZXN0aW5nKQogCistICh2b2lkKV9hZGRFdmVudEF0dHJp YnV0aW9uV2l0aFNvdXJjZUlEOih1aW50OF90KXNvdXJjZUlEIGRlc3RpbmF0aW9uVVJMOihOU1VS TCAqKWRlc3RpbmF0aW9uIHNvdXJjZURlc2NyaXB0aW9uOihOU1N0cmluZyAqKXNvdXJjZURlc2Ny aXB0aW9uIHB1cmNoYXNlcjooTlNTdHJpbmcgKilwdXJjaGFzZXIgcmVwb3J0RW5kcG9pbnQ6KE5T VVJMICopcmVwb3J0RW5kcG9pbnQgbm9uY2U6KG51bGxhYmxlIE5TU3RyaW5nICopbm9uY2UgV0tf QVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKwogLSAo dm9pZClfc2V0UGFnZVNjYWxlOihDR0Zsb2F0KXNjYWxlIHdpdGhPcmlnaW46KENHUG9pbnQpb3Jp Z2luOwogLSAoQ0dGbG9hdClfcGFnZVNjYWxlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3VGVzdGluZy5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCmluZGV4IDA0NGU5MmNhYzNh Y2QwOGY2NGI3MTY0YjU2NzQyZjQ4YTMzNTg2OTUuLmYyZDgzNTA2ZDUxOTg0Y2Y0ZGI5YjhkYzky YTM4M2Y5NGEzYTExMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tCkBAIC01NSw2ICs1NSwyMSBAQAogCiBAaW1wbGVt ZW50YXRpb24gV0tXZWJWaWV3IChXS1Rlc3RpbmcpCiAKKy0gKHZvaWQpX2FkZEV2ZW50QXR0cmli dXRpb25XaXRoU291cmNlSUQ6KHVpbnQ4X3Qpc291cmNlSUQgZGVzdGluYXRpb25VUkw6KE5TVVJM ICopZGVzdGluYXRpb24gc291cmNlRGVzY3JpcHRpb246KE5TU3RyaW5nICopc291cmNlRGVzY3Jp cHRpb24gcHVyY2hhc2VyOihOU1N0cmluZyAqKXB1cmNoYXNlciByZXBvcnRFbmRwb2ludDooTlNV UkwgKilyZXBvcnRFbmRwb2ludCBub25jZTooTlNTdHJpbmcgKilub25jZQoreworICAgIFdlYkNv cmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50IG1lYXN1cmVtZW50KAorICAgICAgICBXZWJDb3Jl OjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlSUQoc291cmNlSUQpLAorICAgICAgICBX ZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlU2l0ZShyZXBvcnRFbmRwb2lu dCksCisgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpBdHRyaWJ1dGlv bkRlc3RpbmF0aW9uU2l0ZShkZXN0aW5hdGlvbiksCisgICAgICAgIHNvdXJjZURlc2NyaXB0aW9u LAorICAgICAgICBwdXJjaGFzZXIKKyAgICApOworICAgIGlmIChub25jZSkKKyAgICAgICAgbWVh c3VyZW1lbnQuc2V0RXBoZW1lcmFsU291cmNlTm9uY2UoeyBub25jZSB9KTsKKworICAgIF9wYWdl LT5zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZNb3ZlKG1lYXN1cmVtZW50KSk7Cit9CisK IC0gKHZvaWQpX3NldFBhZ2VTY2FsZTooQ0dGbG9hdClzY2FsZSB3aXRoT3JpZ2luOihDR1BvaW50 KW9yaWdpbgogewogICAgIF9wYWdlLT5zY2FsZVBhZ2Uoc2NhbGUsIFdlYkNvcmU6OnJvdW5kZWRJ bnRQb2ludChvcmlnaW4pKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9pb3MvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmdJT1MuaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmdJT1MuaAppbmRleCBhYzYx ZmM5MzdmNjJlMTI1NzE3Mjc2YTcwZmRmYWQ5ZmYyYTdhMGJkLi4wZjhkZjIxY2MzZWFiOTAyMDU5 YTQxMjAxZmI1MzIxZmI5NTllOTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvaW9zL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nSU9TLmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZ0lPUy5oCkBA IC04NywxMCArODcsNiBAQAogCiAtICh2b2lkKV9zZXREZXZpY2VIYXNBR1hDb21waWxlclNlcnZp Y2VGb3JUZXN0aW5nOwogCi0jaWYgIVRBUkdFVF9PU19UViAmJiAhVEFSR0VUX09TX1dBVENICi0t ICh2b2lkKV9zZXRVSUV2ZW50QXR0cmlidXRpb25Gb3JUZXN0aW5nOihVSUV2ZW50QXR0cmlidXRp b24gKilhdHRyaWJ1dGlvbiB3aXRoTm9uY2U6KE5TU3RyaW5nICopbm9uY2U7Ci0jZW5kaWYKLQog LSAoTlNTdHJpbmcgKilfc2VyaWFsaXplZFNlbGVjdGlvbkNhcmV0QmFja2dyb3VuZENvbG9yRm9y VGVzdGluZzsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1tCmluZGV4IDc4OTE4NWRjOGRjNGViMzhhZGFiZWJl YzljOGY3YjZiOTMyZGM1YTAuLjdhZDhiY2IyYWYzMTYzOTc5ZDMwZDNmOTUwNDI0NzlkY2YwOGVi YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 VGVzdGluZ0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld1Rlc3RpbmdJT1MubW0KQEAgLTQ2NSwyNyArNDY1LDYgQEAgc3RhdGljIHZvaWQgZHVtcFVJ VmlldyhUZXh0U3RyZWFtJiB0cywgVUlWaWV3ICp2aWV3KQogICAgICAgICBfcGFnZS0+c2V0RGV2 aWNlSGFzQUdYQ29tcGlsZXJTZXJ2aWNlRm9yVGVzdGluZygpOwogfQogCi0jaWYgIVBMQVRGT1JN KFdBVENIT1MpICYmICFQTEFURk9STShBUFBMRVRWKQotLSAodm9pZClfc2V0VUlFdmVudEF0dHJp YnV0aW9uRm9yVGVzdGluZzooVUlFdmVudEF0dHJpYnV0aW9uICopYXR0cmlidXRpb24gd2l0aE5v bmNlOihOU1N0cmluZyAqKW5vbmNlCi17Ci0jaWYgSEFWRShVSV9FVkVOVF9BVFRSSUJVVElPTikK LSAgICBpZiAoYXR0cmlidXRpb24pIHsKLSAgICAgICAgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnQgbWVhc3VyZW1lbnQoCi0gICAgICAgICAgICBXZWJDb3JlOjpQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudDo6U291cmNlSUQoYXR0cmlidXRpb24uc291cmNlSWRlbnRpZmllciksCi0gICAg ICAgICAgICBXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6U291cmNlU2l0ZShhdHRy aWJ1dGlvbi5yZXBvcnRFbmRwb2ludCksCi0gICAgICAgICAgICBXZWJDb3JlOjpQcml2YXRlQ2xp Y2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25EZXN0aW5hdGlvblNpdGUoYXR0cmlidXRpb24uZGVz dGluYXRpb25VUkwpLAotICAgICAgICAgICAgYXR0cmlidXRpb24uc291cmNlRGVzY3JpcHRpb24s Ci0gICAgICAgICAgICBhdHRyaWJ1dGlvbi5wdXJjaGFzZXIKLSAgICAgICAgKTsKLSAgICAgICAg bWVhc3VyZW1lbnQuc2V0RXBoZW1lcmFsU291cmNlTm9uY2UoeyBub25jZSB9KTsKLQotICAgICAg ICBfcGFnZS0+c2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV1RGTW92ZShtZWFzdXJlbWVudCkp OwotICAgIH0gZWxzZQotICAgICAgICBfcGFnZS0+c2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQo c3RkOjpudWxsb3B0KTsKLSNlbmRpZgotfQotI2VuZGlmCi0KIC0gKE5TU3RyaW5nICopX3Nlcmlh bGl6ZWRTZWxlY3Rpb25DYXJldEJhY2tncm91bmRDb2xvckZvclRlc3RpbmcKIHsKICAgICBVSUNv bG9yICpiYWNrZ3JvdW5kQ29sb3IgPSBbW19jb250ZW50VmlldyB0ZXh0SW50ZXJhY3Rpb25Bc3Np c3RhbnRdLnNlbGVjdGlvblZpZXcgdmFsdWVGb3JLZXlQYXRoOkAiY2FyZXRWaWV3LmJhY2tncm91 bmRDb2xvciJdOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGJiODMxYjNlMzM2NDI2ZDJkOWMwNWNjY2RlZjNhZjBjOTI1YTYwODMuLmUzMDU2ODI5 NDBlNTMxOTYwNGQ5MTljMTA1NmRhOGU4NDIxNTM4MmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wOC0xOSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIE1h a2UgVUlFdmVudEF0dHJpYnV0aW9uIHRlc3RzIGxlc3MgcGxhdGZvcm0gZGVwZW5kZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkzMjMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbToKKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OmV4YW1wbGVVUkwpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6cnVuQmFzaWNF dmVudEF0dHJpYnV0aW9uVGVzdCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwog MjAyMS0wOC0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TXSBSZW1vdmUgc3VwcG9ydCBmb3IgdGhlIG1lYW5pbmdmdWwgdGFwIGhldXJpc3Rp YwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FdmVu dEF0dHJpYnV0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9F dmVudEF0dHJpYnV0aW9uLm1tCmluZGV4IDAwMGEwMDM5ZDlmZmQyNGZjOTc3NTQzMzU4OTIzYmIw MGIzN2EyYWMuLmE4NDY5N2UwZDk1M2Q0NTZkODE3OTVhMjQzOGQ4ODlkNzUwY2JhZDkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1 dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50 QXR0cmlidXRpb24ubW0KQEAgLTI1LDggKzI1LDYgQEAKIAogI2ltcG9ydCAiY29uZmlnLmgiCiAK LSNpZiBIQVZFKFVJX0VWRU5UX0FUVFJJQlVUSU9OKQotCiAjaW1wb3J0ICJIVFRQU2VydmVyLmgi CiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgogI2ltcG9ydCAiVGVzdE5hdmlnYXRpb25E ZWxlZ2F0ZS5oIgpAQCAtNzUsNyArNzMsMTIgQEAKIAogbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkg ewogCi1URVNUKEV2ZW50QXR0cmlidXRpb24sIEJhc2ljKQorc3RhdGljIE5TVVJMICpleGFtcGxl VVJMKCkKK3sKKyAgICByZXR1cm4gW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwczovL2V4YW1w bGUuY29tLyJdOworfQorCit2b2lkIHJ1bkJhc2ljRXZlbnRBdHRyaWJ1dGlvblRlc3QoRnVuY3Rp b248dm9pZChXS1dlYlZpZXcgKiwgY29uc3QgSFRUUFNlcnZlciYpPiYmIGFkZEF0dHJpYnV0aW9u VG9XZWJWaWV3KQogewogICAgIGJvb2wgZG9uZSA9IGZhbHNlOwogICAgIEhUVFBTZXJ2ZXIgc2Vy dmVyKFsmZG9uZSwgY29ubmVjdGlvbkNvdW50ID0gMF0gKENvbm5lY3Rpb24gY29ubmVjdGlvbikg bXV0YWJsZSB7CkBAIC0xMDksMjEgKzExMiwyMSBAQCBURVNUKEV2ZW50QXR0cmlidXRpb24sIEJh c2ljKQogICAgIH0sIEhUVFBTZXJ2ZXI6OlByb3RvY29sOjpIdHRwcyk7CiAgICAgTlNVUkwgKnNl cnZlclVSTCA9IHNlcnZlci5yZXF1ZXN0KCkuVVJMOwogCi0gICAgYXV0byBleGFtcGxlVVJMID0g W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwczovL2V4YW1wbGUuY29tLyJdOwotICAgIGF1dG8g YXR0cmlidXRpb24gPSBhZG9wdE5TKFtbTW9ja0V2ZW50QXR0cmlidXRpb24gYWxsb2NdIGluaXRX aXRoUmVwb3J0RW5kcG9pbnQ6c2VydmVyLnJlcXVlc3QoKS5VUkwgZGVzdGluYXRpb25VUkw6ZXhh bXBsZVVSTF0pOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsK LSAgICB3ZWJWaWV3LmdldCgpLl91aUV2ZW50QXR0cmlidXRpb24gPSAoVUlFdmVudEF0dHJpYnV0 aW9uICopYXR0cmlidXRpb24uZ2V0KCk7CisgICAgYWRkQXR0cmlidXRpb25Ub1dlYlZpZXcod2Vi Vmlldy5nZXQoKSwgc2VydmVyKTsKICAgICBbW3dlYlZpZXcgY29uZmlndXJhdGlvbl0ud2Vic2l0 ZURhdGFTdG9yZSBfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQ6WUVTXTsKICAgICBb W3dlYlZpZXcgY29uZmlndXJhdGlvbl0ud2Vic2l0ZURhdGFTdG9yZSBfYWxsb3dUTFNDZXJ0aWZp Y2F0ZUNoYWluOkBbKGlkKXRlc3RDZXJ0aWZpY2F0ZSgpLmdldCgpXSBmb3JIb3N0OnNlcnZlclVS TC5ob3N0XTsKLSAgICBbd2ViVmlldyBfc2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRyaWJ1 dGlvblJlcG9ydFVSTHNGb3JUZXN0aW5nOnNlcnZlclVSTCBkZXN0aW5hdGlvblVSTDpleGFtcGxl VVJMIGNvbXBsZXRpb25IYW5kbGVyOl57CisgICAgW3dlYlZpZXcgX3NldFByaXZhdGVDbGlja01l YXN1cmVtZW50QXR0cmlidXRpb25SZXBvcnRVUkxzRm9yVGVzdGluZzpzZXJ2ZXJVUkwgZGVzdGlu YXRpb25VUkw6ZXhhbXBsZVVSTCgpIGNvbXBsZXRpb25IYW5kbGVyOl57CiAgICAgICAgIFt3ZWJW aWV3IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE92ZXJyaWRlVGltZXJGb3JUZXN0aW5nOllF UyBjb21wbGV0aW9uSGFuZGxlcjpeewogICAgICAgICAgICAgTlNTdHJpbmcgKmh0bWwgPSBbTlNT dHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIjxzY3JpcHQ+ZmV0Y2goJyVAY29udmVyc2lvblJlcXVl c3RCZWZvcmVSZWRpcmVjdCcse21vZGU6J25vLWNvcnMnfSk8L3NjcmlwdD4iLCBzZXJ2ZXJVUkxd OwotICAgICAgICAgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOmV4YW1w bGVVUkxdOworICAgICAgICAgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJM OmV4YW1wbGVVUkwoKV07CiAgICAgICAgIH1dOwogICAgIH1dOwogICAgIFV0aWw6OnJ1bigmZG9u ZSk7CiB9CiAKKyNpZiBIQVZFKFVJX0VWRU5UX0FUVFJJQlVUSU9OKQorCiAjaWYgSEFWRShSU0Ff QlNTQSkKIFRFU1QoRXZlbnRBdHRyaWJ1dGlvbiwgRnJhdWRQcmV2ZW50aW9uKQogewpAQCAtMjU4 LDE5ICsyNjEsMTcgQEAgVEVTVChFdmVudEF0dHJpYnV0aW9uLCBGcmF1ZFByZXZlbnRpb24pCiAg ICAgfSwgSFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzKTsKICAgICBOU1VSTCAqc2VydmVyVVJM ID0gc2VydmVyLnJlcXVlc3QoKS5VUkw7CiAKLSAgICBhdXRvIGV4YW1wbGVVUkwgPSBbTlNVUkwg VVJMV2l0aFN0cmluZzpAImh0dHBzOi8vZXhhbXBsZS5jb20vIl07Ci0gICAgYXV0byBhdHRyaWJ1 dGlvbiA9IGFkb3B0TlMoW1tNb2NrRXZlbnRBdHRyaWJ1dGlvbiBhbGxvY10gaW5pdFdpdGhSZXBv cnRFbmRwb2ludDpzZXJ2ZXJVUkwgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTF0pOwogICAgIGF1 dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsKLSAgICBbd2ViVmlldyBfc2V0 VUlFdmVudEF0dHJpYnV0aW9uRm9yVGVzdGluZzooVUlFdmVudEF0dHJpYnV0aW9uICopYXR0cmli dXRpb24uZ2V0KCkgd2l0aE5vbmNlOkAiQUJDREVGYWJjZGVmMDEyMzQ1Njc4OSJdOworICAgIFt3 ZWJWaWV3IF9hZGRFdmVudEF0dHJpYnV0aW9uV2l0aFNvdXJjZUlEOjQyIGRlc3RpbmF0aW9uVVJM OmV4YW1wbGVVUkwoKSBzb3VyY2VEZXNjcmlwdGlvbjpAInRlc3Qgc291cmNlIGRlc2NyaXB0aW9u IiBwdXJjaGFzZXI6QCJ0ZXN0IHB1cmNoYXNlciIgcmVwb3J0RW5kcG9pbnQ6c2VydmVyVVJMIG5v bmNlOkAiQUJDREVGYWJjZGVmMDEyMzQ1Njc4OSJdOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0 aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZ RVNdOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9hbGxv d1RMU0NlcnRpZmljYXRlQ2hhaW46QFsoaWQpdGVzdENlcnRpZmljYXRlKCkuZ2V0KCldIGZvckhv c3Q6c2VydmVyVVJMLmhvc3RdOwogCi0gICAgW3dlYlZpZXcgX3NldFByaXZhdGVDbGlja01lYXN1 cmVtZW50QXR0cmlidXRpb25SZXBvcnRVUkxzRm9yVGVzdGluZzpzZXJ2ZXJVUkwgZGVzdGluYXRp b25VUkw6ZXhhbXBsZVVSTCBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgIFt3ZWJWaWV3IF9zZXRQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uUmVwb3J0VVJMc0ZvclRlc3Rpbmc6c2Vy dmVyVVJMIGRlc3RpbmF0aW9uVVJMOmV4YW1wbGVVUkwoKSBjb21wbGV0aW9uSGFuZGxlcjpeewog ICAgICAgICBbd2ViVmlldyBfc2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRPdmVycmlkZVRpbWVy Rm9yVGVzdGluZzpZRVMgY29tcGxldGlvbkhhbmRsZXI6XnsKICAgICAgICAgICAgIFt3ZWJWaWV3 IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVG9rZW5QdWJsaWNLZXlVUkxG b3JUZXN0aW5nOnNlcnZlclVSTCBjb21wbGV0aW9uSGFuZGxlcjpeewogICAgICAgICAgICAgICAg IFt3ZWJWaWV3IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVG9rZW5TaWdu YXR1cmVVUkxGb3JUZXN0aW5nOnNlcnZlclVSTCBjb21wbGV0aW9uSGFuZGxlcjpeewogICAgICAg ICAgICAgICAgICAgICBOU1N0cmluZyAqaHRtbCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0 OkAiPHNjcmlwdD5zZXRUaW1lb3V0KGZ1bmN0aW9uKCl7IGZldGNoKCclQGNvbnZlcnNpb25SZXF1 ZXN0QmVmb3JlUmVkaXJlY3QnLHttb2RlOiduby1jb3JzJ30pOyB9LCAxMDApOzwvc2NyaXB0PiIs IHNlcnZlclVSTF07Ci0gICAgICAgICAgICAgICAgICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5n Omh0bWwgYmFzZVVSTDpleGFtcGxlVVJMXTsKKyAgICAgICAgICAgICAgICAgICAgW3dlYlZpZXcg bG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOmV4YW1wbGVVUkwoKV07CiAgICAgICAgICAgICAg ICAgfV07CiAgICAgICAgICAgICB9XTsKICAgICAgICAgfV07CkBAIC0yNzksNiArMjgwLDI1IEBA IFRFU1QoRXZlbnRBdHRyaWJ1dGlvbiwgRnJhdWRQcmV2ZW50aW9uKQogfQogI2VuZGlmCiAKLX0g Ly8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKKyNlbmRpZiAvLyBIQVZFKFVJX0VWRU5UX0FUVFJJ QlVUSU9OKQorCitURVNUKEV2ZW50QXR0cmlidXRpb24sIEJhc2ljKQoreworICAgIHJ1bkJhc2lj RXZlbnRBdHRyaWJ1dGlvblRlc3QoW10oV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBIVFRQU2Vy dmVyJiBzZXJ2ZXIpIHsKKyAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRo U291cmNlSUQ6NDIgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2NyaXB0aW9u OkAidGVzdCBzb3VyY2UgZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hhc2VyIiBy ZXBvcnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBub25jZTpuaWxdOworICAgIH0pOwor fQorCisjaWYgSEFWRShVSV9FVkVOVF9BVFRSSUJVVElPTikKIAotI2VuZGlmIC8vIFBMQVRGT1JN KElPU19GQU1JTFkpCitURVNUKEV2ZW50QXR0cmlidXRpb24sIEJhc2ljV2l0aElPU1NQSSkKK3sK KyAgICBydW5CYXNpY0V2ZW50QXR0cmlidXRpb25UZXN0KFtdKFdLV2ViVmlldyAqd2ViVmlldywg Y29uc3QgSFRUUFNlcnZlciYgc2VydmVyKSB7CisgICAgICAgIGF1dG8gYXR0cmlidXRpb24gPSBh ZG9wdE5TKFtbTW9ja0V2ZW50QXR0cmlidXRpb24gYWxsb2NdIGluaXRXaXRoUmVwb3J0RW5kcG9p bnQ6c2VydmVyLnJlcXVlc3QoKS5VUkwgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpXSk7Cisg ICAgICAgIHdlYlZpZXcuX3VpRXZlbnRBdHRyaWJ1dGlvbiA9IChVSUV2ZW50QXR0cmlidXRpb24g KilhdHRyaWJ1dGlvbi5nZXQoKTsKKyAgICB9KTsKK30KKworI2VuZGlmIC8vIEhBVkUoVUlfRVZF TlRfQVRUUklCVVRJT04pCisKK30gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK 436034 2021-08-20 15:15:45 -0700 2021-08-20 15:34:20 -0700 Patch bug-229323-20210820151544.patch text/plain 16241 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjNTM1OWVlZDVhNGU3MGVl YjNjYjQxZDE0ZjgyMDVkMTZmYzdmY2EuLjE0MTU4MTYxMmNmNWI4OGE0ZThjN2IxMTJiNTQzODcw NTlkMjMzYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDgtMjAgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIFVJRXZl bnRBdHRyaWJ1dGlvbiB0ZXN0cyBsZXNzIHBsYXRmb3JtIGRlcGVuZGVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgSm9obiBXaWxhbmRlci4KKworICAgICAgICBUaGlzIGFsbG93cyBtZSB0byBydW4g dGhlIFVJRXZlbnRBdHRyaWJ1dGlvbiB0ZXN0cyBvbiBtYWNPUy4KKyAgICAgICAgSXQgYWxzbyBt YWtlcyB0aGVtIG5vdCB0aW1lIG91dCwgd2hpY2ggdGhleSB3ZXJlIGRvaW5nIHNpbmNlIHIyNzc0 NDcuCisgICAgICAgIFRvIGFjY29tcGxpc2ggdGhpcywgSSBhZGRlZCBtb3JlIHRlc3QgU1BJIHRv IHByZXZlbnQgdGhlIG5ldHdvcmsgcHJvY2VzcworICAgICAgICBzdXNwZW5zaW9uIG1lc3NhZ2Us IHdoaWNoIHdhcyBjYXVzaW5nIHRoZSB0ZXN0IHRvIHRpbWUgb3V0IG9uIHRoZSBpT1Mgc2ltdWxh dG9yLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9y VGVzdGluZy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3VGVzdGlu Zy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9hZGRFdmVudEF0dHJpYnV0aW9uV2l0aFNvdXJj ZUlEOmRlc3RpbmF0aW9uVVJMOnNvdXJjZURlc2NyaXB0aW9uOnB1cmNoYXNlcjpyZXBvcnRFbmRw b2ludDpvcHRpb25hbE5vbmNlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoK1tXS1dlYnNpdGVEYXRhU3RvcmUgX3ByZXZl bnROZXR3b3JrUHJvY2Vzc1N1c3BlbnNpb25Gb3JUZXN0aW5nXSk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmdJT1MuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1tOgorICAgICAgICAoLVtX S1dlYlZpZXcgX3NldFVJRXZlbnRBdHRyaWJ1dGlvbkZvclRlc3Rpbmc6d2l0aE5vbmNlOl0pOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpwcmV2ZW50U3VzcGVu c2lvbkZvclRlc3RpbmcpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5Ojpz ZW5kUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NQcm94eS5oOgorCiAyMDIxLTA4LTE4ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2Fy ZG5lckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVubmVlZGVkIFVJS2l0U1BJIGRlY2xh cmF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaAppbmRleCA0MDg3NDg0NjZlZWJjOWQy NjI5OGM1ZTQyMjhhZjRjZDhiZTY3MmYzLi4wYzIyZWRkYTg1MDg1MTZjMTU2YWJhMzJmNGYxZWYx YjVjY2UzYjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaApAQCAtNDQsNiArNDQsOCBA QCBzdHJ1Y3QgV0tBcHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEgewogCiBAaW50ZXJmYWNlIFdL V2ViVmlldyAoV0tUZXN0aW5nKQogCistICh2b2lkKV9hZGRFdmVudEF0dHJpYnV0aW9uV2l0aFNv dXJjZUlEOih1aW50OF90KXNvdXJjZUlEIGRlc3RpbmF0aW9uVVJMOihOU1VSTCAqKWRlc3RpbmF0 aW9uIHNvdXJjZURlc2NyaXB0aW9uOihOU1N0cmluZyAqKXNvdXJjZURlc2NyaXB0aW9uIHB1cmNo YXNlcjooTlNTdHJpbmcgKilwdXJjaGFzZXIgcmVwb3J0RW5kcG9pbnQ6KE5TVVJMICopcmVwb3J0 RW5kcG9pbnQgb3B0aW9uYWxOb25jZToobnVsbGFibGUgTlNTdHJpbmcgKilub25jZSBXS19BUElf QVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworCiAtICh2b2lk KV9zZXRQYWdlU2NhbGU6KENHRmxvYXQpc2NhbGUgd2l0aE9yaWdpbjooQ0dQb2ludClvcmlnaW47 CiAtIChDR0Zsb2F0KV9wYWdlU2NhbGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1Rlc3RpbmcubW0KaW5kZXggMDQ0ZTkyY2FjM2FjZDA4 ZjY0YjcxNjRiNTY3NDJmNDhhMzM1ODY5NS4uMTQ0YmY0ZmVkYTUwZjBkZjU0YTNmMmYxOWNlMTQw YmYzZmM3ZmE5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlld1Rlc3RpbmcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlld1Rlc3RpbmcubW0KQEAgLTU1LDYgKzU1LDIxIEBACiAKIEBpbXBsZW1lbnRh dGlvbiBXS1dlYlZpZXcgKFdLVGVzdGluZykKIAorLSAodm9pZClfYWRkRXZlbnRBdHRyaWJ1dGlv bldpdGhTb3VyY2VJRDoodWludDhfdClzb3VyY2VJRCBkZXN0aW5hdGlvblVSTDooTlNVUkwgKilk ZXN0aW5hdGlvbiBzb3VyY2VEZXNjcmlwdGlvbjooTlNTdHJpbmcgKilzb3VyY2VEZXNjcmlwdGlv biBwdXJjaGFzZXI6KE5TU3RyaW5nICopcHVyY2hhc2VyIHJlcG9ydEVuZHBvaW50OihOU1VSTCAq KXJlcG9ydEVuZHBvaW50IG9wdGlvbmFsTm9uY2U6KE5TU3RyaW5nICopbm9uY2UKK3sKKyAgICBX ZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCBtZWFzdXJlbWVudCgKKyAgICAgICAgV2Vi Q29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlNvdXJjZUlEKHNvdXJjZUlEKSwKKyAgICAg ICAgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlNvdXJjZVNpdGUocmVwb3J0RW5k cG9pbnQpLAorICAgICAgICBXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmli dXRpb25EZXN0aW5hdGlvblNpdGUoZGVzdGluYXRpb24pLAorICAgICAgICBzb3VyY2VEZXNjcmlw dGlvbiwKKyAgICAgICAgcHVyY2hhc2VyCisgICAgKTsKKyAgICBpZiAobm9uY2UpCisgICAgICAg IG1lYXN1cmVtZW50LnNldEVwaGVtZXJhbFNvdXJjZU5vbmNlKHsgbm9uY2UgfSk7CisKKyAgICBf cGFnZS0+c2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV1RGTW92ZShtZWFzdXJlbWVudCkpOwor fQorCiAtICh2b2lkKV9zZXRQYWdlU2NhbGU6KENHRmxvYXQpc2NhbGUgd2l0aE9yaWdpbjooQ0dQ b2ludClvcmlnaW4KIHsKICAgICBfcGFnZS0+c2NhbGVQYWdlKHNjYWxlLCBXZWJDb3JlOjpyb3Vu ZGVkSW50UG9pbnQob3JpZ2luKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCA2NzJiMjA1MzQ0MmU3ZTgz NGFhNDUzYzQwZDMyYzlkOTA3MDFlMTAzLi44Y2EyNDEyZTY4YTE5NzQ3YTU1NGEzZDg1YmM5ZDE5 MzQwY2M0MzI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAgLTczMSw2ICs3MzEsMTEgQEAgc3RhdGljIFZl Y3RvcjxXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3JkPiB0b1dlYnNpdGVEYXRhUmVjb3JkcyhOU0Fy cmF5ICpkYXRhUmVjb3IKICAgICBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Om1ha2VOZXh0TmV0 d29ya1Byb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZygpOwogfQogCisrICh2b2lkKV9wcmV2ZW50 TmV0d29ya1Byb2Nlc3NTdXNwZW5zaW9uRm9yVGVzdGluZworeworICAgIFdlYktpdDo6TmV0d29y a1Byb2Nlc3NQcm94eTo6cHJldmVudFN1c3BlbnNpb25Gb3JUZXN0aW5nKCk7Cit9CisKIC0gKEJP T0wpX25ldHdvcmtQcm9jZXNzRXhpc3RzCiB7CiAgICAgcmV0dXJuICEhX3dlYnNpdGVEYXRhU3Rv cmUtPm5ldHdvcmtQcm9jZXNzSWZFeGlzdHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0ZS5oCmlu ZGV4IDU1ZDUyYTQ4NTQ4MTY3NjcwYWVlYWU4N2UxM2M5OWRhMjdmYThmOWUuLmJlYjRjMjg1OGNl OWQwOTc4MGY3NmI4Mzk4Y2FkYTcyNjdlNjM3OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVByaXZhdGUu aApAQCAtOTUsNiArOTUsNyBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgX1dLV2Vi c2l0ZURhdGFTdG9yZUZldGNoT3B0aW9ucykgewogLSAodm9pZClfc2VuZE5ldHdvcmtQcm9jZXNz UHJlcGFyZVRvU3VzcGVuZDoodm9pZCheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElf QVZBSUxBQkxFKG1hY29zKDEyLjApLCBpb3MoMTUuMCkpOwogLSAodm9pZClfc2VuZE5ldHdvcmtQ cm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTIuMCks IGlvcygxNS4wKSk7CiAtICh2b2lkKV9zZW5kTmV0d29ya1Byb2Nlc3NEaWRSZXN1bWUgV0tfQVBJ X0FWQUlMQUJMRShtYWNvcygxMi4wKSwgaW9zKDE1LjApKTsKKysgKHZvaWQpX3ByZXZlbnROZXR3 b3JrUHJvY2Vzc1N1c3BlbnNpb25Gb3JUZXN0aW5nIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tf TUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9zeW50aGVzaXplQXBwSXNCYWNr Z3JvdW5kOihCT09MKWJhY2tncm91bmQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMi4wKSwgaW9z KDE1LjApKTsKIC0gKHBpZF90KV9uZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXIgV0tfQVBJX0FWQUlM QUJMRShtYWNvcygxMi4wKSwgaW9zKDE1LjApKTsKICsgKHZvaWQpX21ha2VOZXh0TmV0d29ya1By b2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEyLjApLCBp b3MoMTUuMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9X S1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZ0lPUy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZ0lPUy5oCmluZGV4IDAyZjE2Y2EzYWE2 NjU1MjI4ZTc1MmU0OGM0NTc0OTdlMGQyYTkyZGUuLmQzYzA1YjUwMGQ4YjE0ZjcyMTY4YzdkMDU5 ODBhZjY2OWJlM2VmNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9p b3MvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmdJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nSU9TLmgKQEAgLTg5LDEw ICs4OSw2IEBACiAKIC0gKHZvaWQpX3NldERldmljZUhhc0FHWENvbXBpbGVyU2VydmljZUZvclRl c3Rpbmc7CiAKLSNpZiAhVEFSR0VUX09TX1RWICYmICFUQVJHRVRfT1NfV0FUQ0gKLS0gKHZvaWQp X3NldFVJRXZlbnRBdHRyaWJ1dGlvbkZvclRlc3Rpbmc6KFVJRXZlbnRBdHRyaWJ1dGlvbiAqKWF0 dHJpYnV0aW9uIHdpdGhOb25jZTooTlNTdHJpbmcgKilub25jZTsKLSNlbmRpZgotCiAtIChOU1N0 cmluZyAqKV9zZXJpYWxpemVkU2VsZWN0aW9uQ2FyZXRCYWNrZ3JvdW5kQ29sb3JGb3JUZXN0aW5n OwogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld1Rlc3RpbmdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld1Rlc3RpbmdJT1MubW0KaW5kZXggNWI0MDc3YzQ0YmI1ZmE0ZGY3MDZjMWJkN2VjOTBk ZWQzMThkNTk2ZC4uM2QwOTNlMThiNzFkZGZjOGQ0ODA1YzkxNGFhMGJlZTM1NjJiMTYxYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdUZXN0aW5n SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3VGVz dGluZ0lPUy5tbQpAQCAtNDcwLDI3ICs0NzAsNiBAQCBzdGF0aWMgdm9pZCBkdW1wVUlWaWV3KFRl eHRTdHJlYW0mIHRzLCBVSVZpZXcgKnZpZXcpCiAgICAgICAgIF9wYWdlLT5zZXREZXZpY2VIYXNB R1hDb21waWxlclNlcnZpY2VGb3JUZXN0aW5nKCk7CiB9CiAKLSNpZiAhUExBVEZPUk0oV0FUQ0hP UykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCi0tICh2b2lkKV9zZXRVSUV2ZW50QXR0cmlidXRpb25G b3JUZXN0aW5nOihVSUV2ZW50QXR0cmlidXRpb24gKilhdHRyaWJ1dGlvbiB3aXRoTm9uY2U6KE5T U3RyaW5nICopbm9uY2UKLXsKLSNpZiBIQVZFKFVJX0VWRU5UX0FUVFJJQlVUSU9OKQotICAgIGlm IChhdHRyaWJ1dGlvbikgewotICAgICAgICBXZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dCBtZWFzdXJlbWVudCgKLSAgICAgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVt ZW50OjpTb3VyY2VJRChhdHRyaWJ1dGlvbi5zb3VyY2VJZGVudGlmaWVyKSwKLSAgICAgICAgICAg IFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1cmVtZW50OjpTb3VyY2VTaXRlKGF0dHJpYnV0aW9u LnJlcG9ydEVuZHBvaW50KSwKLSAgICAgICAgICAgIFdlYkNvcmU6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50OjpBdHRyaWJ1dGlvbkRlc3RpbmF0aW9uU2l0ZShhdHRyaWJ1dGlvbi5kZXN0aW5hdGlv blVSTCksCi0gICAgICAgICAgICBhdHRyaWJ1dGlvbi5zb3VyY2VEZXNjcmlwdGlvbiwKLSAgICAg ICAgICAgIGF0dHJpYnV0aW9uLnB1cmNoYXNlcgotICAgICAgICApOwotICAgICAgICBtZWFzdXJl bWVudC5zZXRFcGhlbWVyYWxTb3VyY2VOb25jZSh7IG5vbmNlIH0pOwotCi0gICAgICAgIF9wYWdl LT5zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZNb3ZlKG1lYXN1cmVtZW50KSk7Ci0gICAg fSBlbHNlCi0gICAgICAgIF9wYWdlLT5zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChzdGQ6Om51 bGxvcHQpOwotI2VuZGlmCi19Ci0jZW5kaWYKLQogLSAoTlNTdHJpbmcgKilfc2VyaWFsaXplZFNl bGVjdGlvbkNhcmV0QmFja2dyb3VuZENvbG9yRm9yVGVzdGluZwogewogICAgIFVJQ29sb3IgKmJh Y2tncm91bmRDb2xvciA9IFtbX2NvbnRlbnRWaWV3IHRleHRJbnRlcmFjdGlvbkFzc2lzdGFudF0u c2VsZWN0aW9uVmlldyB2YWx1ZUZvcktleVBhdGg6QCJjYXJldFZpZXcuYmFja2dyb3VuZENvbG9y Il07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3Jr UHJvY2Vzc1Byb3h5LmNwcAppbmRleCA1MmQxNGJmODM1Mzc5ZTU2M2MxY2QwZDRjNTBlMGFmNjEw YjZhZjE4Li42NzFhZGQ0YWEyN2NkMTdlYmI2NzkwZWZlMTZhNTVhMWMxNDM2NmViIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQ cm94eS5jcHAKQEAgLTEyNTAsOSArMTI1MCwxNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6 OnNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5Rm9yVGVzdGluZygpCiAgICAgaWYgKGNh blNlbmRNZXNzYWdlKCkpCiAgICAgICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vz czo6UHJvY2Vzc1dpbGxTdXNwZW5kSW1taW5lbnRseUZvclRlc3RpbmdTeW5jKCksIE1lc3NhZ2Vz OjpOZXR3b3JrUHJvY2Vzczo6UHJvY2Vzc1dpbGxTdXNwZW5kSW1taW5lbnRseUZvclRlc3RpbmdT eW5jOjpSZXBseSgpLCAwKTsKIH0KLSAgICAKKworc3RhdGljIGJvb2wgc19zdXNwZW5zaW9uUHJl dmVudGVkRm9yVGVzdGluZyB7IGZhbHNlIH07Cit2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnBy ZXZlbnRTdXNwZW5zaW9uRm9yVGVzdGluZygpCit7CisgICAgc19zdXNwZW5zaW9uUHJldmVudGVk Rm9yVGVzdGluZyA9IHRydWU7Cit9CisKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6c2VuZFBy ZXBhcmVUb1N1c3BlbmQoSXNTdXNwZW5zaW9uSW1taW5lbnQgaXNTdXNwZW5zaW9uSW1taW5lbnQs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBp ZiAoc19zdXNwZW5zaW9uUHJldmVudGVkRm9yVGVzdGluZykKKyAgICAgICAgcmV0dXJuIGNvbXBs ZXRpb25IYW5kbGVyKCk7CiAgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3b3Jr UHJvY2Vzczo6UHJlcGFyZVRvU3VzcGVuZChpc1N1c3BlbnNpb25JbW1pbmVudCA9PSBJc1N1c3Bl bnNpb25JbW1pbmVudDo6WWVzKSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIDAsIHsgfSwg U2hvdWxkU3RhcnRQcm9jZXNzVGhyb3R0bGVyQWN0aXZpdHk6Ok5vKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaApp bmRleCA2MmM4MTI5YjQ1NWZlYWNkNTBmOTUyMjkzZjI3ZDdhM2FmNDQzNmQ3Li41OGE4YThlOTRi ZjNjZmU3YmY4Yzc3OTc5ODVjYzEyYmQzYWI2OGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaApAQCAtMjMxLDYgKzIz MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNlbmRQcm9jZXNzRGlkUmVzdW1lKCkgZmluYWw7CiAg ICAgQVNDSUlMaXRlcmFsIGNsaWVudE5hbWUoKSBjb25zdCBmaW5hbCB7IHJldHVybiAiTmV0d29y a1Byb2Nlc3MiX3M7IH0KICAgICAKKyAgICBzdGF0aWMgdm9pZCBwcmV2ZW50U3VzcGVuc2lvbkZv clRlc3RpbmcoKTsKICAgICB2b2lkIHNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5Rm9y VGVzdGluZygpOwogCiAgICAgdm9pZCByZWdpc3RlclNjaGVtZUZvckxlZ2FjeUN1c3RvbVByb3Rv Y29sKGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IDJiNmIwZDUwMzg1NGQ5YTI3Mzc0ZjFlYzM4ODQ3YTBhYmNkNjA1ZDUu Ljg0OWM0YjBlOTU5YmQwNGY0OGVmNTBiMDAyNzRjN2YwY2JlYThjZGMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAy MS0wOC0yMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisg ICAgICAgIE1ha2UgVUlFdmVudEF0dHJpYnV0aW9uIHRlc3RzIGxlc3MgcGxhdGZvcm0gZGVwZW5k ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkz MjMKKworICAgICAgICBSZXZpZXdlZCBieSBKb2huIFdpbGFuZGVyLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6ZXhhbXBsZVVSTCk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpy dW5CYXNpY0V2ZW50QXR0cmlidXRpb25UZXN0KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRF U1QpOgorCiAyMDIxLTA4LTE4ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjI3OTE2OSkgW1dlYkRyaXZlcl0gV1BUIFRvb2xzIG5vdyByZXF1 aXJlcyBweXRob24zIHRvIGxhdW5jaCB0aGUgc2VydmVyCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0V2ZW50QXR0cmlidXRpb24ubW0KaW5kZXgg MDAwYTAwMzlkOWZmZDI0ZmM5Nzc1NDMzNTg5MjNiYjAwYjM3YTJhYy4uMmY1NzY2OGJiYTk0ZjI2 NDI3Zjk3MTg5YWQ3Yzg1NmJhZWRjODk4MiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9FdmVudEF0dHJpYnV0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRXZlbnRBdHRyaWJ1dGlvbi5tbQpAQCAtMjUsOCAr MjUsNiBAQAogCiAjaW1wb3J0ICJjb25maWcuaCIKIAotI2lmIEhBVkUoVUlfRVZFTlRfQVRUUklC VVRJT04pCi0KICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0 aWVzLmgiCiAjaW1wb3J0ICJUZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgiCkBAIC03NSw4ICs3Mywx NCBAQAogCiBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CiAKLVRFU1QoRXZlbnRBdHRyaWJ1dGlv biwgQmFzaWMpCitzdGF0aWMgTlNVUkwgKmV4YW1wbGVVUkwoKQoreworICAgIHJldHVybiBbTlNV UkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vZXhhbXBsZS5jb20vIl07Cit9CisKK3ZvaWQgcnVu QmFzaWNFdmVudEF0dHJpYnV0aW9uVGVzdChGdW5jdGlvbjx2b2lkKFdLV2ViVmlldyAqLCBjb25z dCBIVFRQU2VydmVyJik+JiYgYWRkQXR0cmlidXRpb25Ub1dlYlZpZXcpCiB7CisgICAgW1dLV2Vi c2l0ZURhdGFTdG9yZSBfcHJldmVudE5ldHdvcmtQcm9jZXNzU3VzcGVuc2lvbkZvclRlc3Rpbmdd OwogICAgIGJvb2wgZG9uZSA9IGZhbHNlOwogICAgIEhUVFBTZXJ2ZXIgc2VydmVyKFsmZG9uZSwg Y29ubmVjdGlvbkNvdW50ID0gMF0gKENvbm5lY3Rpb24gY29ubmVjdGlvbikgbXV0YWJsZSB7CiAg ICAgICAgIHN3aXRjaCAoKytjb25uZWN0aW9uQ291bnQpIHsKQEAgLTEwOSwyNCArMTEzLDI1IEBA IFRFU1QoRXZlbnRBdHRyaWJ1dGlvbiwgQmFzaWMpCiAgICAgfSwgSFRUUFNlcnZlcjo6UHJvdG9j b2w6Okh0dHBzKTsKICAgICBOU1VSTCAqc2VydmVyVVJMID0gc2VydmVyLnJlcXVlc3QoKS5VUkw7 CiAKLSAgICBhdXRvIGV4YW1wbGVVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8v ZXhhbXBsZS5jb20vIl07Ci0gICAgYXV0byBhdHRyaWJ1dGlvbiA9IGFkb3B0TlMoW1tNb2NrRXZl bnRBdHRyaWJ1dGlvbiBhbGxvY10gaW5pdFdpdGhSZXBvcnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVz dCgpLlVSTCBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMXSk7CiAgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwotICAgIHdlYlZpZXcuZ2V0KCkuX3VpRXZlbnRBdHRy aWJ1dGlvbiA9IChVSUV2ZW50QXR0cmlidXRpb24gKilhdHRyaWJ1dGlvbi5nZXQoKTsKKyAgICBh ZGRBdHRyaWJ1dGlvblRvV2ViVmlldyh3ZWJWaWV3LmdldCgpLCBzZXJ2ZXIpOwogICAgIFtbd2Vi VmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRW5hYmxlZDpZRVNdOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRl RGF0YVN0b3JlIF9hbGxvd1RMU0NlcnRpZmljYXRlQ2hhaW46QFsoaWQpdGVzdENlcnRpZmljYXRl KCkuZ2V0KCldIGZvckhvc3Q6c2VydmVyVVJMLmhvc3RdOwotICAgIFt3ZWJWaWV3IF9zZXRQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uUmVwb3J0VVJMc0ZvclRlc3Rpbmc6c2VydmVy VVJMIGRlc3RpbmF0aW9uVVJMOmV4YW1wbGVVUkwgY29tcGxldGlvbkhhbmRsZXI6XnsKKyAgICBb d2ViVmlldyBfc2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRyaWJ1dGlvblJlcG9ydFVSTHNG b3JUZXN0aW5nOnNlcnZlclVSTCBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMKCkgY29tcGxldGlv bkhhbmRsZXI6XnsKICAgICAgICAgW3dlYlZpZXcgX3NldFByaXZhdGVDbGlja01lYXN1cmVtZW50 T3ZlcnJpZGVUaW1lckZvclRlc3Rpbmc6WUVTIGNvbXBsZXRpb25IYW5kbGVyOl57CiAgICAgICAg ICAgICBOU1N0cmluZyAqaHRtbCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiPHNjcmlw dD5mZXRjaCgnJUBjb252ZXJzaW9uUmVxdWVzdEJlZm9yZVJlZGlyZWN0Jyx7bW9kZTonbm8tY29y cyd9KTwvc2NyaXB0PiIsIHNlcnZlclVSTF07Ci0gICAgICAgICAgICBbd2ViVmlldyBsb2FkSFRN TFN0cmluZzpodG1sIGJhc2VVUkw6ZXhhbXBsZVVSTF07CisgICAgICAgICAgICBbd2ViVmlldyBs b2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6ZXhhbXBsZVVSTCgpXTsKICAgICAgICAgfV07CiAg ICAgfV07CiAgICAgVXRpbDo6cnVuKCZkb25lKTsKIH0KIAorI2lmIEhBVkUoVUlfRVZFTlRfQVRU UklCVVRJT04pCisKICNpZiBIQVZFKFJTQV9CU1NBKQogVEVTVChFdmVudEF0dHJpYnV0aW9uLCBG cmF1ZFByZXZlbnRpb24pCiB7CisgICAgW1dLV2Vic2l0ZURhdGFTdG9yZSBfcHJldmVudE5ldHdv cmtQcm9jZXNzU3VzcGVuc2lvbkZvclRlc3RpbmddOwogICAgIGJvb2wgZG9uZSA9IGZhbHNlOwog CiAgICAgLy8gR2VuZXJhdGUgdGhlIHNlcnZlciBrZXkgcGFpci4KQEAgLTI1OCwxOSArMjYzLDE3 IEBAIFRFU1QoRXZlbnRBdHRyaWJ1dGlvbiwgRnJhdWRQcmV2ZW50aW9uKQogICAgIH0sIEhUVFBT ZXJ2ZXI6OlByb3RvY29sOjpIdHRwcyk7CiAgICAgTlNVUkwgKnNlcnZlclVSTCA9IHNlcnZlci5y ZXF1ZXN0KCkuVVJMOwogCi0gICAgYXV0byBleGFtcGxlVVJMID0gW05TVVJMIFVSTFdpdGhTdHJp bmc6QCJodHRwczovL2V4YW1wbGUuY29tLyJdOwotICAgIGF1dG8gYXR0cmlidXRpb24gPSBhZG9w dE5TKFtbTW9ja0V2ZW50QXR0cmlidXRpb24gYWxsb2NdIGluaXRXaXRoUmVwb3J0RW5kcG9pbnQ6 c2VydmVyVVJMIGRlc3RpbmF0aW9uVVJMOmV4YW1wbGVVUkxdKTsKICAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7Ci0gICAgW3dlYlZpZXcgX3NldFVJRXZlbnRBdHRy aWJ1dGlvbkZvclRlc3Rpbmc6KFVJRXZlbnRBdHRyaWJ1dGlvbiAqKWF0dHJpYnV0aW9uLmdldCgp IHdpdGhOb25jZTpAIkFCQ0RFRmFiY2RlZjAxMjM0NTY3ODkiXTsKKyAgICBbd2ViVmlldyBfYWRk RXZlbnRBdHRyaWJ1dGlvbldpdGhTb3VyY2VJRDo0MiBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJM KCkgc291cmNlRGVzY3JpcHRpb246QCJ0ZXN0IHNvdXJjZSBkZXNjcmlwdGlvbiIgcHVyY2hhc2Vy OkAidGVzdCBwdXJjaGFzZXIiIHJlcG9ydEVuZHBvaW50OnNlcnZlclVSTCBvcHRpb25hbE5vbmNl OkAiQUJDREVGYWJjZGVmMDEyMzQ1Njc4OSJdOwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9u XS53ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZRVNd OwogICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS53ZWJzaXRlRGF0YVN0b3JlIF9hbGxvd1RM U0NlcnRpZmljYXRlQ2hhaW46QFsoaWQpdGVzdENlcnRpZmljYXRlKCkuZ2V0KCldIGZvckhvc3Q6 c2VydmVyVVJMLmhvc3RdOwogCi0gICAgW3dlYlZpZXcgX3NldFByaXZhdGVDbGlja01lYXN1cmVt ZW50QXR0cmlidXRpb25SZXBvcnRVUkxzRm9yVGVzdGluZzpzZXJ2ZXJVUkwgZGVzdGluYXRpb25V Ukw6ZXhhbXBsZVVSTCBjb21wbGV0aW9uSGFuZGxlcjpeeworICAgIFt3ZWJWaWV3IF9zZXRQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uUmVwb3J0VVJMc0ZvclRlc3Rpbmc6c2VydmVy VVJMIGRlc3RpbmF0aW9uVVJMOmV4YW1wbGVVUkwoKSBjb21wbGV0aW9uSGFuZGxlcjpeewogICAg ICAgICBbd2ViVmlldyBfc2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRPdmVycmlkZVRpbWVyRm9y VGVzdGluZzpZRVMgY29tcGxldGlvbkhhbmRsZXI6XnsKICAgICAgICAgICAgIFt3ZWJWaWV3IF9z ZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVG9rZW5QdWJsaWNLZXlVUkxGb3JU ZXN0aW5nOnNlcnZlclVSTCBjb21wbGV0aW9uSGFuZGxlcjpeewogICAgICAgICAgICAgICAgIFt3 ZWJWaWV3IF9zZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVG9rZW5TaWduYXR1 cmVVUkxGb3JUZXN0aW5nOnNlcnZlclVSTCBjb21wbGV0aW9uSGFuZGxlcjpeewogICAgICAgICAg ICAgICAgICAgICBOU1N0cmluZyAqaHRtbCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAi PHNjcmlwdD5zZXRUaW1lb3V0KGZ1bmN0aW9uKCl7IGZldGNoKCclQGNvbnZlcnNpb25SZXF1ZXN0 QmVmb3JlUmVkaXJlY3QnLHttb2RlOiduby1jb3JzJ30pOyB9LCAxMDApOzwvc2NyaXB0PiIsIHNl cnZlclVSTF07Ci0gICAgICAgICAgICAgICAgICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOmh0 bWwgYmFzZVVSTDpleGFtcGxlVVJMXTsKKyAgICAgICAgICAgICAgICAgICAgW3dlYlZpZXcgbG9h ZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOmV4YW1wbGVVUkwoKV07CiAgICAgICAgICAgICAgICAg fV07CiAgICAgICAgICAgICB9XTsKICAgICAgICAgfV07CkBAIC0yNzksNiArMjgyLDI1IEBAIFRF U1QoRXZlbnRBdHRyaWJ1dGlvbiwgRnJhdWRQcmV2ZW50aW9uKQogfQogI2VuZGlmCiAKLX0gLy8g bmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKKyNlbmRpZiAvLyBIQVZFKFVJX0VWRU5UX0FUVFJJQlVU SU9OKQorCitURVNUKEV2ZW50QXR0cmlidXRpb24sIEJhc2ljKQoreworICAgIHJ1bkJhc2ljRXZl bnRBdHRyaWJ1dGlvblRlc3QoW10oV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBIVFRQU2VydmVy JiBzZXJ2ZXIpIHsKKyAgICAgICAgW3dlYlZpZXcgX2FkZEV2ZW50QXR0cmlidXRpb25XaXRoU291 cmNlSUQ6NDIgZGVzdGluYXRpb25VUkw6ZXhhbXBsZVVSTCgpIHNvdXJjZURlc2NyaXB0aW9uOkAi dGVzdCBzb3VyY2UgZGVzY3JpcHRpb24iIHB1cmNoYXNlcjpAInRlc3QgcHVyY2hhc2VyIiByZXBv cnRFbmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBvcHRpb25hbE5vbmNlOm5pbF07CisgICAg fSk7Cit9CisKKyNpZiBIQVZFKFVJX0VWRU5UX0FUVFJJQlVUSU9OKQogCi0jZW5kaWYgLy8gUExB VEZPUk0oSU9TX0ZBTUlMWSkKK1RFU1QoRXZlbnRBdHRyaWJ1dGlvbiwgQmFzaWNXaXRoSU9TU1BJ KQoreworICAgIHJ1bkJhc2ljRXZlbnRBdHRyaWJ1dGlvblRlc3QoW10oV0tXZWJWaWV3ICp3ZWJW aWV3LCBjb25zdCBIVFRQU2VydmVyJiBzZXJ2ZXIpIHsKKyAgICAgICAgYXV0byBhdHRyaWJ1dGlv biA9IGFkb3B0TlMoW1tNb2NrRXZlbnRBdHRyaWJ1dGlvbiBhbGxvY10gaW5pdFdpdGhSZXBvcnRF bmRwb2ludDpzZXJ2ZXIucmVxdWVzdCgpLlVSTCBkZXN0aW5hdGlvblVSTDpleGFtcGxlVVJMKCld KTsKKyAgICAgICAgd2ViVmlldy5fdWlFdmVudEF0dHJpYnV0aW9uID0gKFVJRXZlbnRBdHRyaWJ1 dGlvbiAqKWF0dHJpYnV0aW9uLmdldCgpOworICAgIH0pOworfQorCisjZW5kaWYgLy8gSEFWRShV SV9FVkVOVF9BVFRSSUJVVElPTikKKworfSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQo=