234477 2021-12-18 09:23:45 -0800 Use smart pointers for WebCoreNSURLSessionDataTask ObjC members 2021-12-19 15:53:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson darin webkit-bug-importer oldest_to_newest 1825346 0 achristensen 2021-12-18 09:23:45 -0800 Use smart pointers for WebCoreNSURLSessionDataTask ObjC members 1825347 1 447521 achristensen 2021-12-18 09:24:16 -0800 Created attachment 447521 Patch 1825348 2 achristensen 2021-12-18 09:24:20 -0800 <rdar://problem/79224869> 1825368 3 achristensen 2021-12-18 12:44:43 -0800 These properties are marked as (copy). Will do copying and autoreleasing. 1825369 4 447528 achristensen 2021-12-18 12:45:07 -0800 Created attachment 447528 Patch 1825378 5 ews-feeder 2021-12-18 13:35:17 -0800 Committed r287230 (245391@main): <https://commits.webkit.org/245391@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447528. 1825495 6 447528 darin 2021-12-19 15:53:16 -0800 Comment on attachment 447528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447528&action=review > Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm:803 > +- (NSURLRequest *)originalRequest > +{ > + return adoptNS([_originalRequest copy]).autorelease(); > +} > + > +- (NSURLRequest *)currentRequest > +{ > + return adoptNS([_currentRequest copy]).autorelease(); > +} > + > +- (NSError *)error > +{ > + return adoptNS([_error copy]).autorelease(); > +} > + > +- (NSString *)taskDescription > +{ > + return adoptNS([_taskDescription copy]).autorelease(); > +} > + > +- (void)setTaskDescription:(NSString *)description > +{ > + _taskDescription = adoptNS([description copy]); > +} Was the old code doing these copies and autoreleases? It’s not a given that they must be done just because a smart pointer is involved. They might be good changes in their own right, but need to explain why typically. 447521 2021-12-18 09:24:16 -0800 2021-12-18 12:45:05 -0800 Patch bug-234477-20211218092416.patch text/plain 4616 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQwNDdjOTk5N2FhMWUy OTY2MTIzNmY4Yjc2OGI0ZWU1MWNiNTIzZi4uN2NkZTkzYmIzOTFkNzI3MDU1Yjc1YjY4YzQyNWYx NzFhZDZmODVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEyLTE4ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIHNt YXJ0IHBvaW50ZXJzIGZvciBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgT2JqQyBtZW1iZXJz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0NzcK KyAgICAgICAgPHJkYXI6Ly83OTIyNDg2OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTZWVtcyBsaWtlIGEgc21hcnQgdGhpbmcgdG8gZG8uCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW06Cisg ICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBvcmlnaW5hbFJlcXVlc3RdKToK KyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHNldE9yaWdpbmFsUmVxdWVz dDpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIGN1cnJlbnRSZXF1 ZXN0XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBzZXRDdXJyZW50 UmVxdWVzdDpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIGVycm9y XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBzZXRFcnJvcjpdKToK KyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHRhc2tEZXNjcmlwdGlvbl0p OgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgc2V0VGFza0Rlc2NyaXB0 aW9uOl0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgZGVhbGxvY10p OgorCiAyMDIxLTEyLTE3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIEFkanVzdCB0aGUgYm94IGdlb21ldHJ5IGZvciBhdG9taWMvZ2VuZXJpYyBp bmxpbmUgbGV2ZWwgYm94ZXMgaW4gYmlkaSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oCmlu ZGV4IGNlNGMyNTQ1Y2RlMGYyZjQ2YWMzMzhmOTZjNDkwODhlYjQ1ZDA5MjYuLmNhZWFlMzZhYWQ1 ZjdmNmE1MzlkNmFkYWEwODFkNzM2YjIwOWI4ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oCkBA IC0xMjUsMTUgKzEyNSwxNSBAQCBXRUJDT1JFX0VYUE9SVCBAaW50ZXJmYWNlIFdlYkNvcmVOU1VS TFNlc3Npb24gOiBOU09iamVjdCB7CiAgICAgUmVmUHRyPFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFS ZXNvdXJjZT4gX3Jlc291cmNlOwogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBfcmVzcG9u c2U7CiAgICAgTlNVSW50ZWdlciBfdGFza0lkZW50aWZpZXI7Ci0gICAgTlNVUkxSZXF1ZXN0ICpf b3JpZ2luYWxSZXF1ZXN0OwotICAgIE5TVVJMUmVxdWVzdCAqX2N1cnJlbnRSZXF1ZXN0OworICAg IFJldGFpblB0cjxOU1VSTFJlcXVlc3Q+IF9vcmlnaW5hbFJlcXVlc3Q7CisgICAgUmV0YWluUHRy PE5TVVJMUmVxdWVzdD4gX2N1cnJlbnRSZXF1ZXN0OwogICAgIGludDY0X3QgX2NvdW50T2ZCeXRl c1JlY2VpdmVkOwogICAgIGludDY0X3QgX2NvdW50T2ZCeXRlc1NlbnQ7CiAgICAgaW50NjRfdCBf Y291bnRPZkJ5dGVzRXhwZWN0ZWRUb1NlbmQ7CiAgICAgaW50NjRfdCBfY291bnRPZkJ5dGVzRXhw ZWN0ZWRUb1JlY2VpdmU7CiAgICAgTlNVUkxTZXNzaW9uVGFza1N0YXRlIF9zdGF0ZTsKLSAgICBO U0Vycm9yICpfZXJyb3I7Ci0gICAgTlNTdHJpbmcgKl90YXNrRGVzY3JpcHRpb247CisgICAgUmV0 YWluUHRyPE5TRXJyb3I+IF9lcnJvcjsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF90YXNrRGVz Y3JpcHRpb247CiAgICAgZmxvYXQgX3ByaW9yaXR5OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24u bW0KaW5kZXggOGM4OWQ5Mzg2NTc5MzNhMWRhMjkwMzE5OTE1ODRjNGRiMmZhYTlhNy4uZDYyNzE2 ZjQxMTM0NGY1MGViNTE5OTkxNTZiYjI5YzY3NmFkODljMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lv bi5tbQpAQCAtNzcwLDE3ICs3NzAsNTMgQEAgdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRh c2tDbGllbnQ6OmxvYWRGaW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmIHJlc28KIAogI3By YWdtYSBtYXJrIC0gTlNVUkxTZXNzaW9uIEFQSQogQHN5bnRoZXNpemUgdGFza0lkZW50aWZpZXIg PSBfdGFza0lkZW50aWZpZXI7Ci1Ac3ludGhlc2l6ZSBvcmlnaW5hbFJlcXVlc3QgPSBfb3JpZ2lu YWxSZXF1ZXN0OwotQHN5bnRoZXNpemUgY3VycmVudFJlcXVlc3QgPSBfY3VycmVudFJlcXVlc3Q7 CiBAc3ludGhlc2l6ZSBjb3VudE9mQnl0ZXNSZWNlaXZlZCA9IF9jb3VudE9mQnl0ZXNSZWNlaXZl ZDsKIEBzeW50aGVzaXplIGNvdW50T2ZCeXRlc1NlbnQgPSBfY291bnRPZkJ5dGVzU2VudDsKIEBz eW50aGVzaXplIGNvdW50T2ZCeXRlc0V4cGVjdGVkVG9TZW5kID0gX2NvdW50T2ZCeXRlc0V4cGVj dGVkVG9TZW5kOwogQHN5bnRoZXNpemUgY291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmUgPSBf Y291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmU7CiBAc3ludGhlc2l6ZSBzdGF0ZSA9IF9zdGF0 ZTsKLUBzeW50aGVzaXplIGVycm9yID0gX2Vycm9yOwotQHN5bnRoZXNpemUgdGFza0Rlc2NyaXB0 aW9uID0gX3Rhc2tEZXNjcmlwdGlvbjsKIEBzeW50aGVzaXplIHByaW9yaXR5ID0gX3ByaW9yaXR5 OwogCistIChOU1VSTFJlcXVlc3QgKilvcmlnaW5hbFJlcXVlc3QKK3sKKyAgICByZXR1cm4gX29y aWdpbmFsUmVxdWVzdC5nZXQoKTsKK30KKworLSAodm9pZClzZXRPcmlnaW5hbFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3QKK3sKKyAgICBfb3JpZ2luYWxSZXF1ZXN0ID0gcmVxdWVzdDsK K30KKworLSAoTlNVUkxSZXF1ZXN0ICopY3VycmVudFJlcXVlc3QKK3sKKyAgICByZXR1cm4gX2N1 cnJlbnRSZXF1ZXN0LmdldCgpOworfQorCistICh2b2lkKXNldEN1cnJlbnRSZXF1ZXN0OihOU1VS TFJlcXVlc3QgKiljdXJyZW50UmVxdWVzdAoreworICAgIF9jdXJyZW50UmVxdWVzdCA9IGN1cnJl bnRSZXF1ZXN0OworfQorCistIChOU0Vycm9yICopZXJyb3IKK3sKKyAgICByZXR1cm4gX2Vycm9y LmdldCgpOworfQorCistICh2b2lkKXNldEVycm9yOihOU0Vycm9yICopZXJyb3IKK3sKKyAgICBf ZXJyb3IgPSBlcnJvcjsKK30KKworLSAoTlNTdHJpbmcgKil0YXNrRGVzY3JpcHRpb24KK3sKKyAg ICByZXR1cm4gX3Rhc2tEZXNjcmlwdGlvbi5nZXQoKTsKK30KKworLSAodm9pZClzZXRUYXNrRGVz Y3JpcHRpb246KE5TU3RyaW5nICopZGVzY3JpcHRpb24KK3sKKyAgICBfdGFza0Rlc2NyaXB0aW9u ID0gZGVzY3JpcHRpb247Cit9CisKIC0gKFdlYkNvcmVOU1VSTFNlc3Npb24gKilzZXNzaW9uCiB7 CiAgICAgcmV0dXJuIF9zZXNzaW9uLmdldCgpLmdldCgpOwpAQCAtODMxLDExICs4NjcsNiBAQCB2 b2lkIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6bG9hZEZpbmlzaGVkKFBsYXRm b3JtTWVkaWFSZXNvdXJjZSYgcmVzbwogCiAtICh2b2lkKWRlYWxsb2MKIHsKLSAgICBbX29yaWdp bmFsUmVxdWVzdCByZWxlYXNlXTsKLSAgICBbX2N1cnJlbnRSZXF1ZXN0IHJlbGVhc2VdOwotICAg IFtfZXJyb3IgcmVsZWFzZV07Ci0gICAgW190YXNrRGVzY3JpcHRpb24gcmVsZWFzZV07Ci0KICAg ICBpZiAoIWlzTWFpblRocmVhZCgpICYmIF9yZXNvdXJjZSkgewogICAgICAgICBpZiAoYXV0byog Y2xpZW50ID0gX3Jlc291cmNlLT5jbGllbnQoKSkKICAgICAgICAgICAgIHN0YXRpY19jYXN0PFdl YkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudCo+KGNsaWVudCktPmNsZWFyVGFzaygpOwo= 447528 2021-12-18 12:45:07 -0800 2021-12-18 13:35:19 -0800 Patch bug-234477-20211218124507.patch text/plain 5630 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQwNDdjOTk5N2FhMWUy OTY2MTIzNmY4Yjc2OGI0ZWU1MWNiNTIzZi4uYmNiNjU3Yzg0Y2IxZGI3YTdkYWFmM2JmZDg2OGI0 YzczOTQ2YmIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTEyLTE4ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIHNt YXJ0IHBvaW50ZXJzIGZvciBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgT2JqQyBtZW1iZXJz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ0NzcK KyAgICAgICAgPHJkYXI6Ly83OTIyNDg2OT4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmFkeSBF aWRzb24uCisKKyAgICAgICAgU2VlbXMgbGlrZSBhIHNtYXJ0IHRoaW5nIHRvIGRvLgorCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmg6CisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tOgorICAg ICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgb3JpZ2luYWxSZXF1ZXN0XSk6Cisg ICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBzZXRPcmlnaW5hbFJlcXVlc3Q6 XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBjdXJyZW50UmVxdWVz dF0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgc2V0Q3VycmVudFJl cXVlc3Q6XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBlcnJvcl0p OgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgc2V0RXJyb3I6XSk6Cisg ICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayB0YXNrRGVzY3JpcHRpb25dKToK KyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIHNldFRhc2tEZXNjcmlwdGlv bjpdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIGRlYWxsb2NdKToK KwogMjAyMS0xMi0xNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W0xGQ11bSUZDXSBBZGp1c3QgdGhlIGJveCBnZW9tZXRyeSBmb3IgYXRvbWljL2dlbmVyaWMgaW5s aW5lIGxldmVsIGJveGVzIGluIGJpZGkgY29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaAppbmRl eCBjZTRjMjU0NWNkZTBmMmY0NmFjMzM4Zjk2YzQ5MDg4ZWI0NWQwOTI2Li5mOTA5NmVlMmU5ZjI0 MmZmMDRkNzA1YzJhYTEwOTNhNTVlNTczNWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24uaApAQCAt MTI1LDI5ICsxMjUsMjkgQEAgV0VCQ09SRV9FWFBPUlQgQGludGVyZmFjZSBXZWJDb3JlTlNVUkxT ZXNzaW9uIDogTlNPYmplY3QgewogICAgIFJlZlB0cjxXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhUmVz b3VyY2U+IF9yZXNvdXJjZTsKICAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gX3Jlc3BvbnNl OwogICAgIE5TVUludGVnZXIgX3Rhc2tJZGVudGlmaWVyOwotICAgIE5TVVJMUmVxdWVzdCAqX29y aWdpbmFsUmVxdWVzdDsKLSAgICBOU1VSTFJlcXVlc3QgKl9jdXJyZW50UmVxdWVzdDsKKyAgICBS ZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiBfb3JpZ2luYWxSZXF1ZXN0OworICAgIFJldGFpblB0cjxO U1VSTFJlcXVlc3Q+IF9jdXJyZW50UmVxdWVzdDsKICAgICBpbnQ2NF90IF9jb3VudE9mQnl0ZXNS ZWNlaXZlZDsKICAgICBpbnQ2NF90IF9jb3VudE9mQnl0ZXNTZW50OwogICAgIGludDY0X3QgX2Nv dW50T2ZCeXRlc0V4cGVjdGVkVG9TZW5kOwogICAgIGludDY0X3QgX2NvdW50T2ZCeXRlc0V4cGVj dGVkVG9SZWNlaXZlOwogICAgIE5TVVJMU2Vzc2lvblRhc2tTdGF0ZSBfc3RhdGU7Ci0gICAgTlNF cnJvciAqX2Vycm9yOwotICAgIE5TU3RyaW5nICpfdGFza0Rlc2NyaXB0aW9uOworICAgIFJldGFp blB0cjxOU0Vycm9yPiBfZXJyb3I7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBfdGFza0Rlc2Ny aXB0aW9uOwogICAgIGZsb2F0IF9wcmlvcml0eTsKIH0KIAogQHByb3BlcnR5IE5TVUludGVnZXIg dGFza0lkZW50aWZpZXI7Ci1AcHJvcGVydHkgKGNvcHkpIE5TVVJMUmVxdWVzdCAqb3JpZ2luYWxS ZXF1ZXN0OwotQHByb3BlcnR5IChjb3B5KSBOU1VSTFJlcXVlc3QgKmN1cnJlbnRSZXF1ZXN0Owot QHByb3BlcnR5IChyZWFkb25seSwgY29weSkgTlNVUkxSZXNwb25zZSAqcmVzcG9uc2U7CitAcHJv cGVydHkgKG51bGxhYmxlLCByZWFkb25seSwgY29weSkgTlNVUkxSZXF1ZXN0ICpvcmlnaW5hbFJl cXVlc3Q7CitAcHJvcGVydHkgKG51bGxhYmxlLCByZWFkb25seSwgY29weSkgTlNVUkxSZXF1ZXN0 ICpjdXJyZW50UmVxdWVzdDsKK0Bwcm9wZXJ0eSAobnVsbGFibGUsIHJlYWRvbmx5LCBjb3B5KSBO U1VSTFJlc3BvbnNlICpyZXNwb25zZTsKIEBwcm9wZXJ0eSAoYXNzaWduLCBhdG9taWMpIGludDY0 X3QgY291bnRPZkJ5dGVzUmVjZWl2ZWQ7CiBAcHJvcGVydHkgaW50NjRfdCBjb3VudE9mQnl0ZXNT ZW50OwogQHByb3BlcnR5IGludDY0X3QgY291bnRPZkJ5dGVzRXhwZWN0ZWRUb1NlbmQ7CiBAcHJv cGVydHkgaW50NjRfdCBjb3VudE9mQnl0ZXNFeHBlY3RlZFRvUmVjZWl2ZTsKIEBwcm9wZXJ0eSBO U1VSTFNlc3Npb25UYXNrU3RhdGUgc3RhdGU7Ci1AcHJvcGVydHkgKGNvcHkpIE5TRXJyb3IgKmVy cm9yOwotQHByb3BlcnR5IChjb3B5KSBOU1N0cmluZyAqdGFza0Rlc2NyaXB0aW9uOworQHByb3Bl cnR5IChudWxsYWJsZSwgcmVhZG9ubHksIGNvcHkpIE5TRXJyb3IgKmVycm9yOworQHByb3BlcnR5 IChudWxsYWJsZSwgY29weSkgTlNTdHJpbmcgKnRhc2tEZXNjcmlwdGlvbjsKIEBwcm9wZXJ0eSBm bG9hdCBwcmlvcml0eTsKIC0gKHZvaWQpY2FuY2VsOwogLSAodm9pZClzdXNwZW5kOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxT ZXNzaW9uLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3Jl TlNVUkxTZXNzaW9uLm1tCmluZGV4IDhjODlkOTM4NjU3OTMzYTFkYTI5MDMxOTkxNTg0YzRkYjJm YWE5YTcuLjVlMmU4ZThkOWQ3NjY3MmEyNDE0Zjc2ZjVjMDhmMjU5ZTAyOWY1MDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vz c2lvbi5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNv cmVOU1VSTFNlc3Npb24ubW0KQEAgLTcyMSw3ICs3MjEsNyBAQCB2b2lkIFdlYkNvcmVOU1VSTFNl c3Npb25EYXRhVGFza0NsaWVudDo6bG9hZEZpbmlzaGVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYg cmVzbwogICAgICAgICByZXF1ZXN0ID0gbXV0YWJsZVJlcXVlc3QuZ2V0KCk7CiAgICAgfQogCi0g ICAgc2VsZi5vcmlnaW5hbFJlcXVlc3QgPSBzZWxmLmN1cnJlbnRSZXF1ZXN0ID0gcmVxdWVzdDsK KyAgICBzZWxmLT5fb3JpZ2luYWxSZXF1ZXN0ID0gc2VsZi0+X2N1cnJlbnRSZXF1ZXN0ID0gcmVx dWVzdDsKIAogICAgIHJldHVybiBzZWxmOwogfQpAQCAtNzcwLDE3ICs3NzAsMzggQEAgdm9pZCBX ZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRGaW5pc2hlZChQbGF0Zm9ybU1l ZGlhUmVzb3VyY2UmIHJlc28KIAogI3ByYWdtYSBtYXJrIC0gTlNVUkxTZXNzaW9uIEFQSQogQHN5 bnRoZXNpemUgdGFza0lkZW50aWZpZXIgPSBfdGFza0lkZW50aWZpZXI7Ci1Ac3ludGhlc2l6ZSBv cmlnaW5hbFJlcXVlc3QgPSBfb3JpZ2luYWxSZXF1ZXN0OwotQHN5bnRoZXNpemUgY3VycmVudFJl cXVlc3QgPSBfY3VycmVudFJlcXVlc3Q7CiBAc3ludGhlc2l6ZSBjb3VudE9mQnl0ZXNSZWNlaXZl ZCA9IF9jb3VudE9mQnl0ZXNSZWNlaXZlZDsKIEBzeW50aGVzaXplIGNvdW50T2ZCeXRlc1NlbnQg PSBfY291bnRPZkJ5dGVzU2VudDsKIEBzeW50aGVzaXplIGNvdW50T2ZCeXRlc0V4cGVjdGVkVG9T ZW5kID0gX2NvdW50T2ZCeXRlc0V4cGVjdGVkVG9TZW5kOwogQHN5bnRoZXNpemUgY291bnRPZkJ5 dGVzRXhwZWN0ZWRUb1JlY2VpdmUgPSBfY291bnRPZkJ5dGVzRXhwZWN0ZWRUb1JlY2VpdmU7CiBA c3ludGhlc2l6ZSBzdGF0ZSA9IF9zdGF0ZTsKLUBzeW50aGVzaXplIGVycm9yID0gX2Vycm9yOwot QHN5bnRoZXNpemUgdGFza0Rlc2NyaXB0aW9uID0gX3Rhc2tEZXNjcmlwdGlvbjsKIEBzeW50aGVz aXplIHByaW9yaXR5ID0gX3ByaW9yaXR5OwogCistIChOU1VSTFJlcXVlc3QgKilvcmlnaW5hbFJl cXVlc3QKK3sKKyAgICByZXR1cm4gYWRvcHROUyhbX29yaWdpbmFsUmVxdWVzdCBjb3B5XSkuYXV0 b3JlbGVhc2UoKTsKK30KKworLSAoTlNVUkxSZXF1ZXN0ICopY3VycmVudFJlcXVlc3QKK3sKKyAg ICByZXR1cm4gYWRvcHROUyhbX2N1cnJlbnRSZXF1ZXN0IGNvcHldKS5hdXRvcmVsZWFzZSgpOwor fQorCistIChOU0Vycm9yICopZXJyb3IKK3sKKyAgICByZXR1cm4gYWRvcHROUyhbX2Vycm9yIGNv cHldKS5hdXRvcmVsZWFzZSgpOworfQorCistIChOU1N0cmluZyAqKXRhc2tEZXNjcmlwdGlvbgor eworICAgIHJldHVybiBhZG9wdE5TKFtfdGFza0Rlc2NyaXB0aW9uIGNvcHldKS5hdXRvcmVsZWFz ZSgpOworfQorCistICh2b2lkKXNldFRhc2tEZXNjcmlwdGlvbjooTlNTdHJpbmcgKilkZXNjcmlw dGlvbgoreworICAgIF90YXNrRGVzY3JpcHRpb24gPSBhZG9wdE5TKFtkZXNjcmlwdGlvbiBjb3B5 XSk7Cit9CisKIC0gKFdlYkNvcmVOU1VSTFNlc3Npb24gKilzZXNzaW9uCiB7CiAgICAgcmV0dXJu IF9zZXNzaW9uLmdldCgpLmdldCgpOwpAQCAtODMxLDExICs4NTIsNiBAQCB2b2lkIFdlYkNvcmVO U1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6bG9hZEZpbmlzaGVkKFBsYXRmb3JtTWVkaWFSZXNv dXJjZSYgcmVzbwogCiAtICh2b2lkKWRlYWxsb2MKIHsKLSAgICBbX29yaWdpbmFsUmVxdWVzdCBy ZWxlYXNlXTsKLSAgICBbX2N1cnJlbnRSZXF1ZXN0IHJlbGVhc2VdOwotICAgIFtfZXJyb3IgcmVs ZWFzZV07Ci0gICAgW190YXNrRGVzY3JpcHRpb24gcmVsZWFzZV07Ci0KICAgICBpZiAoIWlzTWFp blRocmVhZCgpICYmIF9yZXNvdXJjZSkgewogICAgICAgICBpZiAoYXV0byogY2xpZW50ID0gX3Jl c291cmNlLT5jbGllbnQoKSkKICAgICAgICAgICAgIHN0YXRpY19jYXN0PFdlYkNvcmVOU1VSTFNl c3Npb25EYXRhVGFza0NsaWVudCo+KGNsaWVudCktPmNsZWFyVGFzaygpOwo=