208012 2020-02-20 10:00:50 -0800 [Cocoa] Limit set of classes that can be decoded when a preference has changed 2020-03-16 08:19:59 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue webkit-bug-importer oldest_to_newest 1621265 0 pvollan 2020-02-20 10:00:50 -0800 As a hardening measure, limit the set of ObjectiveC classes that can be decoded in the WebContent process as a result of a preference change. 1621266 1 webkit-bug-importer 2020-02-20 10:01:16 -0800 <rdar://problem/59633032> 1621269 2 391299 pvollan 2020-02-20 10:05:00 -0800 Created attachment 391299 Patch 1623134 3 391299 bfulgham 2020-02-26 13:15:27 -0800 Comment on attachment 391299 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391299&action=review I think this looks good, but marking r- because I think this introduces a leak. > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:945 > + auto classes = [NSSet setWithArray:@[[NSString class], [NSNumber class], [NSDate class], [NSDictionary class], [NSArray class], [NSData class]]]; We should consider making this a static thing that doesn't have to get reconstructed every time there is a preference change. > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:946 > + id object = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&err]; Don't we still need to retain the unarchived object returned by this method? Either we were over-releasing previously, or you've introduced a leak here. 1624098 4 392013 pvollan 2020-02-28 13:24:42 -0800 Created attachment 392013 Patch 1624099 5 pvollan 2020-02-28 13:28:01 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 391299 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391299&action=review > > I think this looks good, but marking r- because I think this introduces a > leak. > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:945 > > + auto classes = [NSSet setWithArray:@[[NSString class], [NSNumber class], [NSDate class], [NSDictionary class], [NSArray class], [NSData class]]]; > > We should consider making this a static thing that doesn't have to get > reconstructed every time there is a preference change. > Fixed. > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:946 > > + id object = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&err]; > > Don't we still need to retain the unarchived object returned by this method? > Either we were over-releasing previously, or you've introduced a leak here. I could be wrong, but I believe this patch does not change the retain count of the object after returning from the method, since the RetainPtr variable was local. Thanks for reviewing! 1627873 6 393062 pvollan 2020-03-09 12:31:04 -0700 Created attachment 393062 Patch 1629595 7 393478 pvollan 2020-03-13 07:13:42 -0700 Created attachment 393478 Patch 1629650 8 393491 pvollan 2020-03-13 09:44:33 -0700 Created attachment 393491 Patch 1629670 9 pvollan 2020-03-13 10:15:28 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 391299 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391299&action=review > > I think this looks good, but marking r- because I think this introduces a > leak. > > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:945 > > + auto classes = [NSSet setWithArray:@[[NSString class], [NSNumber class], [NSDate class], [NSDictionary class], [NSArray class], [NSData class]]]; > > We should consider making this a static thing that doesn't have to get > reconstructed every time there is a preference change. > For some reason, making this static introduced a crash, so I went back to declaring it as a stack allocated variable. > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:946 > > + id object = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&err]; > > Don't we still need to retain the unarchived object returned by this method? > Either we were over-releasing previously, or you've introduced a leak here. 1630120 10 393491 bfulgham 2020-03-14 16:34:11 -0700 Comment on attachment 393491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393491&action=review r=me > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:915 > + id object = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&err]; Oh, excellent. Thank you for cleaning this one up. 1630315 11 393491 pvollan 2020-03-16 07:36:06 -0700 Comment on attachment 393491 Patch Thanks for reviewing! 1630320 12 393491 commit-queue 2020-03-16 08:19:57 -0700 Comment on attachment 393491 Patch Clearing flags on attachment: 393491 Committed r258495: <https://trac.webkit.org/changeset/258495> 1630321 13 commit-queue 2020-03-16 08:19:59 -0700 All reviewed patches have been landed. Closing bug. 391299 2020-02-20 10:05:00 -0800 2020-02-28 13:24:40 -0800 Patch bug-208012-20200220100500.patch text/plain 7485 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTcwNjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTIwICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExpbWl0IHNldCBv ZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVuY2UgaGFzIGNoYW5n ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGEg aGFyZGVuaW5nIG1lYXN1cmUsIGxpbWl0IHRoZSBzZXQgb2YgT2JqZWN0aXZlQyBjbGFzc2VzIHRo YXQgY2FuIGJlIGRlY29kZWQgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcworICAgICAgICBhcyBh IHJlc3VsdCBvZiBhIHByZWZlcmVuY2UgY2hhbmdlLgorCisgICAgICAgIEFQSSB0ZXN0czogV2Vi S2l0LlByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeQorICAgICAgICAgICAgICAgICAgIFdlYktp dC5QcmVmZXJlbmNlQ2hhbmdlc0RhdGEKKyAgICAgICAgICAgICAgICAgICBXZWJLaXQuUHJlZmVy ZW5jZUNoYW5nZXNEYXRlCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKToKKwogMjAyMC0wMi0yMCAgSmFzb24gTGF3cmVuY2UgIDxsYXdyZW5jZS5qQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjU3MDI1LgpJbmRleDog U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CShyZXZpc2lvbiAyNTcwNjIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2Vi UHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NDIsMTEgKzk0MiwxMiBAQCB2b2lk IFdlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlCiAgICAgaWYgKCFlbmNvZGVkRGF0 YSkKICAgICAgICAgcmV0dXJuOwogICAgIE5TRXJyb3IgKmVyciA9IG5pbDsKLSAgICBhdXRvIG9i amVjdCA9IHJldGFpblB0cihbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xh c3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJvcjomZXJy XSk7CisgICAgYXV0byBjbGFzc2VzID0gW05TU2V0IHNldFdpdGhBcnJheTpAW1tOU1N0cmluZyBj bGFzc10sIFtOU051bWJlciBjbGFzc10sIFtOU0RhdGUgY2xhc3NdLCBbTlNEaWN0aW9uYXJ5IGNs YXNzXSwgW05TQXJyYXkgY2xhc3NdLCBbTlNEYXRhIGNsYXNzXV1dOworICAgIGlkIG9iamVjdCA9 IFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzc2VzOmNsYXNzZXMgZnJv bURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6JmVycl07CiAgICAgQVNTRVJUKCFlcnIpOwog ICAgIGlmIChlcnIpCiAgICAgICAgIHJldHVybjsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9i amVjdC5nZXQoKSBmb3JLZXk6a2V5XTsKKyAgICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9iamVjdCBm b3JLZXk6a2V5XTsKIH0KIAogI2lmIFBMQVRGT1JNKElPUykKSW5kZXg6IFRvb2xzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NzA2NykKKysrIFRv b2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTAyLTIw ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2Fd IExpbWl0IHNldCBvZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVu Y2UgaGFzIGNoYW5nZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwODAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvUHJlZmVyZW5jZUNoYW5nZXMubW06 CisgICAgICAgIChURVNUKToKKwogMjAyMC0wMi0yMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9y dG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBXS1dlYlZpZXcgd2l0aCBub24temVybyBvcmlnaW4g aGFzIHRoZSB3cm9uZyB0b3AgY29udGVudCBpbnNldCB3aXRoIE5TV2luZG93U3R5bGVNYXNrRnVs bFNpemVDb250ZW50VmlldwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQv UHJlZmVyZW5jZUNoYW5nZXMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQvUHJlZmVyZW5jZUNoYW5nZXMubW0JKHJldmlzaW9uIDI1NzA2MikKKysrIFRv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjcsNCArMTI3LDEwNCBAQCBURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNo YW5nZXNBcnJheSkKICAgICBBU1NFUlRfVFJVRShbb2JqZWN0IGlzRXF1YWw6Y2hhbmdlZEFycmF5 XSk7CiB9CiAKK1RFU1QoV2ViS2l0LCBQcmVmZXJlbmNlQ2hhbmdlc0RpY3Rpb25hcnkpCit7Cisg ICAgTlNEaWN0aW9uYXJ5ICpkaWN0ID0gQHsKKyAgICAgICAgQCJhIiA6IEAxLAorICAgICAgICBA ImIiIDogQDIsCisgICAgfTsKKworICAgIGF1dG8gdXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05T VXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpAImNvbS5hcHBsZS5jb3JlbWVk aWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6ZGljdCBmb3JLZXk6QCJ0 ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJl Zj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQSTo6VXRpbDo6Y3JlYXRlQ29udGV4dEZv ckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRCdW5kbGVUZXN0IikpOworICAg IGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRl eHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAsIDMwMCkgY29uZmlndXJhdGlv bjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgYXV0byBwcmVm ZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRlcm5hbHMuZW5jb2RlZFByZWZlcmVuY2VWYWx1 ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0ZXN0a2V5XCIpIl07CisgICAgfTsKKworICAg IHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNEaWN0aW9uYXJ5ICpjaGFuZ2VkRGljdCA9IEB7 CisgICAgICAgIEAiYSIgOiBAMSwKKyAgICAgICAgQCJiIiA6IEAyLAorICAgICAgICBAImMiIDog QDMsCisgICAgfTsKKyAgICBbdXNlckRlZmF1bHRzLmdldCgpIHNldE9iamVjdDpjaGFuZ2VkRGlj dCBmb3JLZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGVuY29kZWRTdHJpbmcgPSBwcmVmZXJl bmNlVmFsdWUoKTsKKyAgICBhdXRvIGVuY29kZWREYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxv Y10gaW5pdFdpdGhCYXNlNjRFbmNvZGVkU3RyaW5nOmVuY29kZWRTdHJpbmcgb3B0aW9uczowXSk7 CisgICAgQVNTRVJUX1RSVUUoZW5jb2RlZERhdGEpOworICAgIE5TRXJyb3IgKmVyciA9IG5pbDsK KyAgICBhdXRvIG9iamVjdCA9IHJldGFpblB0cihbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZl ZE9iamVjdE9mQ2xhc3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0YTplbmNvZGVkRGF0YS5nZXQo KSBlcnJvcjomZXJyXSk7CisgICAgQVNTRVJUX1RSVUUoIWVycik7CisgICAgQVNTRVJUX1RSVUUo b2JqZWN0KTsKKyAgICBBU1NFUlRfVFJVRShbb2JqZWN0IGlzRXF1YWw6Y2hhbmdlZERpY3RdKTsK K30KKworVEVTVChXZWJLaXQsIFByZWZlcmVuY2VDaGFuZ2VzRGF0YSkKK3sKKyAgICBOU0RhdGEg KmRhdGEgPSBbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6ImFiYyIgbGVuZ3RoOjNdOworCisgICAgYXV0 byB1c2VyRGVmYXVsdHMgPSBhZG9wdE5TKFtbTlNVc2VyRGVmYXVsdHMgYWxsb2NdIGluaXRXaXRo U3VpdGVOYW1lOkAiY29tLmFwcGxlLmNvcmVtZWRpYSJdKTsKKyAgICBbdXNlckRlZmF1bHRzLmdl dCgpIHNldE9iamVjdDpkYXRhIGZvcktleTpAInRlc3RrZXkiXTsKKworICAgIGF1dG8gY29uZmln dXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0ID0gYWRvcHRXSyhUZXN0V2Vi S2l0QVBJOjpVdGlsOjpjcmVhdGVDb250ZXh0Rm9ySW5qZWN0ZWRCdW5kbGVUZXN0KCJJbnRlcm5h bHNJbmplY3RlZEJ1bmRsZVRlc3QiKSk7CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNz UG9vbCA9IChXS1Byb2Nlc3NQb29sICopY29udGV4dC5nZXQoKTsKKyAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0 KDAsIDAsIDMwMCwgMzAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCkgYWRkVG9X aW5kb3c6WUVTXSk7CisKKyAgICBhdXRvIHByZWZlcmVuY2VWYWx1ZSA9IFsmXSB7CisgICAgICAg IHJldHVybiBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93Lmlu dGVybmFscy5lbmNvZGVkUHJlZmVyZW5jZVZhbHVlKFwiY29tLmFwcGxlLmNvcmVtZWRpYVwiLCBc InRlc3RrZXlcIikiXTsKKyAgICB9OworCisgICAgcHJlZmVyZW5jZVZhbHVlKCk7CisKKyAgICBO U0RhdGEgKmNoYW5nZWREYXRhID0gW05TRGF0YSBkYXRhV2l0aEJ5dGVzOiJhYmNkIiBsZW5ndGg6 NF07CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdlZERhdGEgZm9yS2V5 OkAidGVzdGtleSJdOworCisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZhbHVl KCk7CisgICAgYXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRX aXRoQmFzZTY0RW5jb2RlZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAgIEFT U0VSVF9UUlVFKGVuY29kZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAgYXV0 byBvYmplY3QgPSByZXRhaW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RP ZkNsYXNzOltOU09iamVjdCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6 JmVycl0pOworICAgIEFTU0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVjdCk7 CisgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREYXRhXSk7Cit9CisKK1RF U1QoV2ViS2l0LCBQcmVmZXJlbmNlQ2hhbmdlc0RhdGUpCit7CisgICAgTlNEYXRlICpkYXRlID0g W05TRGF0ZSBkYXRlV2l0aFRpbWVJbnRlcnZhbFNpbmNlTm93OjBdOworCisgICAgYXV0byB1c2Vy RGVmYXVsdHMgPSBhZG9wdE5TKFtbTlNVc2VyRGVmYXVsdHMgYWxsb2NdIGluaXRXaXRoU3VpdGVO YW1lOkAiY29tLmFwcGxlLmNvcmVtZWRpYSJdKTsKKyAgICBbdXNlckRlZmF1bHRzLmdldCgpIHNl dE9iamVjdDpkYXRlIGZvcktleTpAInRlc3RrZXkiXTsKKworICAgIGF1dG8gY29uZmlndXJhdGlv biA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAg V0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0ID0gYWRvcHRXSyhUZXN0V2ViS2l0QVBJ OjpVdGlsOjpjcmVhdGVDb250ZXh0Rm9ySW5qZWN0ZWRCdW5kbGVUZXN0KCJJbnRlcm5hbHNJbmpl Y3RlZEJ1bmRsZVRlc3QiKSk7CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzUG9vbCA9 IChXS1Byb2Nlc3NQb29sICopY29udGV4dC5nZXQoKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9w dE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAs IDMwMCwgMzAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCkgYWRkVG9XaW5kb3c6 WUVTXSk7CisKKyAgICBhdXRvIHByZWZlcmVuY2VWYWx1ZSA9IFsmXSB7CisgICAgICAgIHJldHVy biBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93LmludGVybmFs cy5lbmNvZGVkUHJlZmVyZW5jZVZhbHVlKFwiY29tLmFwcGxlLmNvcmVtZWRpYVwiLCBcInRlc3Rr ZXlcIikiXTsKKyAgICB9OworCisgICAgcHJlZmVyZW5jZVZhbHVlKCk7CisKKyAgICBOU0RhdGUg KmNoYW5nZWREYXRlID0gW05TRGF0ZSBkYXRlV2l0aFRpbWVJbnRlcnZhbFNpbmNlTm93OjEwXTsK KyAgICBbdXNlckRlZmF1bHRzLmdldCgpIHNldE9iamVjdDpjaGFuZ2VkRGF0ZSBmb3JLZXk6QCJ0 ZXN0a2V5Il07CisKKyAgICBhdXRvIGVuY29kZWRTdHJpbmcgPSBwcmVmZXJlbmNlVmFsdWUoKTsK KyAgICBhdXRvIGVuY29kZWREYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhC YXNlNjRFbmNvZGVkU3RyaW5nOmVuY29kZWRTdHJpbmcgb3B0aW9uczowXSk7CisgICAgQVNTRVJU X1RSVUUoZW5jb2RlZERhdGEpOworICAgIE5TRXJyb3IgKmVyciA9IG5pbDsKKyAgICBhdXRvIG9i amVjdCA9IHJldGFpblB0cihbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xh c3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJvcjomZXJy XSk7CisgICAgQVNTRVJUX1RSVUUoIWVycik7CisgICAgQVNTRVJUX1RSVUUob2JqZWN0KTsKKyAg ICBBU1NFUlRfVFJVRShbb2JqZWN0IGlzRXF1YWw6Y2hhbmdlZERhdGVdKTsKK30KKwogI2VuZGlm IC8vIFdLX0hBVkVfQ19TUEkK 392013 2020-02-28 13:24:42 -0800 2020-03-09 12:31:02 -0700 Patch bug-208012-20200228132439.patch text/plain 7519 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc2NDEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTI4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExpbWl0IHNldCBv ZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVuY2UgaGFzIGNoYW5n ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGEg aGFyZGVuaW5nIG1lYXN1cmUsIGxpbWl0IHRoZSBzZXQgb2YgT2JqZWN0aXZlQyBjbGFzc2VzIHRo YXQgY2FuIGJlIGRlY29kZWQgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcworICAgICAgICBhcyBh IHJlc3VsdCBvZiBhIHByZWZlcmVuY2UgY2hhbmdlLgorCisgICAgICAgIEFQSSB0ZXN0czogV2Vi S2l0LlByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeQorICAgICAgICAgICAgICAgICAgIFdlYktp dC5QcmVmZXJlbmNlQ2hhbmdlc0RhdGEKKyAgICAgICAgICAgICAgICAgICBXZWJLaXQuUHJlZmVy ZW5jZUNoYW5nZXNEYXRlCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKToKKwogMjAyMC0wMi0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CiAKICAgICAgICAgQ29udmVyc2lvbiBiZXR3ZWVuIE1lZGlhU2FtcGxlIGFuZCBSZW1vdGVWaWRl b1NhbXBsZSBzaG91bGQgcHJlc2VydmUgdGhlIHJvdGF0aW9uIGluZm9ybWF0aW9uCkluZGV4OiBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0J KHJldmlzaW9uIDI1NzY0MSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQ cm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTk0OCwxMSArOTQ4LDEyIEBAIHZvaWQg V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2UKICAgICBpZiAoIWVuY29kZWREYXRh KQogICAgICAgICByZXR1cm47CiAgICAgTlNFcnJvciAqZXJyID0gbmlsOwotICAgIGF1dG8gb2Jq ZWN0ID0gcmV0YWluUHRyKFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFz czpbTlNPYmplY3QgY2xhc3NdIGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVycm9yOiZlcnJd KTsKKyAgICBzdGF0aWMgTlNTZXQgKmNsYXNzZXMgPSBbTlNTZXQgc2V0V2l0aE9iamVjdHM6W05T U3RyaW5nIGNsYXNzXSwgW05TTnVtYmVyIGNsYXNzXSwgW05TRGF0ZSBjbGFzc10sIFtOU0RpY3Rp b25hcnkgY2xhc3NdLCBbTlNBcnJheSBjbGFzc10sIFtOU0RhdGEgY2xhc3NdLCBuaWxdOworICAg IGlkIG9iamVjdCA9IFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzc2Vz OmNsYXNzZXMgZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6JmVycl07CiAgICAgQVNT RVJUKCFlcnIpOwogICAgIGlmIChlcnIpCiAgICAgICAgIHJldHVybjsKLSAgICBbZGVmYXVsdHMg c2V0T2JqZWN0Om9iamVjdC5nZXQoKSBmb3JLZXk6a2V5XTsKKyAgICBbZGVmYXVsdHMgc2V0T2Jq ZWN0Om9iamVjdCBmb3JLZXk6a2V5XTsKIH0KIAogI2lmIFBMQVRGT1JNKElPUykKSW5kZXg6IFRv b2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1 NzY0MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDIwLTAyLTI4ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ29jb2FdIExpbWl0IHNldCBvZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hl biBhIHByZWZlcmVuY2UgaGFzIGNoYW5nZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwODAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvUHJlZmVyZW5j ZUNoYW5nZXMubW06CisgICAgICAgIChURVNUKToKKwogMjAyMC0wMi0yOCAgQWFrYXNoIEphaW4g IDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3c10gY29tbWl0IHF1ZXVlIHNo b3VsZCBza2lwIGJ1aWxkaW5nIGFuZCB0ZXN0aW5nIGZvciByb2xsb3V0IHBhdGNoZXMKSW5kZXg6 IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VD aGFuZ2VzLm1tCShyZXZpc2lvbiAyNTc2NDEpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdC9QcmVmZXJlbmNlQ2hhbmdlcy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI3LDQgKzEy NywxMDQgQEAgVEVTVChXZWJLaXQsIFByZWZlcmVuY2VDaGFuZ2VzQXJyYXkpCiAgICAgQVNTRVJU X1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWRBcnJheV0pOwogfQogCitURVNUKFdlYktpdCwg UHJlZmVyZW5jZUNoYW5nZXNEaWN0aW9uYXJ5KQoreworICAgIE5TRGljdGlvbmFyeSAqZGljdCA9 IEB7CisgICAgICAgIEAiYSIgOiBAMSwKKyAgICAgICAgQCJiIiA6IEAyLAorICAgIH07CisKKyAg ICBhdXRvIHVzZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5p dFdpdGhTdWl0ZU5hbWU6QCJjb20uYXBwbGUuY29yZW1lZGlhIl0pOworICAgIFt1c2VyRGVmYXVs dHMuZ2V0KCkgc2V0T2JqZWN0OmRpY3QgZm9yS2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBj b25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGlu aXRdKTsKKyAgICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBhZG9wdFdLKFRl c3RXZWJLaXRBUEk6OlV0aWw6OmNyZWF0ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIklu dGVybmFsc0luamVjdGVkQnVuZGxlVGVzdCIpKTsKKyAgICBjb25maWd1cmF0aW9uLmdldCgpLnBy b2Nlc3NQb29sID0gKFdLUHJvY2Vzc1Bvb2wgKiljb250ZXh0LmdldCgpOworICAgIGF1dG8gd2Vi VmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFr ZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBh ZGRUb1dpbmRvdzpZRVNdKTsKKworICAgIGF1dG8gcHJlZmVyZW5jZVZhbHVlID0gWyZdIHsKKyAg ICAgICAgcmV0dXJuIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ3aW5k b3cuaW50ZXJuYWxzLmVuY29kZWRQcmVmZXJlbmNlVmFsdWUoXCJjb20uYXBwbGUuY29yZW1lZGlh XCIsIFwidGVzdGtleVwiKSJdOworICAgIH07CisKKyAgICBwcmVmZXJlbmNlVmFsdWUoKTsKKwor ICAgIE5TRGljdGlvbmFyeSAqY2hhbmdlZERpY3QgPSBAeworICAgICAgICBAImEiIDogQDEsCisg ICAgICAgIEAiYiIgOiBAMiwKKyAgICAgICAgQCJjIiA6IEAzLAorICAgIH07CisgICAgW3VzZXJE ZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdlZERpY3QgZm9yS2V5OkAidGVzdGtleSJdOwor CisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZhbHVlKCk7CisgICAgYXV0byBl bmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQmFzZTY0RW5jb2Rl ZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAgIEFTU0VSVF9UUlVFKGVuY29k ZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAgYXV0byBvYmplY3QgPSByZXRh aW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RPZkNsYXNzOltOU09iamVj dCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6JmVycl0pOworICAgIEFT U0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVjdCk7CisgICAgQVNTRVJUX1RS VUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREaWN0XSk7Cit9CisKK1RFU1QoV2ViS2l0LCBQcmVm ZXJlbmNlQ2hhbmdlc0RhdGEpCit7CisgICAgTlNEYXRhICpkYXRhID0gW05TRGF0YSBkYXRhV2l0 aEJ5dGVzOiJhYmMiIGxlbmd0aDozXTsKKworICAgIGF1dG8gdXNlckRlZmF1bHRzID0gYWRvcHRO UyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpAImNvbS5hcHBsZS5j b3JlbWVkaWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6ZGF0YSBmb3JL ZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFdLUmV0YWluUHRyPFdLQ29u dGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQSTo6VXRpbDo6Y3JlYXRlQ29u dGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRCdW5kbGVUZXN0Iikp OworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAq KWNvbnRleHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZp ZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAsIDMwMCkgY29uZmln dXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgYXV0 byBwcmVmZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5n QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRlcm5hbHMuZW5jb2RlZFByZWZlcmVu Y2VWYWx1ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0ZXN0a2V5XCIpIl07CisgICAgfTsK KworICAgIHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNEYXRhICpjaGFuZ2VkRGF0YSA9IFtO U0RhdGEgZGF0YVdpdGhCeXRlczoiYWJjZCIgbGVuZ3RoOjRdOworICAgIFt1c2VyRGVmYXVsdHMu Z2V0KCkgc2V0T2JqZWN0OmNoYW5nZWREYXRhIGZvcktleTpAInRlc3RrZXkiXTsKKworICAgIGF1 dG8gZW5jb2RlZFN0cmluZyA9IHByZWZlcmVuY2VWYWx1ZSgpOworICAgIGF1dG8gZW5jb2RlZERh dGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJhc2U2NEVuY29kZWRTdHJpbmc6 ZW5jb2RlZFN0cmluZyBvcHRpb25zOjBdKTsKKyAgICBBU1NFUlRfVFJVRShlbmNvZGVkRGF0YSk7 CisgICAgTlNFcnJvciAqZXJyID0gbmlsOworICAgIGF1dG8gb2JqZWN0ID0gcmV0YWluUHRyKFtO U0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzczpbTlNPYmplY3QgY2xhc3Nd IGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVycm9yOiZlcnJdKTsKKyAgICBBU1NFUlRfVFJV RSghZXJyKTsKKyAgICBBU1NFUlRfVFJVRShvYmplY3QpOworICAgIEFTU0VSVF9UUlVFKFtvYmpl Y3QgaXNFcXVhbDpjaGFuZ2VkRGF0YV0pOworfQorCitURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNo YW5nZXNEYXRlKQoreworICAgIE5TRGF0ZSAqZGF0ZSA9IFtOU0RhdGUgZGF0ZVdpdGhUaW1lSW50 ZXJ2YWxTaW5jZU5vdzowXTsKKworICAgIGF1dG8gdXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05T VXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpAImNvbS5hcHBsZS5jb3JlbWVk aWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6ZGF0ZSBmb3JLZXk6QCJ0 ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJl Zj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQSTo6VXRpbDo6Y3JlYXRlQ29udGV4dEZv ckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRCdW5kbGVUZXN0IikpOworICAg IGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRl eHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAsIDMwMCkgY29uZmlndXJhdGlv bjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOworCisgICAgYXV0byBwcmVm ZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRlcm5hbHMuZW5jb2RlZFByZWZlcmVuY2VWYWx1 ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0ZXN0a2V5XCIpIl07CisgICAgfTsKKworICAg IHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNEYXRlICpjaGFuZ2VkRGF0ZSA9IFtOU0RhdGUg ZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzoxMF07CisgICAgW3VzZXJEZWZhdWx0cy5nZXQo KSBzZXRPYmplY3Q6Y2hhbmdlZERhdGUgZm9yS2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBl bmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZhbHVlKCk7CisgICAgYXV0byBlbmNvZGVkRGF0YSA9 IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQmFzZTY0RW5jb2RlZFN0cmluZzplbmNv ZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAgIEFTU0VSVF9UUlVFKGVuY29kZWREYXRhKTsKKyAg ICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAgYXV0byBvYmplY3QgPSByZXRhaW5QdHIoW05TS2V5 ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RPZkNsYXNzOltOU09iamVjdCBjbGFzc10gZnJv bURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6JmVycl0pOworICAgIEFTU0VSVF9UUlVFKCFl cnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVjdCk7CisgICAgQVNTRVJUX1RSVUUoW29iamVjdCBp c0VxdWFsOmNoYW5nZWREYXRlXSk7Cit9CisKICNlbmRpZiAvLyBXS19IQVZFX0NfU1BJCg== 393062 2020-03-09 12:31:04 -0700 2020-03-13 07:13:41 -0700 Patch bug-208012-20200309123103.patch text/plain 7487 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTgxNDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTA5ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExpbWl0IHNldCBv ZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVuY2UgaGFzIGNoYW5n ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGEg aGFyZGVuaW5nIG1lYXN1cmUsIGxpbWl0IHRoZSBzZXQgb2YgT2JqZWN0aXZlQyBjbGFzc2VzIHRo YXQgY2FuIGJlIGRlY29kZWQgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcworICAgICAgICBhcyBh IHJlc3VsdCBvZiBhIHByZWZlcmVuY2UgY2hhbmdlLgorCisgICAgICAgIEFQSSB0ZXN0czogV2Vi S2l0LlByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeQorICAgICAgICAgICAgICAgICAgIFdlYktp dC5QcmVmZXJlbmNlQ2hhbmdlc0RhdGEKKyAgICAgICAgICAgICAgICAgICBXZWJLaXQuUHJlZmVy ZW5jZUNoYW5nZXNEYXRlCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKToKKwogMjAyMC0wMy0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFJlbmFtZSB1cmxTZWxlY3RlZCB0byBjaGFuZ2VMb2NhdGlvbgpJbmRleDogU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZp c2lvbiAyNTgxNDcpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz c0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NjMsMTEgKzk2MywxMiBAQCB2b2lkIFdlYlBy b2Nlc3M6Om5vdGlmeVByZWZlcmVuY2VzQ2hhbmdlCiAgICAgaWYgKCFlbmNvZGVkRGF0YSkKICAg ICAgICAgcmV0dXJuOwogICAgIE5TRXJyb3IgKmVyciA9IG5pbDsKLSAgICBhdXRvIG9iamVjdCA9 IHJldGFpblB0cihbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xhc3M6W05T T2JqZWN0IGNsYXNzXSBmcm9tRGF0YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJvcjomZXJyXSk7Cisg ICAgc3RhdGljIE5TU2V0ICpjbGFzc2VzID0gW05TU2V0IHNldFdpdGhPYmplY3RzOltOU1N0cmlu ZyBjbGFzc10sIFtOU051bWJlciBjbGFzc10sIFtOU0RhdGUgY2xhc3NdLCBbTlNEaWN0aW9uYXJ5 IGNsYXNzXSwgW05TQXJyYXkgY2xhc3NdLCBbTlNEYXRhIGNsYXNzXSwgbmlsXTsKKyAgICBpZCBv YmplY3QgPSBbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xhc3NlczpjbGFz c2VzIGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVycm9yOiZlcnJdOwogICAgIEFTU0VSVCgh ZXJyKTsKICAgICBpZiAoZXJyKQogICAgICAgICByZXR1cm47Ci0gICAgW2RlZmF1bHRzIHNldE9i amVjdDpvYmplY3QuZ2V0KCkgZm9yS2V5OmtleV07CisgICAgW2RlZmF1bHRzIHNldE9iamVjdDpv YmplY3QgZm9yS2V5OmtleV07CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6dW5ibG9ja1ByZWZlcmVu Y2VTZXJ2aWNlKGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgaGFuZGxlKQpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MjU4MTQ3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjAtMDMtMDkgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtDb2NvYV0gTGltaXQgc2V0IG9mIGNsYXNzZXMgdGhhdCBjYW4gYmUgZGVjb2RlZCB3 aGVuIGEgcHJlZmVyZW5jZSBoYXMgY2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MDEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9QcmVmZXJl bmNlQ2hhbmdlcy5tbToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIwLTAzLTA5ICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgVGVzdFdlYktpdEFQSSBmYWlscyB0 byBidWlsZCBvbiB3YXRjaE9TCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9QcmVmZXJlbmNlQ2hhbmdlcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdC9QcmVmZXJlbmNlQ2hhbmdlcy5tbQkocmV2aXNpb24gMjU4MTQ3KQorKysg VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvUHJlZmVyZW5jZUNoYW5nZXMubW0JKHdv cmtpbmcgY29weSkKQEAgLTEyNyw0ICsxMjcsMTA0IEBAIFRFU1QoV2ViS2l0LCBQcmVmZXJlbmNl Q2hhbmdlc0FycmF5KQogICAgIEFTU0VSVF9UUlVFKFtvYmplY3QgaXNFcXVhbDpjaGFuZ2VkQXJy YXldKTsKIH0KIAorVEVTVChXZWJLaXQsIFByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeSkKK3sK KyAgICBOU0RpY3Rpb25hcnkgKmRpY3QgPSBAeworICAgICAgICBAImEiIDogQDEsCisgICAgICAg IEAiYiIgOiBAMiwKKyAgICB9OworCisgICAgYXV0byB1c2VyRGVmYXVsdHMgPSBhZG9wdE5TKFtb TlNVc2VyRGVmYXVsdHMgYWxsb2NdIGluaXRXaXRoU3VpdGVOYW1lOkAiY29tLmFwcGxlLmNvcmVt ZWRpYSJdKTsKKyAgICBbdXNlckRlZmF1bHRzLmdldCgpIHNldE9iamVjdDpkaWN0IGZvcktleTpA InRlc3RrZXkiXTsKKworICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZp ZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0 UmVmPiBjb250ZXh0ID0gYWRvcHRXSyhUZXN0V2ViS2l0QVBJOjpVdGlsOjpjcmVhdGVDb250ZXh0 Rm9ySW5qZWN0ZWRCdW5kbGVUZXN0KCJJbnRlcm5hbHNJbmplY3RlZEJ1bmRsZVRlc3QiKSk7Cisg ICAgY29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzUG9vbCA9IChXS1Byb2Nlc3NQb29sICopY29u dGV4dC5nZXQoKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDMwMCwgMzAwKSBjb25maWd1cmF0 aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCkgYWRkVG9XaW5kb3c6WUVTXSk7CisKKyAgICBhdXRvIHBy ZWZlcmVuY2VWYWx1ZSA9IFsmXSB7CisgICAgICAgIHJldHVybiBbd2ViVmlldyBzdHJpbmdCeUV2 YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93LmludGVybmFscy5lbmNvZGVkUHJlZmVyZW5jZVZh bHVlKFwiY29tLmFwcGxlLmNvcmVtZWRpYVwiLCBcInRlc3RrZXlcIikiXTsKKyAgICB9OworCisg ICAgcHJlZmVyZW5jZVZhbHVlKCk7CisKKyAgICBOU0RpY3Rpb25hcnkgKmNoYW5nZWREaWN0ID0g QHsKKyAgICAgICAgQCJhIiA6IEAxLAorICAgICAgICBAImIiIDogQDIsCisgICAgICAgIEAiYyIg OiBAMywKKyAgICB9OworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmNoYW5nZWRE aWN0IGZvcktleTpAInRlc3RrZXkiXTsKKworICAgIGF1dG8gZW5jb2RlZFN0cmluZyA9IHByZWZl cmVuY2VWYWx1ZSgpOworICAgIGF1dG8gZW5jb2RlZERhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFs bG9jXSBpbml0V2l0aEJhc2U2NEVuY29kZWRTdHJpbmc6ZW5jb2RlZFN0cmluZyBvcHRpb25zOjBd KTsKKyAgICBBU1NFUlRfVFJVRShlbmNvZGVkRGF0YSk7CisgICAgTlNFcnJvciAqZXJyID0gbmls OworICAgIGF1dG8gb2JqZWN0ID0gcmV0YWluUHRyKFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hp dmVkT2JqZWN0T2ZDbGFzczpbTlNPYmplY3QgY2xhc3NdIGZyb21EYXRhOmVuY29kZWREYXRhLmdl dCgpIGVycm9yOiZlcnJdKTsKKyAgICBBU1NFUlRfVFJVRSghZXJyKTsKKyAgICBBU1NFUlRfVFJV RShvYmplY3QpOworICAgIEFTU0VSVF9UUlVFKFtvYmplY3QgaXNFcXVhbDpjaGFuZ2VkRGljdF0p OworfQorCitURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNoYW5nZXNEYXRhKQoreworICAgIE5TRGF0 YSAqZGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhCeXRlczoiYWJjIiBsZW5ndGg6M107CisKKyAgICBh dXRvIHVzZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdp dGhTdWl0ZU5hbWU6QCJjb20uYXBwbGUuY29yZW1lZGlhIl0pOworICAgIFt1c2VyRGVmYXVsdHMu Z2V0KCkgc2V0T2JqZWN0OmRhdGEgZm9yS2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBjb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBhZG9wdFdLKFRlc3RX ZWJLaXRBUEk6OlV0aWw6OmNyZWF0ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkludGVy bmFsc0luamVjdGVkQnVuZGxlVGVzdCIpKTsKKyAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nl c3NQb29sID0gKFdLUHJvY2Vzc1Bvb2wgKiljb250ZXh0LmdldCgpOworICAgIGF1dG8gd2ViVmll dyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJl Y3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRU b1dpbmRvdzpZRVNdKTsKKworICAgIGF1dG8gcHJlZmVyZW5jZVZhbHVlID0gWyZdIHsKKyAgICAg ICAgcmV0dXJuIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ3aW5kb3cu aW50ZXJuYWxzLmVuY29kZWRQcmVmZXJlbmNlVmFsdWUoXCJjb20uYXBwbGUuY29yZW1lZGlhXCIs IFwidGVzdGtleVwiKSJdOworICAgIH07CisKKyAgICBwcmVmZXJlbmNlVmFsdWUoKTsKKworICAg IE5TRGF0YSAqY2hhbmdlZERhdGEgPSBbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6ImFiY2QiIGxlbmd0 aDo0XTsKKyAgICBbdXNlckRlZmF1bHRzLmdldCgpIHNldE9iamVjdDpjaGFuZ2VkRGF0YSBmb3JL ZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGVuY29kZWRTdHJpbmcgPSBwcmVmZXJlbmNlVmFs dWUoKTsKKyAgICBhdXRvIGVuY29kZWREYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5p dFdpdGhCYXNlNjRFbmNvZGVkU3RyaW5nOmVuY29kZWRTdHJpbmcgb3B0aW9uczowXSk7CisgICAg QVNTRVJUX1RSVUUoZW5jb2RlZERhdGEpOworICAgIE5TRXJyb3IgKmVyciA9IG5pbDsKKyAgICBh dXRvIG9iamVjdCA9IHJldGFpblB0cihbTlNLZXllZFVuYXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVj dE9mQ2xhc3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJv cjomZXJyXSk7CisgICAgQVNTRVJUX1RSVUUoIWVycik7CisgICAgQVNTRVJUX1RSVUUob2JqZWN0 KTsKKyAgICBBU1NFUlRfVFJVRShbb2JqZWN0IGlzRXF1YWw6Y2hhbmdlZERhdGFdKTsKK30KKwor VEVTVChXZWJLaXQsIFByZWZlcmVuY2VDaGFuZ2VzRGF0ZSkKK3sKKyAgICBOU0RhdGUgKmRhdGUg PSBbTlNEYXRlIGRhdGVXaXRoVGltZUludGVydmFsU2luY2VOb3c6MF07CisKKyAgICBhdXRvIHVz ZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhTdWl0 ZU5hbWU6QCJjb20uYXBwbGUuY29yZW1lZGlhIl0pOworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkg c2V0T2JqZWN0OmRhdGUgZm9yS2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBjb25maWd1cmF0 aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAg ICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBhZG9wdFdLKFRlc3RXZWJLaXRB UEk6OlV0aWw6OmNyZWF0ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkludGVybmFsc0lu amVjdGVkQnVuZGxlVGVzdCIpKTsKKyAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29s ID0gKFdLUHJvY2Vzc1Bvb2wgKiljb250ZXh0LmdldCgpOworICAgIGF1dG8gd2ViVmlldyA9IGFk b3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dpbmRv dzpZRVNdKTsKKworICAgIGF1dG8gcHJlZmVyZW5jZVZhbHVlID0gWyZdIHsKKyAgICAgICAgcmV0 dXJuIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ3aW5kb3cuaW50ZXJu YWxzLmVuY29kZWRQcmVmZXJlbmNlVmFsdWUoXCJjb20uYXBwbGUuY29yZW1lZGlhXCIsIFwidGVz dGtleVwiKSJdOworICAgIH07CisKKyAgICBwcmVmZXJlbmNlVmFsdWUoKTsKKworICAgIE5TRGF0 ZSAqY2hhbmdlZERhdGUgPSBbTlNEYXRlIGRhdGVXaXRoVGltZUludGVydmFsU2luY2VOb3c6MTBd OworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmNoYW5nZWREYXRlIGZvcktleTpA InRlc3RrZXkiXTsKKworICAgIGF1dG8gZW5jb2RlZFN0cmluZyA9IHByZWZlcmVuY2VWYWx1ZSgp OworICAgIGF1dG8gZW5jb2RlZERhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0 aEJhc2U2NEVuY29kZWRTdHJpbmc6ZW5jb2RlZFN0cmluZyBvcHRpb25zOjBdKTsKKyAgICBBU1NF UlRfVFJVRShlbmNvZGVkRGF0YSk7CisgICAgTlNFcnJvciAqZXJyID0gbmlsOworICAgIGF1dG8g b2JqZWN0ID0gcmV0YWluUHRyKFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZD bGFzczpbTlNPYmplY3QgY2xhc3NdIGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVycm9yOiZl cnJdKTsKKyAgICBBU1NFUlRfVFJVRSghZXJyKTsKKyAgICBBU1NFUlRfVFJVRShvYmplY3QpOwor ICAgIEFTU0VSVF9UUlVFKFtvYmplY3QgaXNFcXVhbDpjaGFuZ2VkRGF0ZV0pOworfQorCiAjZW5k aWYgLy8gV0tfSEFWRV9DX1NQSQo= 393478 2020-03-13 07:13:42 -0700 2020-03-13 09:44:31 -0700 Patch bug-208012-20200313071342.patch text/plain 7546 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTgzNjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTEyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExpbWl0IHNldCBv ZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVuY2UgaGFzIGNoYW5n ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGEg aGFyZGVuaW5nIG1lYXN1cmUsIGxpbWl0IHRoZSBzZXQgb2YgT2JqZWN0aXZlQyBjbGFzc2VzIHRo YXQgY2FuIGJlIGRlY29kZWQgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcworICAgICAgICBhcyBh IHJlc3VsdCBvZiBhIHByZWZlcmVuY2UgY2hhbmdlLgorCisgICAgICAgIEFQSSB0ZXN0czogV2Vi S2l0LlByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeQorICAgICAgICAgICAgICAgICAgIFdlYktp dC5QcmVmZXJlbmNlQ2hhbmdlc0RhdGEKKyAgICAgICAgICAgICAgICAgICBXZWJLaXQuUHJlZmVy ZW5jZUNoYW5nZXNEYXRlCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKToKKwogMjAyMC0wMy0xMiAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW21hY09TXSBfQVhTQXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5RW5hYmxl ZCBzaG91bGQgbm90IGJlIGNhbGxlZApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv Y29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNTgzNjMpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNv cHkpCkBAIC05MTEsMTEgKzkxMSwxMiBAQCB2b2lkIFdlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVu Y2VzQ2hhbmdlCiAgICAgaWYgKCFlbmNvZGVkRGF0YSkKICAgICAgICAgcmV0dXJuOwogICAgIE5T RXJyb3IgKmVyciA9IG5pbDsKLSAgICBhdXRvIG9iamVjdCA9IHJldGFpblB0cihbTlNLZXllZFVu YXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xhc3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0 YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJvcjomZXJyXSk7CisgICAgc3RhdGljIE5TU2V0ICpjbGFz c2VzID0gW05TU2V0IHNldFdpdGhBcnJheTpAW1tOU1N0cmluZyBjbGFzc10sIFtOU051bWJlciBj bGFzc10sIFtOU0RhdGUgY2xhc3NdLCBbTlNEaWN0aW9uYXJ5IGNsYXNzXSwgW05TQXJyYXkgY2xh c3NdLCBbTlNEYXRhIGNsYXNzXV1dOworICAgIGlkIG9iamVjdCA9IFtOU0tleWVkVW5hcmNoaXZl ciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFzc2VzOmNsYXNzZXMgZnJvbURhdGE6ZW5jb2RlZERhdGEu Z2V0KCkgZXJyb3I6JmVycl07CiAgICAgQVNTRVJUKCFlcnIpOwogICAgIGlmIChlcnIpCiAgICAg ICAgIHJldHVybjsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9iamVjdC5nZXQoKSBmb3JLZXk6 a2V5XTsKKyAgICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9iamVjdCBmb3JLZXk6a2V5XTsKIH0KIAog dm9pZCBXZWJQcm9jZXNzOjp1bmJsb2NrUHJlZmVyZW5jZVNlcnZpY2UoY29uc3QgU2FuZGJveEV4 dGVuc2lvbjo6SGFuZGxlJiBoYW5kbGUpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTgzNjMpCisrKyBUb29scy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wMy0xMiAgUGVyIEFybmUg Vm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBMaW1pdCBzZXQg b2YgY2xhc3NlcyB0aGF0IGNhbiBiZSBkZWNvZGVkIHdoZW4gYSBwcmVmZXJlbmNlIGhhcyBjaGFu Z2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgw MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tOgorICAgICAgICAo VEVTVCk6CisKIDIwMjAtMDMtMTIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFttYWNPU10gX0FYU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUVuYWJsZWQg c2hvdWxkIG5vdCBiZSBjYWxsZWQKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tCShyZXZpc2lvbiAyNTgzNjMpCisr KyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9QcmVmZXJlbmNlQ2hhbmdlcy5tbQko d29ya2luZyBjb3B5KQpAQCAtMTI3LDQgKzEyNywxMDQgQEAgVEVTVChXZWJLaXQsIFByZWZlcmVu Y2VDaGFuZ2VzQXJyYXkpCiAgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWRB cnJheV0pOwogfQogCitURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNoYW5nZXNEaWN0aW9uYXJ5KQor eworICAgIE5TRGljdGlvbmFyeSAqZGljdCA9IEB7CisgICAgICAgIEAiYSIgOiBAMSwKKyAgICAg ICAgQCJiIiA6IEAyLAorICAgIH07CisKKyAgICBhdXRvIHVzZXJEZWZhdWx0cyA9IGFkb3B0TlMo W1tOU1VzZXJEZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhTdWl0ZU5hbWU6QCJjb20uYXBwbGUuY29y ZW1lZGlhIl0pOworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmRpY3QgZm9yS2V5 OkAidGVzdGtleSJdOworCisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2Vi Vmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBXS1JldGFpblB0cjxXS0NvbnRl eHRSZWY+IGNvbnRleHQgPSBhZG9wdFdLKFRlc3RXZWJLaXRBUEk6OlV0aWw6OmNyZWF0ZUNvbnRl eHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkludGVybmFsc0luamVjdGVkQnVuZGxlVGVzdCIpKTsK KyAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gKFdLUHJvY2Vzc1Bvb2wgKilj b250ZXh0LmdldCgpOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3 IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3Vy YXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsKKworICAgIGF1dG8g cHJlZmVyZW5jZVZhbHVlID0gWyZdIHsKKyAgICAgICAgcmV0dXJuIFt3ZWJWaWV3IHN0cmluZ0J5 RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJ3aW5kb3cuaW50ZXJuYWxzLmVuY29kZWRQcmVmZXJlbmNl VmFsdWUoXCJjb20uYXBwbGUuY29yZW1lZGlhXCIsIFwidGVzdGtleVwiKSJdOworICAgIH07CisK KyAgICBwcmVmZXJlbmNlVmFsdWUoKTsKKworICAgIE5TRGljdGlvbmFyeSAqY2hhbmdlZERpY3Qg PSBAeworICAgICAgICBAImEiIDogQDEsCisgICAgICAgIEAiYiIgOiBAMiwKKyAgICAgICAgQCJj IiA6IEAzLAorICAgIH07CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdl ZERpY3QgZm9yS2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJl ZmVyZW5jZVZhbHVlKCk7CisgICAgYXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEg YWxsb2NdIGluaXRXaXRoQmFzZTY0RW5jb2RlZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6 MF0pOworICAgIEFTU0VSVF9UUlVFKGVuY29kZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBu aWw7CisgICAgYXV0byBvYmplY3QgPSByZXRhaW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJj aGl2ZWRPYmplY3RPZkNsYXNzOltOU09iamVjdCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEu Z2V0KCkgZXJyb3I6JmVycl0pOworICAgIEFTU0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9U UlVFKG9iamVjdCk7CisgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREaWN0 XSk7Cit9CisKK1RFU1QoV2ViS2l0LCBQcmVmZXJlbmNlQ2hhbmdlc0RhdGEpCit7CisgICAgTlNE YXRhICpkYXRhID0gW05TRGF0YSBkYXRhV2l0aEJ5dGVzOiJhYmMiIGxlbmd0aDozXTsKKworICAg IGF1dG8gdXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0 V2l0aFN1aXRlTmFtZTpAImNvbS5hcHBsZS5jb3JlbWVkaWEiXSk7CisgICAgW3VzZXJEZWZhdWx0 cy5nZXQoKSBzZXRPYmplY3Q6ZGF0YSBmb3JLZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGNv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5p dF0pOworICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVz dFdlYktpdEFQSTo6VXRpbDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50 ZXJuYWxzSW5qZWN0ZWRCdW5kbGVUZXN0IikpOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJv Y2Vzc1Bvb2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisgICAgYXV0byB3ZWJW aWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtl UmVjdCgwLCAwLCAzMDAsIDMwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFk ZFRvV2luZG93OllFU10pOworCisgICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBbJl0geworICAg ICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndpbmRv dy5pbnRlcm5hbHMuZW5jb2RlZFByZWZlcmVuY2VWYWx1ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFc IiwgXCJ0ZXN0a2V5XCIpIl07CisgICAgfTsKKworICAgIHByZWZlcmVuY2VWYWx1ZSgpOworCisg ICAgTlNEYXRhICpjaGFuZ2VkRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhCeXRlczoiYWJjZCIgbGVu Z3RoOjRdOworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmNoYW5nZWREYXRhIGZv cktleTpAInRlc3RrZXkiXTsKKworICAgIGF1dG8gZW5jb2RlZFN0cmluZyA9IHByZWZlcmVuY2VW YWx1ZSgpOworICAgIGF1dG8gZW5jb2RlZERhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBp bml0V2l0aEJhc2U2NEVuY29kZWRTdHJpbmc6ZW5jb2RlZFN0cmluZyBvcHRpb25zOjBdKTsKKyAg ICBBU1NFUlRfVFJVRShlbmNvZGVkRGF0YSk7CisgICAgTlNFcnJvciAqZXJyID0gbmlsOworICAg IGF1dG8gb2JqZWN0ID0gcmV0YWluUHRyKFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2Jq ZWN0T2ZDbGFzczpbTlNPYmplY3QgY2xhc3NdIGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVy cm9yOiZlcnJdKTsKKyAgICBBU1NFUlRfVFJVRSghZXJyKTsKKyAgICBBU1NFUlRfVFJVRShvYmpl Y3QpOworICAgIEFTU0VSVF9UUlVFKFtvYmplY3QgaXNFcXVhbDpjaGFuZ2VkRGF0YV0pOworfQor CitURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNoYW5nZXNEYXRlKQoreworICAgIE5TRGF0ZSAqZGF0 ZSA9IFtOU0RhdGUgZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzowXTsKKworICAgIGF1dG8g dXNlckRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1 aXRlTmFtZTpAImNvbS5hcHBsZS5jb3JlbWVkaWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQo KSBzZXRPYmplY3Q6ZGF0ZSBmb3JLZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3Vy YXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwor ICAgIFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktp dEFQSTo6VXRpbDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxz SW5qZWN0ZWRCdW5kbGVUZXN0IikpOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bv b2wgPSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCAzMDAsIDMwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2lu ZG93OllFU10pOworCisgICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICBy ZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRl cm5hbHMuZW5jb2RlZFByZWZlcmVuY2VWYWx1ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0 ZXN0a2V5XCIpIl07CisgICAgfTsKKworICAgIHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNE YXRlICpjaGFuZ2VkRGF0ZSA9IFtOU0RhdGUgZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzox MF07CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdlZERhdGUgZm9yS2V5 OkAidGVzdGtleSJdOworCisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZhbHVl KCk7CisgICAgYXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRX aXRoQmFzZTY0RW5jb2RlZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAgIEFT U0VSVF9UUlVFKGVuY29kZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAgYXV0 byBvYmplY3QgPSByZXRhaW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RP ZkNsYXNzOltOU09iamVjdCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6 JmVycl0pOworICAgIEFTU0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVjdCk7 CisgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREYXRlXSk7Cit9CisKICNl bmRpZiAvLyBXS19IQVZFX0NfU1BJCg== 393491 2020-03-13 09:44:33 -0700 2020-03-16 08:19:57 -0700 Patch bug-208012-20200313094432.patch text/plain 7537 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTgzNjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTEyICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIExpbWl0IHNldCBv ZiBjbGFzc2VzIHRoYXQgY2FuIGJlIGRlY29kZWQgd2hlbiBhIHByZWZlcmVuY2UgaGFzIGNoYW5n ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGEg aGFyZGVuaW5nIG1lYXN1cmUsIGxpbWl0IHRoZSBzZXQgb2YgT2JqZWN0aXZlQyBjbGFzc2VzIHRo YXQgY2FuIGJlIGRlY29kZWQgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcworICAgICAgICBhcyBh IHJlc3VsdCBvZiBhIHByZWZlcmVuY2UgY2hhbmdlLgorCisgICAgICAgIEFQSSB0ZXN0czogV2Vi S2l0LlByZWZlcmVuY2VDaGFuZ2VzRGljdGlvbmFyeQorICAgICAgICAgICAgICAgICAgIFdlYktp dC5QcmVmZXJlbmNlQ2hhbmdlc0RhdGEKKyAgICAgICAgICAgICAgICAgICBXZWJLaXQuUHJlZmVy ZW5jZUNoYW5nZXNEYXRlCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6bm90aWZ5UHJlZmVyZW5jZXND aGFuZ2VkKToKKwogMjAyMC0wMy0xMiAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW21hY09TXSBfQVhTQXBwbGljYXRpb25BY2Nlc3NpYmlsaXR5RW5hYmxl ZCBzaG91bGQgbm90IGJlIGNhbGxlZApJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv Y29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNTgzNjMpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNv cHkpCkBAIC05MTEsMTEgKzkxMSwxMiBAQCB2b2lkIFdlYlByb2Nlc3M6Om5vdGlmeVByZWZlcmVu Y2VzQ2hhbmdlCiAgICAgaWYgKCFlbmNvZGVkRGF0YSkKICAgICAgICAgcmV0dXJuOwogICAgIE5T RXJyb3IgKmVyciA9IG5pbDsKLSAgICBhdXRvIG9iamVjdCA9IHJldGFpblB0cihbTlNLZXllZFVu YXJjaGl2ZXIgdW5hcmNoaXZlZE9iamVjdE9mQ2xhc3M6W05TT2JqZWN0IGNsYXNzXSBmcm9tRGF0 YTplbmNvZGVkRGF0YS5nZXQoKSBlcnJvcjomZXJyXSk7CisgICAgYXV0byBjbGFzc2VzID0gW05T U2V0IHNldFdpdGhBcnJheTpAW1tOU1N0cmluZyBjbGFzc10sIFtOU051bWJlciBjbGFzc10sIFtO U0RhdGUgY2xhc3NdLCBbTlNEaWN0aW9uYXJ5IGNsYXNzXSwgW05TQXJyYXkgY2xhc3NdLCBbTlNE YXRhIGNsYXNzXV1dOworICAgIGlkIG9iamVjdCA9IFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hp dmVkT2JqZWN0T2ZDbGFzc2VzOmNsYXNzZXMgZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJy b3I6JmVycl07CiAgICAgQVNTRVJUKCFlcnIpOwogICAgIGlmIChlcnIpCiAgICAgICAgIHJldHVy bjsKLSAgICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9iamVjdC5nZXQoKSBmb3JLZXk6a2V5XTsKKyAg ICBbZGVmYXVsdHMgc2V0T2JqZWN0Om9iamVjdCBmb3JLZXk6a2V5XTsKIH0KIAogdm9pZCBXZWJQ cm9jZXNzOjp1bmJsb2NrUHJlZmVyZW5jZVNlcnZpY2UoY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlJiBoYW5kbGUpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTgzNjMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wMy0xMiAgUGVyIEFybmUgVm9sbGFuICA8 cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBMaW1pdCBzZXQgb2YgY2xhc3Nl cyB0aGF0IGNhbiBiZSBkZWNvZGVkIHdoZW4gYSBwcmVmZXJlbmNlIGhhcyBjaGFuZ2VkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgwMTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tOgorICAgICAgICAoVEVTVCk6CisK IDIwMjAtMDMtMTIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFttYWNPU10gX0FYU0FwcGxpY2F0aW9uQWNjZXNzaWJpbGl0eUVuYWJsZWQgc2hvdWxkIG5v dCBiZSBjYWxsZWQKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L1ByZWZl cmVuY2VDaGFuZ2VzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L1ByZWZlcmVuY2VDaGFuZ2VzLm1tCShyZXZpc2lvbiAyNTgzNjMpCisrKyBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9QcmVmZXJlbmNlQ2hhbmdlcy5tbQkod29ya2luZyBj b3B5KQpAQCAtMTI3LDQgKzEyNywxMDQgQEAgVEVTVChXZWJLaXQsIFByZWZlcmVuY2VDaGFuZ2Vz QXJyYXkpCiAgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWRBcnJheV0pOwog fQogCitURVNUKFdlYktpdCwgUHJlZmVyZW5jZUNoYW5nZXNEaWN0aW9uYXJ5KQoreworICAgIE5T RGljdGlvbmFyeSAqZGljdCA9IEB7CisgICAgICAgIEAiYSIgOiBAMSwKKyAgICAgICAgQCJiIiA6 IEAyLAorICAgIH07CisKKyAgICBhdXRvIHVzZXJEZWZhdWx0cyA9IGFkb3B0TlMoW1tOU1VzZXJE ZWZhdWx0cyBhbGxvY10gaW5pdFdpdGhTdWl0ZU5hbWU6QCJjb20uYXBwbGUuY29yZW1lZGlhIl0p OworICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmRpY3QgZm9yS2V5OkAidGVzdGtl eSJdOworCisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBXS1JldGFpblB0cjxXS0NvbnRleHRSZWY+IGNv bnRleHQgPSBhZG9wdFdLKFRlc3RXZWJLaXRBUEk6OlV0aWw6OmNyZWF0ZUNvbnRleHRGb3JJbmpl Y3RlZEJ1bmRsZVRlc3QoIkludGVybmFsc0luamVjdGVkQnVuZGxlVGVzdCIpKTsKKyAgICBjb25m aWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gKFdLUHJvY2Vzc1Bvb2wgKiljb250ZXh0Lmdl dCgpOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBp bml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29u ZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsKKworICAgIGF1dG8gcHJlZmVyZW5j ZVZhbHVlID0gWyZdIHsKKyAgICAgICAgcmV0dXJuIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGlu Z0phdmFTY3JpcHQ6QCJ3aW5kb3cuaW50ZXJuYWxzLmVuY29kZWRQcmVmZXJlbmNlVmFsdWUoXCJj b20uYXBwbGUuY29yZW1lZGlhXCIsIFwidGVzdGtleVwiKSJdOworICAgIH07CisKKyAgICBwcmVm ZXJlbmNlVmFsdWUoKTsKKworICAgIE5TRGljdGlvbmFyeSAqY2hhbmdlZERpY3QgPSBAeworICAg ICAgICBAImEiIDogQDEsCisgICAgICAgIEAiYiIgOiBAMiwKKyAgICAgICAgQCJjIiA6IEAzLAor ICAgIH07CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdlZERpY3QgZm9y S2V5OkAidGVzdGtleSJdOworCisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZh bHVlKCk7CisgICAgYXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGlu aXRXaXRoQmFzZTY0RW5jb2RlZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAg IEFTU0VSVF9UUlVFKGVuY29kZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAg YXV0byBvYmplY3QgPSByZXRhaW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmpl Y3RPZkNsYXNzOltOU09iamVjdCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJy b3I6JmVycl0pOworICAgIEFTU0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVj dCk7CisgICAgQVNTRVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREaWN0XSk7Cit9CisK K1RFU1QoV2ViS2l0LCBQcmVmZXJlbmNlQ2hhbmdlc0RhdGEpCit7CisgICAgTlNEYXRhICpkYXRh ID0gW05TRGF0YSBkYXRhV2l0aEJ5dGVzOiJhYmMiIGxlbmd0aDozXTsKKworICAgIGF1dG8gdXNl ckRlZmF1bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRl TmFtZTpAImNvbS5hcHBsZS5jb3JlbWVkaWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBz ZXRPYmplY3Q6ZGF0YSBmb3JLZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAg IFdLUmV0YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQ STo6VXRpbDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5q ZWN0ZWRCdW5kbGVUZXN0IikpOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wg PSAoV0tQcm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRv cHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAw LCAzMDAsIDMwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93 OllFU10pOworCisgICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICByZXR1 cm4gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRlcm5h bHMuZW5jb2RlZFByZWZlcmVuY2VWYWx1ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0ZXN0 a2V5XCIpIl07CisgICAgfTsKKworICAgIHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNEYXRh ICpjaGFuZ2VkRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhCeXRlczoiYWJjZCIgbGVuZ3RoOjRdOwor ICAgIFt1c2VyRGVmYXVsdHMuZ2V0KCkgc2V0T2JqZWN0OmNoYW5nZWREYXRhIGZvcktleTpAInRl c3RrZXkiXTsKKworICAgIGF1dG8gZW5jb2RlZFN0cmluZyA9IHByZWZlcmVuY2VWYWx1ZSgpOwor ICAgIGF1dG8gZW5jb2RlZERhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJh c2U2NEVuY29kZWRTdHJpbmc6ZW5jb2RlZFN0cmluZyBvcHRpb25zOjBdKTsKKyAgICBBU1NFUlRf VFJVRShlbmNvZGVkRGF0YSk7CisgICAgTlNFcnJvciAqZXJyID0gbmlsOworICAgIGF1dG8gb2Jq ZWN0ID0gcmV0YWluUHRyKFtOU0tleWVkVW5hcmNoaXZlciB1bmFyY2hpdmVkT2JqZWN0T2ZDbGFz czpbTlNPYmplY3QgY2xhc3NdIGZyb21EYXRhOmVuY29kZWREYXRhLmdldCgpIGVycm9yOiZlcnJd KTsKKyAgICBBU1NFUlRfVFJVRSghZXJyKTsKKyAgICBBU1NFUlRfVFJVRShvYmplY3QpOworICAg IEFTU0VSVF9UUlVFKFtvYmplY3QgaXNFcXVhbDpjaGFuZ2VkRGF0YV0pOworfQorCitURVNUKFdl YktpdCwgUHJlZmVyZW5jZUNoYW5nZXNEYXRlKQoreworICAgIE5TRGF0ZSAqZGF0ZSA9IFtOU0Rh dGUgZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzowXTsKKworICAgIGF1dG8gdXNlckRlZmF1 bHRzID0gYWRvcHROUyhbW05TVXNlckRlZmF1bHRzIGFsbG9jXSBpbml0V2l0aFN1aXRlTmFtZTpA ImNvbS5hcHBsZS5jb3JlbWVkaWEiXSk7CisgICAgW3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmpl Y3Q6ZGF0ZSBmb3JLZXk6QCJ0ZXN0a2V5Il07CisKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFdLUmV0 YWluUHRyPFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQSTo6VXRp bDo6Y3JlYXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRC dW5kbGVUZXN0IikpOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQ cm9jZXNzUG9vbCAqKWNvbnRleHQuZ2V0KCk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb W1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAs IDMwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10p OworCisgICAgYXV0byBwcmVmZXJlbmNlVmFsdWUgPSBbJl0geworICAgICAgICByZXR1cm4gW3dl YlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIndpbmRvdy5pbnRlcm5hbHMuZW5j b2RlZFByZWZlcmVuY2VWYWx1ZShcImNvbS5hcHBsZS5jb3JlbWVkaWFcIiwgXCJ0ZXN0a2V5XCIp Il07CisgICAgfTsKKworICAgIHByZWZlcmVuY2VWYWx1ZSgpOworCisgICAgTlNEYXRlICpjaGFu Z2VkRGF0ZSA9IFtOU0RhdGUgZGF0ZVdpdGhUaW1lSW50ZXJ2YWxTaW5jZU5vdzoxMF07CisgICAg W3VzZXJEZWZhdWx0cy5nZXQoKSBzZXRPYmplY3Q6Y2hhbmdlZERhdGUgZm9yS2V5OkAidGVzdGtl eSJdOworCisgICAgYXV0byBlbmNvZGVkU3RyaW5nID0gcHJlZmVyZW5jZVZhbHVlKCk7CisgICAg YXV0byBlbmNvZGVkRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQmFzZTY0 RW5jb2RlZFN0cmluZzplbmNvZGVkU3RyaW5nIG9wdGlvbnM6MF0pOworICAgIEFTU0VSVF9UUlVF KGVuY29kZWREYXRhKTsKKyAgICBOU0Vycm9yICplcnIgPSBuaWw7CisgICAgYXV0byBvYmplY3Qg PSByZXRhaW5QdHIoW05TS2V5ZWRVbmFyY2hpdmVyIHVuYXJjaGl2ZWRPYmplY3RPZkNsYXNzOltO U09iamVjdCBjbGFzc10gZnJvbURhdGE6ZW5jb2RlZERhdGEuZ2V0KCkgZXJyb3I6JmVycl0pOwor ICAgIEFTU0VSVF9UUlVFKCFlcnIpOworICAgIEFTU0VSVF9UUlVFKG9iamVjdCk7CisgICAgQVNT RVJUX1RSVUUoW29iamVjdCBpc0VxdWFsOmNoYW5nZWREYXRlXSk7Cit9CisKICNlbmRpZiAvLyBX S19IQVZFX0NfU1BJCg==