132464 2014-05-01 23:27:04 -0700 Reduce calls to CFURLCacheCopySharedURLCache 2014-05-04 17:43:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 psolanki psolanki ap beidson kling psolanki oldest_to_newest 1005989 0 psolanki 2014-05-01 23:27:04 -0700 Reduce calls to CFURLCacheCopySharedURLCache 1005990 1 230655 psolanki 2014-05-01 23:31:28 -0700 Created attachment 230655 Patch 1005991 2 psolanki 2014-05-01 23:33:50 -0700 My only concern here would be if someone was calling CFURLCacheSetSharedCache or [NSURLCache setSharedURLCache] after we cache the url ref in the static. I could't find any such callers though. 1005999 3 230655 ap 2014-05-02 00:51:43 -0700 Comment on attachment 230655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230655&action=review > Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm:89 > + static RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache()); This can't be a RetainPtr, because we don't want exit time destructors. A plain pointer would be appropriate. An ASSERT in debug builds would ensure that we don't break this optimization, although that may be overkill. 1006057 4 230675 psolanki 2014-05-02 10:57:49 -0700 Created attachment 230675 Patch with assert and raw pointer 1006061 5 230675 ap 2014-05-02 11:30:10 -0700 Comment on attachment 230675 Patch with assert and raw pointer View in context: https://bugs.webkit.org/attachment.cgi?id=230675&action=review > Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm:89 > + static CFURLCacheRef cache = CFURLCacheCopySharedURLCache(); I'd also add ASSERT(isMainThread()) here, as this initialization is not thread safe. 1006417 6 psolanki 2014-05-03 17:03:35 -0700 <rdar://problem/16806694> 1006419 7 psolanki 2014-05-03 17:15:25 -0700 Committed r168231: <http://trac.webkit.org/changeset/168231> 1006458 8 230675 darin 2014-05-03 20:28:27 -0700 Comment on attachment 230675 Patch with assert and raw pointer View in context: https://bugs.webkit.org/attachment.cgi?id=230675&action=review > Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm:93 > +#if !ASSERT_DISABLED > + RetainPtr<CFURLCacheRef> currentCache = adoptCF(CFURLCacheCopySharedURLCache()); > + ASSERT(cache == currentCache.get()); > +#endif To avoid this ugly if, just get rid of the local variable: ASSERT(currentCache == adoptCF(CFURLCacheCopySharedURLCache())); Also no need for the call to get() when doing ==. 1006518 9 psolanki 2014-05-04 17:43:44 -0700 (In reply to comment #8) > (From update of attachment 230675 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230675&action=review > > > Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm:93 > > +#if !ASSERT_DISABLED > > + RetainPtr<CFURLCacheRef> currentCache = adoptCF(CFURLCacheCopySharedURLCache()); > > + ASSERT(cache == currentCache.get()); > > +#endif > > To avoid this ugly if, just get rid of the local variable: > > ASSERT(currentCache == adoptCF(CFURLCacheCopySharedURLCache())); > > Also no need for the call to get() when doing ==. Yes, this looks much better. I landed this in <http://trac.webkit.org/changeset/168250>. 230655 2014-05-01 23:31:28 -0700 2014-05-02 10:57:46 -0700 Patch bug-132464-20140501233107.patch text/plain 3843 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTM2YWNmMWEwNTNhY2Rl NjkyNTc2MDI3ZjM4ZjE1MjE2MTIwY2E4Yi4uZWU3ZWE2NDQxM2RkNzNiNWY4YmU5ZjFkNzkzNmJi ZDg3YjhmNDcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA1LTAxICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZWR1Y2UgY2FsbHMg dG8gQ0ZVUkxDYWNoZUNvcHlTaGFyZWRVUkxDYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNDY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ0ZVUkxDYWNoZUNvcHlTaGFyZWRVUkxDYWNoZSBncmFi cyBhIG11dGV4IGFuZCBjYW4gc29tZXRpbWVzIGJsb2NrLiBBdm9pZCB0aGF0IGJ5IHN0YXNoaW5n CisgICAgICAgIHRoZSBjYWNoZSByZWZlcmVuY2UgaW4gYSBzdGF0aWMuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDogQ29hbGVzY2UgaWZkZWYnZCBj b2RlLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUmVzb3VyY2VMb2FkZXJN YWMubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6dHJ5R2V0U2hh cmVhYmxlSGFuZGxlRnJvbVNoYXJlZEJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6d2lsbENhY2hlUmVzcG9uc2VBc3luYyk6IFVzZSBtb3JlIGNvcnJlY3Qg aWZkZWYgZm9yCisgICAgICAgIEZvdW5kYXRpb24gYmFzZWQgY2FsbGJhY2suCisKIDIwMTQtMDUt MDEgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OIChXZWJLaXQyKSBOZWVkIHRvIHN1cHBvcnQgTGVhcm4gYnV0dG9uLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmggYi9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRl eCA0YzBjYTdhNGM1YTkwYjdlZTAwZGUxMDc3MjhmNmRlNTJmOTNjMjY3Li4yYzE5ODM5NzE0MzA1 MTljNDMwNTE0MDBlNzNhYzdmNGU1ZmZhZjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAtMTI0LDYgKzEyNCw3 IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwKQogICAgIHN0YXRpYyB2b2lkIHRy eUdldFNoYXJlYWJsZUhhbmRsZUZyb21DRlVSTENhY2hlZFJlc3BvbnNlKFNoYXJlYWJsZVJlc291 cmNlOjpIYW5kbGUmLCBDRkNhY2hlZFVSTFJlc3BvbnNlUmVmKTsKKyAgICBzdGF0aWMgdm9pZCB0 cnlHZXRTaGFyZWFibGVIYW5kbGVGcm9tU2hhcmVkQnVmZmVyKFNoYXJlYWJsZVJlc291cmNlOjpI YW5kbGUmLCBXZWJDb3JlOjpTaGFyZWRCdWZmZXIqKTsKICNlbmRpZgogCiAgICAgYm9vbCBpc1N5 bmNocm9ub3VzKCkgY29uc3Q7CkBAIC0xNDEsMTYgKzE0MiwxMSBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0KICNpZiBVU0UoUFJPVEVDVElPTl9TUEFDRV9BVVRI X0NBTExCQUNLKQogICAgIHZvaWQgY29udGludWVDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVj dGlvblNwYWNlKGJvb2wpOwogI2VuZGlmCiAgICAgdm9pZCBjb250aW51ZVdpbGxTZW5kUmVxdWVz dChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QpOwogCi0jaWYgUExB VEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID49IDEwOTApCi0gICAgc3RhdGljIHZvaWQgdHJ5R2V0U2hhcmVhYmxlSGFuZGxlRnJv bVNoYXJlZEJ1ZmZlcihTaGFyZWFibGVSZXNvdXJjZTo6SGFuZGxlJiwgV2ViQ29yZTo6U2hhcmVk QnVmZmVyKik7Ci0jZW5kaWYKLQogcHJpdmF0ZToKICAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIo Y29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmLCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2VzcyosIFBhc3NSZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+KTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtSZXNvdXJjZUxv YWRlck1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUmVz b3VyY2VMb2FkZXJNYWMubW0KaW5kZXggYTc2ODk1MTk5MDc4ZjY5YmZkNzUzZGY2ZGFiYjVmMjFl YTBjZTk0Yy4uYzljNGM2Y2ViMjhlNGFjOTc2MTlkZTk1ZWNhZTZjYWNmMGM3ZWNlZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtSZXNvdXJjZUxv YWRlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29y a1Jlc291cmNlTG9hZGVyTWFjLm1tCkBAIC04Niw3ICs4Niw3IEBAIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZGVyOjp0cnlHZXRTaGFyZWFibGVIYW5kbGVGcm9tQ0ZVUkxDYWNoZWRSZXNwb25zZShT aGFyZWFiCiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjp0cnlHZXRTaGFyZWFibGVIYW5k bGVGcm9tU2hhcmVkQnVmZmVyKFNoYXJlYWJsZVJlc291cmNlOjpIYW5kbGUmIGhhbmRsZSwgU2hh cmVkQnVmZmVyKiBidWZmZXIpCiB7Ci0gICAgUmV0YWluUHRyPENGVVJMQ2FjaGVSZWY+IGNhY2hl ID0gYWRvcHRDRihDRlVSTENhY2hlQ29weVNoYXJlZFVSTENhY2hlKCkpOworICAgIHN0YXRpYyBS ZXRhaW5QdHI8Q0ZVUkxDYWNoZVJlZj4gY2FjaGUgPSBhZG9wdENGKENGVVJMQ2FjaGVDb3B5U2hh cmVkVVJMQ2FjaGUoKSk7CiAgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0x MTMsOSArMTEzLDkgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OndpbGxDYWNoZVJlc3Bv bnNlQXN5bmMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgQ0ZDYWMKIAogICAgIG1faGFuZGxlLT5j b250aW51ZVdpbGxDYWNoZVJlc3BvbnNlKGNmUmVzcG9uc2UpOwogfQotI2VuZGlmCiAKLSNpZiAh UExBVEZPUk0oSU9TKQorI2Vsc2UKKwogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OndpbGxD YWNoZVJlc3BvbnNlQXN5bmMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgTlNDYWNoZWRVUkxSZXNw b25zZSAqbnNSZXNwb25zZSkKIHsKICAgICBBU1NFUlRfVU5VU0VEKGhhbmRsZSwgaGFuZGxlID09 IG1faGFuZGxlKTsKQEAgLTEyNyw3ICsxMjcsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6d2lsbENhY2hlUmVzcG9uc2VBc3luYyhSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBOU0NhYwog CiAgICAgbV9oYW5kbGUtPmNvbnRpbnVlV2lsbENhY2hlUmVzcG9uc2UobnNSZXNwb25zZSk7CiB9 Ci0jZW5kaWYgLy8gIVBMQVRGT1JNKElPUykKKyNlbmRpZiAvLyAhVVNFKENGTkVUV09SSykKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAK 230675 2014-05-02 10:57:49 -0700 2014-05-03 20:28:27 -0700 Patch with assert and raw pointer bug-132464-20140502105726.patch text/plain 4291 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTM2YWNmMWEwNTNhY2Rl NjkyNTc2MDI3ZjM4ZjE1MjE2MTIwY2E4Yi4uZWU3ZWE2NDQxM2RkNzNiNWY4YmU5ZjFkNzkzNmJi ZDg3YjhmNDcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA1LTAxICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBSZWR1Y2UgY2FsbHMg dG8gQ0ZVUkxDYWNoZUNvcHlTaGFyZWRVUkxDYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNDY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ0ZVUkxDYWNoZUNvcHlTaGFyZWRVUkxDYWNoZSBncmFi cyBhIG11dGV4IGFuZCBjYW4gc29tZXRpbWVzIGJsb2NrLiBBdm9pZCB0aGF0IGJ5IHN0YXNoaW5n CisgICAgICAgIHRoZSBjYWNoZSByZWZlcmVuY2UgaW4gYSBzdGF0aWMuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDogQ29hbGVzY2UgaWZkZWYnZCBj b2RlLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUmVzb3VyY2VMb2FkZXJN YWMubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6dHJ5R2V0U2hh cmVhYmxlSGFuZGxlRnJvbVNoYXJlZEJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6d2lsbENhY2hlUmVzcG9uc2VBc3luYyk6IFVzZSBtb3JlIGNvcnJlY3Qg aWZkZWYgZm9yCisgICAgICAgIEZvdW5kYXRpb24gYmFzZWQgY2FsbGJhY2suCisKIDIwMTQtMDUt MDEgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OIChXZWJLaXQyKSBOZWVkIHRvIHN1cHBvcnQgTGVhcm4gYnV0dG9uLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmggYi9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRl eCA0YzBjYTdhNGM1YTkwYjdlZTAwZGUxMDc3MjhmNmRlNTJmOTNjMjY3Li4yYzE5ODM5NzE0MzA1 MTljNDMwNTE0MDBlNzNhYzdmNGU1ZmZhZjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAtMTI0LDYgKzEyNCw3 IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwKQogICAgIHN0YXRpYyB2b2lkIHRy eUdldFNoYXJlYWJsZUhhbmRsZUZyb21DRlVSTENhY2hlZFJlc3BvbnNlKFNoYXJlYWJsZVJlc291 cmNlOjpIYW5kbGUmLCBDRkNhY2hlZFVSTFJlc3BvbnNlUmVmKTsKKyAgICBzdGF0aWMgdm9pZCB0 cnlHZXRTaGFyZWFibGVIYW5kbGVGcm9tU2hhcmVkQnVmZmVyKFNoYXJlYWJsZVJlc291cmNlOjpI YW5kbGUmLCBXZWJDb3JlOjpTaGFyZWRCdWZmZXIqKTsKICNlbmRpZgogCiAgICAgYm9vbCBpc1N5 bmNocm9ub3VzKCkgY29uc3Q7CkBAIC0xNDEsMTYgKzE0MiwxMSBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0KICNpZiBVU0UoUFJPVEVDVElPTl9TUEFDRV9BVVRI X0NBTExCQUNLKQogICAgIHZvaWQgY29udGludWVDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVj dGlvblNwYWNlKGJvb2wpOwogI2VuZGlmCiAgICAgdm9pZCBjb250aW51ZVdpbGxTZW5kUmVxdWVz dChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QpOwogCi0jaWYgUExB VEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID49IDEwOTApCi0gICAgc3RhdGljIHZvaWQgdHJ5R2V0U2hhcmVhYmxlSGFuZGxlRnJv bVNoYXJlZEJ1ZmZlcihTaGFyZWFibGVSZXNvdXJjZTo6SGFuZGxlJiwgV2ViQ29yZTo6U2hhcmVk QnVmZmVyKik7Ci0jZW5kaWYKLQogcHJpdmF0ZToKICAgICBOZXR3b3JrUmVzb3VyY2VMb2FkZXIo Y29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmLCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2VzcyosIFBhc3NSZWZQdHI8TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkOjpEZWxheWVkUmVwbHk+KTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtSZXNvdXJjZUxv YWRlck1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9OZXR3b3JrUmVz b3VyY2VMb2FkZXJNYWMubW0KaW5kZXggYTc2ODk1MTk5MDc4ZjY5YmZkNzUzZGY2ZGFiYjVmMjFl YTBjZTk0Yy4uM2ExZThjMjc1ZWU1Y2EwODk4MDMzZWZjZWY2NTkyYjE5ZTBkZTg0MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtSZXNvdXJjZUxv YWRlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29y a1Jlc291cmNlTG9hZGVyTWFjLm1tCkBAIC04NiwxMiArODYsMTcgQEAgdm9pZCBOZXR3b3JrUmVz b3VyY2VMb2FkZXI6OnRyeUdldFNoYXJlYWJsZUhhbmRsZUZyb21DRlVSTENhY2hlZFJlc3BvbnNl KFNoYXJlYWIKIAogdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeUdldFNoYXJlYWJsZUhh bmRsZUZyb21TaGFyZWRCdWZmZXIoU2hhcmVhYmxlUmVzb3VyY2U6OkhhbmRsZSYgaGFuZGxlLCBT aGFyZWRCdWZmZXIqIGJ1ZmZlcikKIHsKLSAgICBSZXRhaW5QdHI8Q0ZVUkxDYWNoZVJlZj4gY2Fj aGUgPSBhZG9wdENGKENGVVJMQ2FjaGVDb3B5U2hhcmVkVVJMQ2FjaGUoKSk7CisgICAgc3RhdGlj IENGVVJMQ2FjaGVSZWYgY2FjaGUgPSBDRlVSTENhY2hlQ29weVNoYXJlZFVSTENhY2hlKCk7Cisj aWYgIUFTU0VSVF9ESVNBQkxFRAorICAgIFJldGFpblB0cjxDRlVSTENhY2hlUmVmPiBjdXJyZW50 Q2FjaGUgPSBhZG9wdENGKENGVVJMQ2FjaGVDb3B5U2hhcmVkVVJMQ2FjaGUoKSk7CisgICAgQVNT RVJUKGNhY2hlID09IGN1cnJlbnRDYWNoZS5nZXQoKSk7CisjZW5kaWYKKwogICAgIGlmICghY2Fj aGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGRhdGEgPSBi dWZmZXItPmNyZWF0ZUNGRGF0YSgpOwotICAgIGlmIChfQ0ZVUkxDYWNoZUlzUmVzcG9uc2VEYXRh TWVtTWFwcGVkKGNhY2hlLmdldCgpLCBkYXRhLmdldCgpKSA9PSBrQ0ZCb29sZWFuRmFsc2UpCisg ICAgaWYgKF9DRlVSTENhY2hlSXNSZXNwb25zZURhdGFNZW1NYXBwZWQoY2FjaGUsIGRhdGEuZ2V0 KCkpID09IGtDRkJvb2xlYW5GYWxzZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgdHJ5R2V0U2hh cmVhYmxlSGFuZGxlRnJvbUNGRGF0YShoYW5kbGUsIGRhdGEuZ2V0KCkpOwpAQCAtMTEzLDkgKzEx OCw5IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjp3aWxsQ2FjaGVSZXNwb25zZUFzeW5j KFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIENGQ2FjCiAKICAgICBtX2hhbmRsZS0+Y29udGludWVX aWxsQ2FjaGVSZXNwb25zZShjZlJlc3BvbnNlKTsKIH0KLSNlbmRpZgogCi0jaWYgIVBMQVRGT1JN KElPUykKKyNlbHNlCisKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjp3aWxsQ2FjaGVSZXNw b25zZUFzeW5jKFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIE5TQ2FjaGVkVVJMUmVzcG9uc2UgKm5z UmVzcG9uc2UpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRs ZSk7CkBAIC0xMjcsNyArMTMyLDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OndpbGxD YWNoZVJlc3BvbnNlQXN5bmMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgTlNDYWMKIAogICAgIG1f aGFuZGxlLT5jb250aW51ZVdpbGxDYWNoZVJlc3BvbnNlKG5zUmVzcG9uc2UpOwogfQotI2VuZGlm IC8vICFQTEFURk9STShJT1MpCisjZW5kaWYgLy8gIVVTRShDRk5FVFdPUkspCiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAogCg==