218626 2020-11-05 11:02:19 -0800 Fix crashes around NetworkStorageSession::registerCookieChangeListenersIfNecessary 2020-11-06 08:02:36 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1704933 0 achristensen 2020-11-05 11:02:19 -0800 Fix crashes around NetworkStorageSession::registerCookieChangeListenersIfNecessary 1704937 1 413326 achristensen 2020-11-05 11:05:01 -0800 Created attachment 413326 Patch 1704954 2 413326 cdumez 2020-11-05 11:29:42 -0800 Comment on attachment 413326 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413326&action=review > Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm:671 > + [nsCookieStorage() _setCookiesChangedHandler:^(NSArray<NSHTTPCookie *> *, NSString *) { } onQueue:dispatch_get_main_queue()]; Why these changes? > Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm:674 > + [nsCookieStorage() _setSubscribedDomainsForCookieChanges:[NSSet set]]; ditto. 1705020 3 achristensen 2020-11-05 14:41:24 -0800 (In reply to Chris Dumez from comment #2) > Comment on attachment 413326 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=413326&action=review > > > Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm:671 > > + [nsCookieStorage() _setCookiesChangedHandler:^(NSArray<NSHTTPCookie *> *, NSString *) { } onQueue:dispatch_get_main_queue()]; > > Why these changes? CFNetwork calls the block without checking if it is nil. This will cause it to call a block that does nothing instead of dereferencing null and crashing. > > > Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm:674 > > + [nsCookieStorage() _setSubscribedDomainsForCookieChanges:[NSSet set]]; > > ditto. This one is probably not necessary, but I thought it wouldn't hurt to go along with the non-null theme of the other changes. 1705056 4 cdumez 2020-11-05 16:35:46 -0800 Jiten tells me this is very related to rdar://64024242. Do we still need a WebKit change or is that fix at rdar://64024242 sufficient? 1705080 5 413326 achristensen 2020-11-05 17:38:05 -0800 Comment on attachment 413326 Patch He definitely fixed at least part of the problem, but the weakThis check might still be necessary. There's no reason to not take this change to be as safe as possible. 1705081 6 413380 achristensen 2020-11-05 17:41:51 -0800 Created attachment 413380 patch 1705240 7 ews-feeder 2020-11-06 08:01:36 -0800 Committed r269512: <https://trac.webkit.org/changeset/269512> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413380. 1705242 8 webkit-bug-importer 2020-11-06 08:02:36 -0800 <rdar://problem/71119360> 413326 2020-11-05 11:05:01 -0800 2020-11-06 07:47:59 -0800 Patch bug-218626-20201105110500.patch text/plain 5401 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM0NDlhN2FmZTkxZDhk MDE1Yzc2YjkyNjVjOTBjZjE2YzVmZTg3Zi4uYWNhMTQ0MDA2OTc3NWFhZGZmMDhjZWE4ZWRhZmVj MmMxOGJmNjZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTExLTA1ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNy YXNoZXMgYXJvdW5kIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6cmVnaXN0ZXJDb29raWVDaGFuZ2VM aXN0ZW5lcnNJZk5lY2Vzc2FyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NjI2CisgICAgICAgIDxyZGFyOi8vNjY4Mzc2Mjg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ0ZOZXR3b3JrIGNvcGllcyB0 aGUgYmxvY2sgdG8gY2FsbCBvbiBhIG5vbi1tYWluIHF1ZXVlLCB0aGVuIGNhbGxzIGl0IHdpdGhv dXQgbnVsbCBjaGVja2luZyBpdCBvbiB0aGUgZ2l2ZW4gcXVldWUuCisgICAgICAgIFdoZW4gdGVh cmluZyBkb3duIGEgTmV0d29ya1N0b3JhZ2VTZXNzaW9uLCB3ZSBuZWVkIHRvIHNldCBhbiBlbXB0 eSBibG9jayBpbnN0ZWFkIG9mIGEgbmlsIGJsb2NrLCBhbmQgd2hlbiB0aGUgYmxvY2sKKyAgICAg ICAgaXMgY2FsbGVkIHdlIG5lZWQgdG8gY2hlY2sgaWYgdGhlIE5ldHdvcmtTdG9yYWdlU2Vzc2lv biBoYXMgYmVlbiBkZWFsbG9jYXRlZCBiZWZvcmUgdXNpbmcgaXRzIG1lbWJlciB2YXJpYWJsZXMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oOgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ29j b2EubW06CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OnJlZ2lzdGVy Q29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6TmV0 d29ya1N0b3JhZ2VTZXNzaW9uOjp1bnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNl c3NhcnkpOgorCiAyMDIwLTExLTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgbW9yZSBmdW5jdGlvbnMgdGhhdCBpbXBsaWNpdGx5IHVzZSBjb21wb3Nl ZCB0cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdv cmtTdG9yYWdlU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3 b3JrU3RvcmFnZVNlc3Npb24uaAppbmRleCA1N2ViYTBmYTNiYmM5ZGRiYjQwNjgxMDMxYjMzNWNl MWFiOGMxMDAyLi40NGNhYzEwYWUyOTRmOGRjNDViMTUxODU2NzJlZTgyODE2MTQ0MzhjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vz c2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3Jh Z2VTZXNzaW9uLmgKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgog I2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1dhbGxUaW1lLmg+CisjaW5j bHVkZSA8d3RmL1dlYWtQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAog I2lmIFBMQVRGT1JNKENPQ09BKSB8fCBVU0UoQ0ZVUkxDT05ORUNUSU9OKQpAQCAtOTgsNyArOTks NyBAQCBwdWJsaWM6CiB9OwogI2VuZGlmCiAKLWNsYXNzIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiB7 CitjbGFzcyBOZXR3b3JrU3RvcmFnZVNlc3Npb24gOiBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8TmV0 d29ya1N0b3JhZ2VTZXNzaW9uPiB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoTmV0d29ya1N0 b3JhZ2VTZXNzaW9uKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CiAgICAgdXNp bmcgVG9wRnJhbWVEb21haW4gPSBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VT ZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05l dHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tCmluZGV4IGNiODNhZTkzYTc0MTBlN2QzOTk5MTFm ZDdmMWQwMjNkZTRhZmFkZGQuLmY2NWQ5YmFmZTlhNTg5MzNiNGY1OTJmYjE0NTM5OGE0OGZkMjdi YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0 d29ya1N0b3JhZ2VTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Npb25Db2NvYS5tbQpAQCAtMzMsNiArMzMs NyBAQAogI2ltcG9ydCAiU2FtZVNpdGVJbmZvLmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NmL0NGTmV0 d29ya1NQSS5oPgogI2ltcG9ydCA8d3RmL0Jsb2NrT2JqQ0V4Y2VwdGlvbnMuaD4KKyNpbXBvcnQg PHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8d3RmL09wdGlvbmFsLmg+CiAjaW1wb3J0IDx3dGYv UHJvY2Vzc1ByaXZpbGVnZS5oPgogI2ltcG9ydCA8d3RmL1VSTC5oPgpAQCAtNjI0LDcgKzYyNSw5 IEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpyZWdpc3RlckNvb2tpZUNoYW5nZUxpc3Rl bmVyc0lmTmVjZXNzYXJ5KCkKIAogICAgIG1fZGlkUmVnaXN0ZXJDb29raWVMaXN0ZW5lcnMgPSB0 cnVlOwogCi0gICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6 XihOU0FycmF5PE5TSFRUUENvb2tpZSo+KiBhZGRlZENvb2tpZXMsIE5TU3RyaW5nKiBkb21haW5G b3JDaGFuZ2VkQ29va2llKSB7CisgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzQ2hh bmdlZEhhbmRsZXI6bWFrZUJsb2NrUHRyKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0 aGlzKV0oTlNBcnJheTxOU0hUVFBDb29raWUgKj4gKmFkZGVkQ29va2llcywgTlNTdHJpbmcgKmRv bWFpbkZvckNoYW5nZWRDb29raWUpIHsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgU3RyaW5nIGhvc3QgPSBkb21haW5Gb3JDaGFuZ2VkQ29va2ll OwogICAgICAgICBhdXRvIGl0ID0gbV9jb29raWVDaGFuZ2VPYnNlcnZlcnMuZmluZChob3N0KTsK ICAgICAgICAgaWYgKGl0ID09IG1fY29va2llQ2hhbmdlT2JzZXJ2ZXJzLmVuZCgpKQpAQCAtNjM0 LDkgKzYzNywxMSBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6cmVnaXN0ZXJDb29raWVD aGFuZ2VMaXN0ZW5lcnNJZk5lY2Vzc2FyeSgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGZvciAoYXV0byogb2JzZXJ2ZXIgOiBpdC0+dmFsdWUpCiAgICAgICAgICAgICBvYnNlcnZlci0+ Y29va2llc0FkZGVkKGhvc3QsIGNvb2tpZXMpOwotICAgIH0gb25RdWV1ZTpkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpXTsKKyAgICB9KS5nZXQoKSBvblF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1 ZXVlKCldOwogCi0gICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzUmVtb3ZlZEhhbmRs ZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSo+KiByZW1vdmVkQ29va2llcywgTlNTdHJpbmcqIGRv bWFpbkZvclJlbW92ZWRDb29raWVzLCBib29sIHJlbW92ZUFsbENvb2tpZXMpIHsKKyAgICBbbnND b29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNSZW1vdmVkSGFuZGxlcjptYWtlQmxvY2tQdHIoW3Ro aXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXShOU0FycmF5PE5TSFRUUENvb2tpZSAq PiAqcmVtb3ZlZENvb2tpZXMsIE5TU3RyaW5nICpkb21haW5Gb3JSZW1vdmVkQ29va2llcywgYm9v bCByZW1vdmVBbGxDb29raWVzKSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIGlmIChyZW1vdmVBbGxDb29raWVzKSB7CiAgICAgICAgICAgICBm b3IgKGF1dG8mIG9ic2VydmVycyA6IG1fY29va2llQ2hhbmdlT2JzZXJ2ZXJzLnZhbHVlcygpKSB7 CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvKiBvYnNlcnZlciA6IG9ic2VydmVycykKQEAgLTY1 NSw3ICs2NjAsNyBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6cmVnaXN0ZXJDb29raWVD aGFuZ2VMaXN0ZW5lcnNJZk5lY2Vzc2FyeSgpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGZvciAoYXV0byogb2JzZXJ2ZXIgOiBpdC0+dmFsdWUpCiAgICAgICAgICAgICBvYnNlcnZlci0+ Y29va2llc0RlbGV0ZWQoaG9zdCwgY29va2llcyk7Ci0gICAgfSBvblF1ZXVlOmRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCldOworICAgIH0pLmdldCgpIG9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5f cXVldWUoKV07CiB9CiAKIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjp1bnJlZ2lzdGVyQ29v a2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkoKQpAQCAtNjYzLDEwICs2NjgsMTAgQEAgdm9p ZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnVucmVnaXN0ZXJDb29raWVDaGFuZ2VMaXN0ZW5lcnNJ Zk5lY2Vzc2FyeSgpCiAgICAgaWYgKCFtX2RpZFJlZ2lzdGVyQ29va2llTGlzdGVuZXJzKQogICAg ICAgICByZXR1cm47CiAKLSAgICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNDaGFuZ2Vk SGFuZGxlcjpuaWwgb25RdWV1ZTpuaWxdOwotICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBfc2V0Q29v a2llc1JlbW92ZWRIYW5kbGVyOm5pbCBvblF1ZXVlOm5pbF07CisgICAgW25zQ29va2llU3RvcmFn ZSgpIF9zZXRDb29raWVzQ2hhbmdlZEhhbmRsZXI6XihOU0FycmF5PE5TSFRUUENvb2tpZSAqPiAq LCBOU1N0cmluZyAqKSB7IH0gb25RdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKKyAg ICBbbnNDb29raWVTdG9yYWdlKCkgX3NldENvb2tpZXNSZW1vdmVkSGFuZGxlcjpeKE5TQXJyYXk8 TlNIVFRQQ29va2llICo+ICosIE5TU3RyaW5nICosIGJvb2wpIHsgfSBvblF1ZXVlOmRpc3BhdGNo X2dldF9tYWluX3F1ZXVlKCldOwogCi0gICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRTdWJzY3Jp YmVkRG9tYWluc0ZvckNvb2tpZUNoYW5nZXM6bmlsXTsKKyAgICBbbnNDb29raWVTdG9yYWdlKCkg X3NldFN1YnNjcmliZWREb21haW5zRm9yQ29va2llQ2hhbmdlczpbTlNTZXQgc2V0XV07CiAgICAg bV9kaWRSZWdpc3RlckNvb2tpZUxpc3RlbmVycyA9IGZhbHNlOwogfQogCg== 413380 2020-11-05 17:41:51 -0800 2020-11-06 08:01:37 -0800 patch attachment.cgi.patch text/plain 4332 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM0NDlhN2FmZTkxZDhk MDE1Yzc2YjkyNjVjOTBjZjE2YzVmZTg3Zi4uYWNhMTQ0MDA2OTc3NWFhZGZmMDhjZWE4ZWRhZmVj MmMxOGJmNjZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTExLTA1ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNy YXNoZXMgYXJvdW5kIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6cmVnaXN0ZXJDb29raWVDaGFuZ2VM aXN0ZW5lcnNJZk5lY2Vzc2FyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NjI2CisgICAgICAgIDxyZGFyOi8vNjY4Mzc2Mjg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byBjaGVjayBp ZiB0aGUgTmV0d29ya1N0b3JhZ2VTZXNzaW9uIGhhcyBiZWVuIGRlYWxsb2NhdGVkIGJlZm9yZSB1 c2luZyBpdHMgbWVtYmVyIHZhcmlhYmxlcyBpbiBhIGNhbGxiYWNrIGZyb20gQ0ZOZXR3b3JrLgor CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29h Lm1tOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpyZWdpc3RlckNv b2tpZUNoYW5nZUxpc3RlbmVyc0lmTmVjZXNzYXJ5KToKKwogMjAyMC0xMS0wMyAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1vcmUgZnVuY3Rpb25zIHRo YXQgaW1wbGljaXRseSB1c2UgY29tcG9zZWQgdHJlZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgKaW5kZXggNTdlYmEw ZmEzYmJjOWRkYmI0MDY4MTAzMWIzMzVjZTFhYjhjMTAwMi4uNDRjYWMxMGFlMjk0ZjhkYzQ1YjE1 MTg1NjcyZWU4MjgxNjE0NDM4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCkBAIC0zNiw2ICszNiw3IEBACiAj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1 ZGUgPHd0Zi9XYWxsVGltZS5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAjaW5jbHVkZSA8 d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZiBQTEFURk9STShDT0NPQSkgfHwgVVNFKENGVVJM Q09OTkVDVElPTikKQEAgLTk4LDcgKzk5LDcgQEAgcHVibGljOgogfTsKICNlbmRpZgogCi1jbGFz cyBOZXR3b3JrU3RvcmFnZVNlc3Npb24geworY2xhc3MgTmV0d29ya1N0b3JhZ2VTZXNzaW9uIDog cHVibGljIENhbk1ha2VXZWFrUHRyPE5ldHdvcmtTdG9yYWdlU2Vzc2lvbj4gewogICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKE5ldHdvcmtTdG9yYWdlU2Vzc2lvbik7IFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOwogcHVibGljOgogICAgIHVzaW5nIFRvcEZyYW1lRG9tYWluID0gV2ViQ29yZTo6UmVn aXN0cmFibGVEb21haW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jb2NvYS9OZXR3b3JrU3RvcmFnZVNlc3Npb25Db2NvYS5tbQppbmRl eCBjYjgzYWU5M2E3NDEwZTdkMzk5OTExZmQ3ZjFkMDIzZGU0YWZhZGRkLi5mNjVkOWJhZmU5YTU4 OTMzYjRmNTkyZmIxNDUzOThhNDhmZDI3YmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2NvY29hL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvTmV0d29ya1N0b3JhZ2VTZXNz aW9uQ29jb2EubW0KQEAgLTMzLDYgKzMzLDcgQEAKICNpbXBvcnQgIlNhbWVTaXRlSW5mby5oIgog I2ltcG9ydCA8cGFsL3NwaS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja09i akNFeGNlcHRpb25zLmg+CisjaW1wb3J0IDx3dGYvQmxvY2tQdHIuaD4KICNpbXBvcnQgPHd0Zi9P cHRpb25hbC5oPgogI2ltcG9ydCA8d3RmL1Byb2Nlc3NQcml2aWxlZ2UuaD4KICNpbXBvcnQgPHd0 Zi9VUkwuaD4KQEAgLTYyNCw3ICs2MjUsOSBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 cmVnaXN0ZXJDb29raWVDaGFuZ2VMaXN0ZW5lcnNJZk5lY2Vzc2FyeSgpCiAKICAgICBtX2RpZFJl Z2lzdGVyQ29va2llTGlzdGVuZXJzID0gdHJ1ZTsKIAotICAgIFtuc0Nvb2tpZVN0b3JhZ2UoKSBf c2V0Q29va2llc0NoYW5nZWRIYW5kbGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiogYWRkZWRD b29raWVzLCBOU1N0cmluZyogZG9tYWluRm9yQ2hhbmdlZENvb2tpZSkgeworICAgIFtuc0Nvb2tp ZVN0b3JhZ2UoKSBfc2V0Q29va2llc0NoYW5nZWRIYW5kbGVyOm1ha2VCbG9ja1B0cihbdGhpcywg d2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldKE5TQXJyYXk8TlNIVFRQQ29va2llICo+ICph ZGRlZENvb2tpZXMsIE5TU3RyaW5nICpkb21haW5Gb3JDaGFuZ2VkQ29va2llKSB7CisgICAgICAg IGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIFN0cmluZyBob3N0 ID0gZG9tYWluRm9yQ2hhbmdlZENvb2tpZTsKICAgICAgICAgYXV0byBpdCA9IG1fY29va2llQ2hh bmdlT2JzZXJ2ZXJzLmZpbmQoaG9zdCk7CiAgICAgICAgIGlmIChpdCA9PSBtX2Nvb2tpZUNoYW5n ZU9ic2VydmVycy5lbmQoKSkKQEAgLTYzNCw5ICs2MzcsMTEgQEAgdm9pZCBOZXR3b3JrU3RvcmFn ZVNlc3Npb246OnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkoKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVyIDogaXQtPnZhbHVl KQogICAgICAgICAgICAgb2JzZXJ2ZXItPmNvb2tpZXNBZGRlZChob3N0LCBjb29raWVzKTsKLSAg ICB9IG9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKV07CisgICAgfSkuZ2V0KCkgb25R dWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKIAotICAgIFtuc0Nvb2tpZVN0b3JhZ2Uo KSBfc2V0Q29va2llc1JlbW92ZWRIYW5kbGVyOl4oTlNBcnJheTxOU0hUVFBDb29raWUqPiogcmVt b3ZlZENvb2tpZXMsIE5TU3RyaW5nKiBkb21haW5Gb3JSZW1vdmVkQ29va2llcywgYm9vbCByZW1v dmVBbGxDb29raWVzKSB7CisgICAgW25zQ29va2llU3RvcmFnZSgpIF9zZXRDb29raWVzUmVtb3Zl ZEhhbmRsZXI6bWFrZUJsb2NrUHRyKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlz KV0oTlNBcnJheTxOU0hUVFBDb29raWUgKj4gKnJlbW92ZWRDb29raWVzLCBOU1N0cmluZyAqZG9t YWluRm9yUmVtb3ZlZENvb2tpZXMsIGJvb2wgcmVtb3ZlQWxsQ29va2llcykgeworICAgICAgICBp ZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAocmVtb3ZlQWxs Q29va2llcykgewogICAgICAgICAgICAgZm9yIChhdXRvJiBvYnNlcnZlcnMgOiBtX2Nvb2tpZUNo YW5nZU9ic2VydmVycy52YWx1ZXMoKSkgewogICAgICAgICAgICAgICAgIGZvciAoYXV0byogb2Jz ZXJ2ZXIgOiBvYnNlcnZlcnMpCkBAIC02NTUsNyArNjYwLDcgQEAgdm9pZCBOZXR3b3JrU3RvcmFn ZVNlc3Npb246OnJlZ2lzdGVyQ29va2llQ2hhbmdlTGlzdGVuZXJzSWZOZWNlc3NhcnkoKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICBmb3IgKGF1dG8qIG9ic2VydmVyIDogaXQtPnZhbHVl KQogICAgICAgICAgICAgb2JzZXJ2ZXItPmNvb2tpZXNEZWxldGVkKGhvc3QsIGNvb2tpZXMpOwot ICAgIH0gb25RdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKKyAgICB9KS5nZXQoKSBv blF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCldOwogfQogCiB2b2lkIE5ldHdvcmtTdG9y YWdlU2Vzc2lvbjo6dW5yZWdpc3RlckNvb2tpZUNoYW5nZUxpc3RlbmVyc0lmTmVjZXNzYXJ5KCkK