53045 2011-01-24 14:10:05 -0800 REGRESSION (r74807): memory corruption after CachedResourceLoader refactoring 2011-03-10 09:12:37 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 53059 54424 55596 55693 1 mihaip webkit-unassigned ap darin koivisto mitz psolanki simon.fraser thakis tonyg oldest_to_newest 339257 0 mihaip 2011-01-24 14:10:05 -0800 The Chromium reliability bot started to see crashes in malloc code shortly after http://trac.webkit.org/changeset/74807/ was checked in. By bisecting the WebKit changes in between known stable and known crashing revisions, it was determined that that was the cause (see http://crbug.com/68516 for more details). Antti, I'll take a look at change to see if anything stands out, but let me know if you can think of any helpful tips. 339374 1 koivisto 2011-01-24 16:53:36 -0800 Does your reliability bot run debug or release builds? 339381 2 mihaip 2011-01-24 17:01:58 -0800 (In reply to comment #1) > Does your reliability bot run debug or release builds? Just release builds. I'll see if it's possible to run a debug build. 339686 3 mihaip 2011-01-25 09:33:31 -0800 I enabled some of the debug-only checks in release builds (http://trac.webkit.org/changeset/76575 and http://trac.webkit.org/changeset/76576), but unfortunately they weren't triggered by recent reliability runs. 351480 4 koivisto 2011-02-15 12:20:43 -0800 https://bugs.webkit.org/show_bug.cgi?id=54486 might be related. I added a patch there that might be helpful for catching this. 356605 5 mihaip 2011-02-23 17:57:49 -0800 Latest update from the Chromium side (http://code.google.com/p/chromium/issues/detail?id=68516#c44): I managed to catch (by running chrome with patched tcmalloc on bots) something that looks like a double free: We are in CSSSelectorList::deleteSelector (called from ~CSSSelectorList, called from ~CSSStyleRule) and CSSSelector::m_selectorArray point so something that looks like it was already deleted (it's contents are zapped with 0xDEADDEAD which I use as a magic value in the tcmalloc's free). Unfortunately I can't say where exactly it was deleted, because my naive checks do not track this information. I will try to address this tomorrow. Maybe somebody with WebKit knowledge can deduce something just from looking at CSSSelectorList code. 356620 6 ap 2011-02-23 18:22:15 -0800 <rdar://problem/9045923> 356828 7 koivisto 2011-02-24 03:06:10 -0800 Maybe someone has deleted CSSSelector that is actually allocated from m_selectorArray? CSSSelector should probably have private destructor. 360922 8 mihaip 2011-03-02 11:00:58 -0800 (In reply to comment #7) > Maybe someone has deleted CSSSelector that is actually allocated from m_selectorArray? CSSSelector should probably have private destructor. The CSSSelector destructor ends up being invoked by the OwnPtr member of RareData. Any ideas for how to make this work without making OwnPtr a friend? It seems like adding a m_deleted flag/CRASH check in CSSSelector would help with catching this. 364820 9 mihaip 2011-03-09 15:31:38 -0800 We were able to run the reliability bot with a debugging allocator, and got this crash. chrome_25a0000!WTF::HashTable<WTF::String,WTF::String,WTF::IdentityExtractor<WTF::String>,WTF::StringHash,WTF::HashTraits<WTF::String>,WTF::HashTraits<WTF::String> >::add<WTF::String,WTF::String,WTF::IdentityHashTranslator<WTF::String,WTF::String,WTF::StringHash> >+0x39 [c:\b\build\slave\win\build\src\third_party\webkit\source\javascriptcore\wtf\hashtable.h @ 644] chrome_25a0000!WebCore::CachedResourceLoader::revalidateResource+0xbc [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\loader\cache\cachedresourceloader.cpp @ 355] chrome_25a0000!WebCore::CachedResourceLoader::requestResource+0x1b5 [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\loader\cache\cachedresourceloader.cpp @ 318] chrome_25a0000!WebCore::CachedResourceLoader::requestImage+0xfa [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\loader\cache\cachedresourceloader.cpp @ 144] chrome_25a0000!WebCore::ImageLoader::updateFromElement+0x1b0 [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\loader\imageloader.cpp @ 172] chrome_25a0000!WebCore::HTMLImageElement::parseMappedAttribute+0x5a [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\html\htmlimageelement.cpp @ 167] chrome_25a0000!WebCore::StyledElement::attributeChanged+0xf7 [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\dom\styledelement.cpp @ 189] chrome_25a0000!WebCore::NamedNodeMap::addAttribute+0x77 [c:\b\build\slave\win\build\src\third_party\webkit\source\webcore\dom\namednodemap.cpp @ 263] Looking at the implementation of CachedResourceLoader::revalidateResource (http://trac.webkit.org/browser/trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp#L335) we crash when calling m_validatedURLs.add(url). We got url earlier, from "const String& url = resource->url();". However, resource could have been deleted by the "memoryCache()->remove(resource);" call, thus the url String reference may not be good anymore. I think making an explicit copy of the url String should fix things. The fact that all this code originated with r74807 makes me pretty sure that this is the cause. 364829 10 mihaip 2011-03-09 15:44:16 -0800 I now see that that the stack that I got in comment 9 is the same as the one in bug 54486, so that may be a dupe of this. 364837 11 koivisto 2011-03-09 15:56:37 -0800 (In reply to comment #9) 5) we crash when calling m_validatedURLs.add(url). We got url earlier, from "const String& url = resource->url();". However, resource could have been deleted by the "memoryCache()->remove(resource);" call, thus the url String reference may not be good anymore. I think making an explicit copy of the url String should fix things. The fact that all this code originated with r74807 makes me pretty sure that this is the cause. Great, that must be it! Do you want to make the patch? 364839 12 koivisto 2011-03-09 15:57:49 -0800 *** Bug 54486 has been marked as a duplicate of this bug. *** 364840 13 mihaip 2011-03-09 15:58:22 -0800 (In reply to comment #11) > Great, that must be it! Do you want to make the patch? Yeah, I'll take a shot (and try to reproduce locally too). 364893 14 85261 mihaip 2011-03-09 17:06:01 -0800 Created attachment 85261 Patch 364895 15 mihaip 2011-03-09 17:08:10 -0800 (In reply to comment #13) > Yeah, I'll take a shot (and try to reproduce locally too). I didn't have much luck reproducing this locally. MemoryCache::remove calls MemoryCache::evict, which will delete the resource if CachedResource::canDelete returns true, but I couldn't get that configuration to happen. Since this is a harmless change otherwise (except for the extra copy), I think it's worth trying to land this and see if the crashes on our reliability bot go away. 364942 16 85273 mihaip 2011-03-09 18:32:46 -0800 Created attachment 85273 Patch 364945 17 85273 tonyg 2011-03-09 18:42:56 -0800 Comment on attachment 85273 Patch Up to you, but the style seems to be to drop the const. 364946 18 85275 mihaip 2011-03-09 18:43:06 -0800 Created attachment 85275 Patch 364948 19 85275 mihaip 2011-03-09 18:53:08 -0800 Comment on attachment 85275 Patch Accidentally clobbered Tony's r+ with the new patch, will land it by hand. 364952 20 mihaip 2011-03-09 18:55:13 -0800 Committed r80686: <http://trac.webkit.org/changeset/80686> 365233 21 mihaip 2011-03-10 09:12:37 -0800 (In reply to comment #20) > Committed r80686: <http://trac.webkit.org/changeset/80686> I'm pretty sure that this does fix the problem. Reliability bot runs after that got picked up by a DEPS roll (starting with http://build.chromium.org/p/chromium/builders/Win%20Reliability/builds/2556/steps/reliability%3A%20complete%20result%20of%20previous%20build/logs/stdio, and thus far 6 other runs) no longer show tcmalloc crashes. 85261 2011-03-09 17:06:01 -0800 2011-03-09 18:32:43 -0800 Patch bug-53045-20110309170600.patch text/plain 1881 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODA2NjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYjU4ZGZjMGIzZjFhYmU3 YzE2MjQ0MzYzMmMwMThkMzdjZjUxMjgxLi4zYmU2Yjg5MDZhM2E3MjY2YzRiMzgwODVjNzlhYmE0 ZTkyNzhlMzY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMDkgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjc0ODA3KTogbWVtb3J5IGNv cnJ1cHRpb24gYWZ0ZXIgQ2FjaGVkUmVzb3VyY2VMb2FkZXIgcmVmYWN0b3JpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDQ1CisgICAgICAgIAor ICAgICAgICBDb3B5IHRoZSBVUkwgb3V0IG9mIHRoZSBDYWNoZWRSZXNvdXJjZSB0aGF0IGlzIGJl aW5nIHJldmFsaWRhdGVkLCBzbworICAgICAgICB0aGF0IHdlIGNhbiBzdGlsbCB1c2UgaXQgKGlu IG1fdmFsaWRhdGVkVVJMcykgYWZ0ZXIgcmVtb3ZpbmcgdGhlCisgICAgICAgIHJlc291cmNlIGZy b20gdGhlIG1lbW9yeSBjYWNoZSwgd2hpY2ggbWF5IGRlbGV0ZSBpdC4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHNpbmNlIEkgd2FzIG5vdCBhYmxlIHRvIHRyaWdnZXIgdGhpcyBsb2NhbGx5IChp biBhIGxheW91dAorICAgICAgICB0ZXN0IG9yIG90aGVyd2lzZSkuCisKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2VMb2FkZXI6OnJldmFsaWRhdGVSZXNvdXJjZSk6CisKIDIwMTEtMDMtMDkgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggOTQ0NTQ1MTQwOGVlNzViMWQxMmZiYmNi NmM1ZmFjZWExMTU1YTU0Ni4uMDcxZjUzYjIzYjFmNWIzMGMxZmM0MTBkYWE2MGU1YmYyMWUzMjVl ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC0zNDAsNyArMzQwLDcgQEAgQ2FjaGVkUmVzb3VyY2UqIENhY2hlZFJl c291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmMK ICAgICBBU1NFUlQocmVzb3VyY2UtPmNhblVzZUNhY2hlVmFsaWRhdG9yKCkpOwogICAgIEFTU0VS VCghcmVzb3VyY2UtPnJlc291cmNlVG9SZXZhbGlkYXRlKCkpOwogICAgIAotICAgIGNvbnN0IFN0 cmluZyYgdXJsID0gcmVzb3VyY2UtPnVybCgpOworICAgIGNvbnN0IFN0cmluZyB1cmwgPSByZXNv dXJjZS0+dXJsKCk7CiAgICAgQ2FjaGVkUmVzb3VyY2UqIG5ld1Jlc291cmNlID0gY3JlYXRlUmVz b3VyY2UocmVzb3VyY2UtPnR5cGUoKSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIHJlc291 cmNlLT5lbmNvZGluZygpKTsKICAgICAKICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiUmVzb3Vy Y2UgJXAgY3JlYXRlZCB0byByZXZhbGlkYXRlICVwIiwgbmV3UmVzb3VyY2UsIHJlc291cmNlKTsK 85273 2011-03-09 18:32:46 -0800 2011-03-09 18:43:03 -0800 Patch bug-53045-20110309183245.patch text/plain 1992 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODA2NjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYjU4ZGZjMGIzZjFhYmU3 YzE2MjQ0MzYzMmMwMThkMzdjZjUxMjgxLi4zYmU2Yjg5MDZhM2E3MjY2YzRiMzgwODVjNzlhYmE0 ZTkyNzhlMzY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMDkgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjc0ODA3KTogbWVtb3J5IGNv cnJ1cHRpb24gYWZ0ZXIgQ2FjaGVkUmVzb3VyY2VMb2FkZXIgcmVmYWN0b3JpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDQ1CisgICAgICAgIAor ICAgICAgICBDb3B5IHRoZSBVUkwgb3V0IG9mIHRoZSBDYWNoZWRSZXNvdXJjZSB0aGF0IGlzIGJl aW5nIHJldmFsaWRhdGVkLCBzbworICAgICAgICB0aGF0IHdlIGNhbiBzdGlsbCB1c2UgaXQgKGlu IG1fdmFsaWRhdGVkVVJMcykgYWZ0ZXIgcmVtb3ZpbmcgdGhlCisgICAgICAgIHJlc291cmNlIGZy b20gdGhlIG1lbW9yeSBjYWNoZSwgd2hpY2ggbWF5IGRlbGV0ZSBpdC4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHNpbmNlIEkgd2FzIG5vdCBhYmxlIHRvIHRyaWdnZXIgdGhpcyBsb2NhbGx5IChp biBhIGxheW91dAorICAgICAgICB0ZXN0IG9yIG90aGVyd2lzZSkuCisKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2VMb2FkZXI6OnJldmFsaWRhdGVSZXNvdXJjZSk6CisKIDIwMTEtMDMtMDkgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggOTQ0NTQ1MTQwOGVlNzViMWQxMmZiYmNi NmM1ZmFjZWExMTU1YTU0Ni4uZTJiNDA2MTBjYzUxNGFiZTM1ODFhNGZjNTBiN2ZjMzEyZjdjOGEw MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC0zNDAsNyArMzQwLDggQEAgQ2FjaGVkUmVzb3VyY2UqIENhY2hlZFJl c291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmMK ICAgICBBU1NFUlQocmVzb3VyY2UtPmNhblVzZUNhY2hlVmFsaWRhdG9yKCkpOwogICAgIEFTU0VS VCghcmVzb3VyY2UtPnJlc291cmNlVG9SZXZhbGlkYXRlKCkpOwogICAgIAotICAgIGNvbnN0IFN0 cmluZyYgdXJsID0gcmVzb3VyY2UtPnVybCgpOworICAgIC8vIENvcHkgdGhlIFVSTCBvdXQgb2Yg dGhlIHJlc291cmNlIHRvIGJlIHJldmFsaWRhdGVkIGluIGNhc2UgaXQgZ2V0cyBkZWxldGVkIGJ5 IHRoZSByZW1vdmUoKSBjYWxsIGJlbG93LgorICAgIGNvbnN0IFN0cmluZyB1cmwgPSByZXNvdXJj ZS0+dXJsKCk7CiAgICAgQ2FjaGVkUmVzb3VyY2UqIG5ld1Jlc291cmNlID0gY3JlYXRlUmVzb3Vy Y2UocmVzb3VyY2UtPnR5cGUoKSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIHJlc291cmNl LT5lbmNvZGluZygpKTsKICAgICAKICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiUmVzb3VyY2Ug JXAgY3JlYXRlZCB0byByZXZhbGlkYXRlICVwIiwgbmV3UmVzb3VyY2UsIHJlc291cmNlKTsK 85275 2011-03-09 18:43:06 -0800 2011-03-09 18:53:08 -0800 Patch bug-53045-20110309184305.patch text/plain 1986 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODA2NjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYjU4ZGZjMGIzZjFhYmU3 YzE2MjQ0MzYzMmMwMThkMzdjZjUxMjgxLi4zYmU2Yjg5MDZhM2E3MjY2YzRiMzgwODVjNzlhYmE0 ZTkyNzhlMzY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMDkgIE1paGFp IFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjc0ODA3KTogbWVtb3J5IGNv cnJ1cHRpb24gYWZ0ZXIgQ2FjaGVkUmVzb3VyY2VMb2FkZXIgcmVmYWN0b3JpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDQ1CisgICAgICAgIAor ICAgICAgICBDb3B5IHRoZSBVUkwgb3V0IG9mIHRoZSBDYWNoZWRSZXNvdXJjZSB0aGF0IGlzIGJl aW5nIHJldmFsaWRhdGVkLCBzbworICAgICAgICB0aGF0IHdlIGNhbiBzdGlsbCB1c2UgaXQgKGlu IG1fdmFsaWRhdGVkVVJMcykgYWZ0ZXIgcmVtb3ZpbmcgdGhlCisgICAgICAgIHJlc291cmNlIGZy b20gdGhlIG1lbW9yeSBjYWNoZSwgd2hpY2ggbWF5IGRlbGV0ZSBpdC4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIHNpbmNlIEkgd2FzIG5vdCBhYmxlIHRvIHRyaWdnZXIgdGhpcyBsb2NhbGx5IChp biBhIGxheW91dAorICAgICAgICB0ZXN0IG9yIG90aGVyd2lzZSkuCisKKyAgICAgICAgKiBsb2Fk ZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2VMb2FkZXI6OnJldmFsaWRhdGVSZXNvdXJjZSk6CisKIDIwMTEtMDMtMDkgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggOTQ0NTQ1MTQwOGVlNzViMWQxMmZiYmNi NmM1ZmFjZWExMTU1YTU0Ni4uNmU1ZDRmZmM5MTBmMzg3NTFhODhmMWI4Njg5NTllNWMxZjQxNjc4 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC0zNDAsNyArMzQwLDggQEAgQ2FjaGVkUmVzb3VyY2UqIENhY2hlZFJl c291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmMK ICAgICBBU1NFUlQocmVzb3VyY2UtPmNhblVzZUNhY2hlVmFsaWRhdG9yKCkpOwogICAgIEFTU0VS VCghcmVzb3VyY2UtPnJlc291cmNlVG9SZXZhbGlkYXRlKCkpOwogICAgIAotICAgIGNvbnN0IFN0 cmluZyYgdXJsID0gcmVzb3VyY2UtPnVybCgpOworICAgIC8vIENvcHkgdGhlIFVSTCBvdXQgb2Yg dGhlIHJlc291cmNlIHRvIGJlIHJldmFsaWRhdGVkIGluIGNhc2UgaXQgZ2V0cyBkZWxldGVkIGJ5 IHRoZSByZW1vdmUoKSBjYWxsIGJlbG93LgorICAgIFN0cmluZyB1cmwgPSByZXNvdXJjZS0+dXJs KCk7CiAgICAgQ2FjaGVkUmVzb3VyY2UqIG5ld1Jlc291cmNlID0gY3JlYXRlUmVzb3VyY2UocmVz b3VyY2UtPnR5cGUoKSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIHJlc291cmNlLT5lbmNv ZGluZygpKTsKICAgICAKICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiUmVzb3VyY2UgJXAgY3Jl YXRlZCB0byByZXZhbGlkYXRlICVwIiwgbmV3UmVzb3VyY2UsIHJlc291cmNlKTsK