194378 2019-02-07 01:07:07 -0800 Infinite recursion via CachedResource::~CachedResource 2019-02-07 08:07:11 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned beidson cdumez commit-queue dbates ews-watchlist ggaren japhet rniwa sabouhallawa sihui_liu oldest_to_newest 1503665 0 koivisto 2019-02-07 01:07:07 -0800 Infinite recursion via ~CachedResource Thread 0 Crashed ↩:: Dispatch queue: com.apple.main-thread 0 com.apple.WebCore 0x7fff5ea60a9a WebCore::CachedResourceHandle<WebCore::CachedResource> WTF::HashMap<WTF::String, WebCore::CachedResourceHandle<WebCore::CachedResource>, WTF::StringHash, WTF::HashTraits<WTF::String>, WTF::HashTraits<WebCore::CachedResourceHandle<WebCore::CachedResource> > >::get<WTF::IdentityHashTranslator<WTF::HashMap<WTF::String, WebCore::CachedResourceHandle<WebCore::CachedResource>, WTF::StringHash, WTF::HashTraits<WTF::String>, WTF::HashTraits<WebCore::CachedResourceHandle<WebCore::CachedResource> > >::KeyValuePairTraits, WTF::StringHash>, WTF::String>(WTF::String const&) const + 170 (/BuildRoot/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.Internal.sdk/usr/local/include/wtf/text/StringHash.h:55) 1 com.apple.WebCore 0x7fff5ea544fc WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 236 (/BuildRoot/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.Internal.sdk/usr/local/include/wtf/HashMap.h:424) 2 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 3 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 4 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 5 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 6 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 7 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 8 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 9 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 10 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 11 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 12 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 13 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 14 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 15 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 16 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 17 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 18 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 19 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 20 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 21 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 22 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 23 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 24 com.apple.WebCore 0x7fff5d8dd470 WebCore::CachedResource::unregisterHandle(WebCore::CachedResourceHandleBase*) + 176 (./loader/cache/CachedResource.cpp:624) 25 com.apple.WebCore 0x7fff5ea54511 WebCore::CachedResourceLoader::removeCachedResource(WebCore::CachedResource&) + 257 (./loader/cache/CachedResourceHandle.cpp:55) 26 com.apple.WebCore 0x7fff5d93cc3f WebCore::CachedResource::~CachedResource() + 47 (./loader/cache/CachedResource.cpp:178) 27 com.apple.WebCore 0x7fff5ea5455e WebCore::CachedResource::~CachedResource() + 14 (./loader/cache/CachedResource.cpp:165) 1503666 1 koivisto 2019-02-07 01:07:25 -0800 <rdar://problem/42023295> 1503686 2 361387 koivisto 2019-02-07 02:35:12 -0800 Created attachment 361387 patch 1503727 3 361387 commit-queue 2019-02-07 08:07:09 -0800 Comment on attachment 361387 patch Clearing flags on attachment: 361387 Committed r241121: <https://trac.webkit.org/changeset/241121> 1503728 4 commit-queue 2019-02-07 08:07:11 -0800 All reviewed patches have been landed. Closing bug. 361387 2019-02-07 02:35:12 -0800 2019-02-07 08:07:09 -0800 patch no-removeCachedResource.patch text/plain 9435 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTExOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBACisyMDE5LTAyLTA3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBJbmZpbml0ZSByZWN1cnNpb24g dmlhIENhY2hlZFJlc291cmNlOjp+Q2FjaGVkUmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDM3OAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDIwMjMyOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSSBkb24ndCBrbm93IHRoZSBleGFjdCBzdGVwcyB0byB0cmlnZ2VyIHRoaXMgYnV0IHRo ZSBtZWNoYW5pc20gc2VlbXMgY2xlYXIuCisKKyAgICAgICAgMSkgQW4gZXhpc3RpbmcgcmVzb3Vy Y2UgaXMgcmVtb3ZlZCBmcm9tIG9yIHJlcGxhY2VkIGluIENhY2hlZFJlc291cmNlTG9hZGVyOjpt X2RvY3VtZW50UmVzb3VyY2VzIG1hcC4KKyAgICAgICAgMikgVGhpcyBkZWNyZW1lbnRzIHRoZSBo YW5kbGUgY291bnQgb2YgcmVzb3VyY2UgYW5kIGNhdXNlcyBpdCBiZSBkZWxldGVkLgorICAgICAg ICAzKSBDYWNoZWRSZXNvdXJjZTo6fkNhY2hlZFJlc291cmNlIGNhbGxzIG1fb3duaW5nQ2FjaGVk UmVzb3VyY2VMb2FkZXItPnJlbW92ZUNhY2hlZFJlc291cmNlKCp0aGlzKS4gVGhpcyBvbmx5IGhh cHBlbnMgd2l0aAorICAgICAgICAgICByZXNvdXJjZXMgdGhhdCBhcmUgIm93bmVkIiBieSBDYWNo ZWRSZXNvdXJjZUxvYWRlciB3aGljaCBpcyBhIHJhcmUgc3BlY2lhbCBjYXNlICh1c2VkIGJ5IGlt YWdlIGRvY3VtZW50IGFuZCBpZiBtZW1vcnkgY2FjaGUgaXMgZGlzYWJsZWQpLgorICAgICAgICA0 KSBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVtb3ZlQ2FjaGVkUmVzb3VyY2UgbG9va3MgdXAgdGhl IHJlc291cmNlIGZyb20gdGhlIG1hcCB3aGljaCBjYXVzZXMgYSB0ZW1wb3JhcnkgQ2FjaGVkUmVz b3VyY2VIYW5kbGUgdG8gYmUgY3JlYXRlZC4KKyAgICAgICAgICAgVGhpcyBpbmNyZW1lbnRzIHRo ZSBoYW5kbGUgY291bnQgb2YgdGhlIHJlc291cmNlIGZyb20gMCBiYWNrIHRvIDEuCisgICAgICAg IDUpIFdoZW4gdGhlIHRlbXBvcmFyeSBkaWVzLCBDYWNoZWRSZXNvdXJjZTo6fkNhY2hlZFJlc291 cmNlIGlzIGNhbGxlZCBhZ2FpbiBhbmQgd2UgY3ljbGUgYmFjayB0byAzKS4KKworICAgICAgICBU aGUgZml4IGhlcmUgaXMgc2ltcGx5IHRvIHJlbW92ZSBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVt b3ZlQ2FjaGVkUmVzb3VyY2UgY2FsbCBmcm9tIH5DYWNoZWRSZXNvdXJjZS4KKyAgICAgICAgSXQg aXMgYSBsZWZ0b3ZlciBmcm9tIHdoZW4gdGhlIG1hcCBjb250YWluZWQgcmF3IHBvaW50ZXJzIGlu c3RlYWQgb2Ygb3duaW5nIENhY2hlZFJlc291cmNlSGFuZGxlcy4KKworICAgICAgICBTaW5jZSBt X2RvY3VtZW50UmVzb3VyY2VzIG1hcCBoYXMgYSBoYW5kbGUgdG8gdGhlIHJlc291cmNlLCB0aGUg b25seSB3YXkgd2UgYXJlIGluIHRoZSBkZXN0cnVjdG9yIGlzIHRoYXQgdGhlIHJlc291cmNlCisg ICAgICAgIGhhcyBiZWVuIHJlbW92ZWQgZnJvbSB0aGUgbWFwIGFscmVhZHkgKG9yIGlzIGluIHBy b2Nlc3Mgb2YgYmVpbmcgcmVtb3ZlZCBsaWtlIGluIHRoaXMgY3Jhc2gpLiBBbnkgY2FsbCB0aGF0 IGRvZXMgYW55dGhpbmcKKyAgICAgICAgb3RoZXIgdGhhbiBiYWlsIG91dCBpcyBnb2luZyB0byBj cmFzaC4KKworICAgICAgICBDYWNoZWRSZXNvdXJjZTo6bl9vd25pbmdDYWNoZWRSZXNvdXJjZUxv YWRlciBtZW1iZXIgYW5kIENhY2hlZFJlc291cmNlTG9hZGVyOjpyZW1vdmVDYWNoZWRSZXNvdXJj ZSBmdW5jdGlvbiBvbmx5IGV4aXN0IHRvCisgICAgICAgIHN1cHBvcnQgdGhpcyBlcnJhbm91cyBj YWxsIHNvIHRoZXkgYXJlIHJlbW92ZWQgYXMgd2VsbC4KKworICAgICAgICAqIGxvYWRlci9JbWFn ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVs ZW1lbnQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6fkNhY2hlZFJlc291cmNlKToKKworICAgICAg ICBUaGlzIGlzIHRoZSBzdWJzdGFudGl2ZSBjaGFuZ2UuIFRoZSByZXN0IGp1c3QgcmVtb3ZlcyBu b3ctZGVhZCBjb2RlLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmg6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6c2V0T3duaW5nQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6fkNh Y2hlZFJlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9h ZGVyOjpyZXF1ZXN0VXNlckNTU1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVk UmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRSZXNvdXJjZUxvYWRlcjo6bG9hZFJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hl ZFJlc291cmNlTG9hZGVyOjpnYXJiYWdlQ29sbGVjdERvY3VtZW50UmVzb3VyY2VzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZW1vdmVDYWNoZWRSZXNvdXJjZSk6 IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmg6 CisKIDIwMTktMDItMDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNDA3NTkgYW5kIHIyNDA5NDQuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAJKHJldmlzaW9uIDI0MTExNCkK KysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE5NCw3ICsxOTQsNiBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgp CiAgICAgICAgICAgICBuZXdJbWFnZSA9IG5ldyBDYWNoZWRJbWFnZShXVEZNb3ZlKHJlcXVlc3Qp LCBwYWdlLT5zZXNzaW9uSUQoKSwgJnBhZ2UtPmNvb2tpZUphcigpKTsKICAgICAgICAgICAgIG5l d0ltYWdlLT5zZXRTdGF0dXMoQ2FjaGVkUmVzb3VyY2U6OlBlbmRpbmcpOwogICAgICAgICAgICAg bmV3SW1hZ2UtPnNldExvYWRpbmcodHJ1ZSk7Ci0gICAgICAgICAgICBuZXdJbWFnZS0+c2V0T3du aW5nQ2FjaGVkUmVzb3VyY2VMb2FkZXIoJmRvY3VtZW50LmNhY2hlZFJlc291cmNlTG9hZGVyKCkp OwogICAgICAgICAgICAgZG9jdW1lbnQuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5tX2RvY3VtZW50 UmVzb3VyY2VzLnNldChuZXdJbWFnZS0+dXJsKCksIG5ld0ltYWdlLmdldCgpKTsKICAgICAgICAg ICAgIGRvY3VtZW50LmNhY2hlZFJlc291cmNlTG9hZGVyKCkuc2V0QXV0b0xvYWRJbWFnZXMoYXV0 b0xvYWRPdGhlckltYWdlcyk7CiAgICAgICAgIH0gZWxzZQpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCShyZXZpc2lvbiAyNDExMTQpCisr KyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNzQsOSArMTc0LDYgQEAgQ2FjaGVkUmVzb3VyY2U6On5DYWNoZWRSZXNvdXJj ZSgpCiAgICAgbV9kZWxldGVkID0gdHJ1ZTsKICAgICBjYWNoZWRSZXNvdXJjZUxlYWtDb3VudGVy LmRlY3JlbWVudCgpOwogI2VuZGlmCi0KLSAgICBpZiAobV9vd25pbmdDYWNoZWRSZXNvdXJjZUxv YWRlcikKLSAgICAgICAgbV9vd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlci0+cmVtb3ZlQ2FjaGVk UmVzb3VyY2UoKnRoaXMpOwogfQogCiB2b2lkIENhY2hlZFJlc291cmNlOjpmYWlsQmVmb3JlU3Rh cnRpbmcoKQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlLmgJKHJldmlzaW9uIDI0MTExNCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQsOCArMjM0LDYgQEAgcHVibGlj OgogCiAgICAgdmlydHVhbCB2b2lkIGRlc3Ryb3lEZWNvZGVkRGF0YSgpIHsgfQogCi0gICAgdm9p ZCBzZXRPd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlcihDYWNoZWRSZXNvdXJjZUxvYWRlciogY2Fj aGVkUmVzb3VyY2VMb2FkZXIpIHsgbV9vd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlciA9IGNhY2hl ZFJlc291cmNlTG9hZGVyOyB9Ci0KICAgICBib29sIGlzUHJlbG9hZGVkKCkgY29uc3QgeyByZXR1 cm4gbV9wcmVsb2FkQ291bnQ7IH0KICAgICB2b2lkIGluY3JlYXNlUHJlbG9hZENvdW50KCkgeyAr K21fcHJlbG9hZENvdW50OyB9CiAgICAgdm9pZCBkZWNyZWFzZVByZWxvYWRDb3VudCgpIHsgQVNT RVJUKG1fcHJlbG9hZENvdW50KTsgLS1tX3ByZWxvYWRDb3VudDsgfQpAQCAtMzMzLDggKzMzMSw2 IEBAIHByaXZhdGU6CiAKICAgICBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4gbV92 YXJ5aW5nSGVhZGVyVmFsdWVzOwogCi0gICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIG1fb3duaW5n Q2FjaGVkUmVzb3VyY2VMb2FkZXIgeyBudWxscHRyIH07IC8vIG9ubHkgbm9uLW51bGwgZm9yIHJl c291cmNlcyB0aGF0IGFyZSBub3QgaW4gdGhlIGNhY2hlCi0KICAgICAvLyBJZiB0aGlzIGZpZWxk IGlzIG5vbi1udWxsIHdlIGFyZSB1c2luZyB0aGUgcmVzb3VyY2UgYXMgYSBwcm94eSBmb3IgY2hl Y2tpbmcgd2hldGhlciBhbiBleGlzdGluZyByZXNvdXJjZSBpcyBzdGlsbCB1cCB0byBkYXRlCiAg ICAgLy8gdXNpbmcgSFRUUCBJZi1Nb2RpZmllZC1TaW5jZS9JZi1Ob25lLU1hdGNoIGhlYWRlcnMu IElmIHRoZSByZXNwb25zZSBpcyAzMDQgYWxsIGNsaWVudHMgb2YgdGhpcyByZXNvdXJjZSBhcmUg bW92ZWQKICAgICAvLyB0byB0byBiZSBjbGllbnRzIG9mIG1fcmVzb3VyY2VUb1JldmFsaWRhdGUg YW5kIHRoZSByZXNvdXJjZSBpcyBkZWxldGVkLiBJZiBub3QsIHRoZSBmaWVsZCBpcyB6ZXJvZWQg YW5kIHRoaXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMjQxMTE0KQorKysgU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTYxLDggKzE2MSw2IEBAIENhY2hlZFJlc291cmNlTG9hZGVyOjp+Q2FjaGVkUmVzb3VyY2VM b2EKICAgICBtX2RvY3VtZW50ID0gbnVsbHB0cjsKIAogICAgIGNsZWFyUHJlbG9hZHMoQ2xlYXJQ cmVsb2Fkc01vZGU6OkNsZWFyQWxsUHJlbG9hZHMpOwotICAgIGZvciAoYXV0byYgcmVzb3VyY2Ug OiBtX2RvY3VtZW50UmVzb3VyY2VzLnZhbHVlcygpKQotICAgICAgICByZXNvdXJjZS0+c2V0T3du aW5nQ2FjaGVkUmVzb3VyY2VMb2FkZXIobnVsbHB0cik7CiAKICAgICAvLyBNYWtlIHN1cmUgbm8g cmVxdWVzdHMgc3RpbGwgcG9pbnQgdG8gdGhpcyBDYWNoZWRSZXNvdXJjZUxvYWRlcgogICAgIEFT U0VSVChtX3JlcXVlc3RDb3VudCA9PSAwKTsKQEAgLTI1OCw3ICsyNTYsNiBAQCBDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRDU1NTdHlsZVNoZWV0CiAKICAgICBpZiAodXNlclNoZWV0LT5hbGxv d3NDYWNoaW5nKCkpCiAgICAgICAgIG1lbW9yeUNhY2hlLmFkZCgqdXNlclNoZWV0KTsKLSAgICAv LyBGSVhNRTogbG9hZFJlc291cmNlIGNhbGxzIHNldE93bmluZ0NhY2hlZFJlc291cmNlTG9hZGVy KCkgaWYgdGhlIHJlc291cmNlIGNvdWxkbid0IGJlIGFkZGVkIHRvIGNhY2hlLiBEb2VzIHRoaXMg ZnVuY3Rpb24gbmVlZCB0byBjYWxsIGl0LCB0b28/CiAKICAgICB1c2VyU2hlZXQtPmxvYWQoKnRo aXMpOwogICAgIHJldHVybiB1c2VyU2hlZXQ7CkBAIC04NjEsMTAgKzg1OCw4IEBAIFJlc291cmNl RXJyb3JPcjxDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWMKICAgICAgICAgdXBkYXRlSFRUUFJlcXVl c3RIZWFkZXJzKHR5cGUsIHJlcXVlc3QpOwogCiAgICAgYXV0byYgbWVtb3J5Q2FjaGUgPSBNZW1v cnlDYWNoZTo6c2luZ2xldG9uKCk7Ci0gICAgaWYgKHJlcXVlc3QuYWxsb3dzQ2FjaGluZygpICYm IG1lbW9yeUNhY2hlLmRpc2FibGVkKCkpIHsKLSAgICAgICAgaWYgKGF1dG8gaGFuZGxlID0gbV9k b2N1bWVudFJlc291cmNlcy50YWtlKHVybC5zdHJpbmcoKSkpCi0gICAgICAgICAgICBoYW5kbGUt PnNldE93bmluZ0NhY2hlZFJlc291cmNlTG9hZGVyKG51bGxwdHIpOwotICAgIH0KKyAgICBpZiAo cmVxdWVzdC5hbGxvd3NDYWNoaW5nKCkgJiYgbWVtb3J5Q2FjaGUuZGlzYWJsZWQoKSkKKyAgICAg ICAgbV9kb2N1bWVudFJlc291cmNlcy5yZW1vdmUodXJsLnN0cmluZygpKTsKIAogICAgIC8vIFNl ZSBpZiB3ZSBjYW4gdXNlIGFuIGV4aXN0aW5nIHJlc291cmNlIGZyb20gdGhlIGNhY2hlLgogICAg IENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXNvdXJjZTsKQEAgLTEwMTMs OCArMTAwOCw4IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBDYWMKIAog ICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXNvdXJjZSA9IGNyZWF0 ZVJlc291cmNlKHR5cGUsIFdURk1vdmUocmVxdWVzdCksIHNlc3Npb25JRCgpLCBjb29raWVKYXIp OwogCi0gICAgaWYgKHJlc291cmNlLT5hbGxvd3NDYWNoaW5nKCkgJiYgIW1lbW9yeUNhY2hlLmFk ZCgqcmVzb3VyY2UpKQotICAgICAgICByZXNvdXJjZS0+c2V0T3duaW5nQ2FjaGVkUmVzb3VyY2VM b2FkZXIodGhpcyk7CisgICAgaWYgKHJlc291cmNlLT5hbGxvd3NDYWNoaW5nKCkpCisgICAgICAg IG1lbW9yeUNhY2hlLmFkZCgqcmVzb3VyY2UpOwogCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVh dHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkpCiAgICAgICAg IG1fcmVzb3VyY2VUaW1pbmdJbmZvLnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZvcm1h dGlvbihyZXNvdXJjZSwgcmVzb3VyY2UtPmluaXRpYXRvck5hbWUoKSwgZnJhbWUoKSk7CkBAIC0x MzAyLDEzICsxMjk3LDYgQEAgQ2FjaGVQb2xpY3kgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNhY2hl UAogICAgIH0KIH0KIAotdm9pZCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVtb3ZlQ2FjaGVkUmVz b3VyY2UoQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKQotewotICAgIGlmIChtX2RvY3VtZW50UmVz b3VyY2VzLmNvbnRhaW5zKHJlc291cmNlLnVybCgpKSAmJiBtX2RvY3VtZW50UmVzb3VyY2VzLmdl dChyZXNvdXJjZS51cmwoKSkuZ2V0KCkgIT0gJnJlc291cmNlKQotICAgICAgICByZXR1cm47Ci0g ICAgbV9kb2N1bWVudFJlc291cmNlcy5yZW1vdmUocmVzb3VyY2UudXJsKCkpOwotfQotCiB2b2lk IENhY2hlZFJlc291cmNlTG9hZGVyOjpsb2FkRG9uZShMb2FkQ29tcGxldGlvblR5cGUgdHlwZSwg Ym9vbCBzaG91bGRQZXJmb3JtUG9zdExvYWRBY3Rpb25zKQogewogICAgIFJlZlB0cjxEb2N1bWVu dExvYWRlcj4gcHJvdGVjdERvY3VtZW50TG9hZGVyKG1fZG9jdW1lbnRMb2FkZXIpOwpAQCAtMTM0 MiwxMCArMTMzMCw4IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmdhcmJhZ2VDb2xsZWMK ICAgICBmb3IgKGF1dG8mIHJlc291cmNlIDogbV9kb2N1bWVudFJlc291cmNlcykgewogICAgICAg ICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiICBjYWNoZWQgcmVzb3VyY2UgJXAgLSBoYXNPbmVIYW5k bGUgJWQiLCByZXNvdXJjZS52YWx1ZS5nZXQoKSwgcmVzb3VyY2UudmFsdWUtPmhhc09uZUhhbmRs ZSgpKTsKIAotICAgICAgICBpZiAocmVzb3VyY2UudmFsdWUtPmhhc09uZUhhbmRsZSgpKSB7Cisg ICAgICAgIGlmIChyZXNvdXJjZS52YWx1ZS0+aGFzT25lSGFuZGxlKCkpCiAgICAgICAgICAgICBy ZXNvdXJjZXNUb0RlbGV0ZS5hcHBlbmQocmVzb3VyY2Uua2V5KTsKLSAgICAgICAgICAgIHJlc291 cmNlLnZhbHVlLT5zZXRPd25pbmdDYWNoZWRSZXNvdXJjZUxvYWRlcihudWxscHRyKTsKLSAgICAg ICAgfQogICAgIH0KIAogICAgIGZvciAoYXV0byYgcmVzb3VyY2UgOiByZXNvdXJjZXNUb0RlbGV0 ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5oCShyZXZpc2lvbiAyNDExMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDggKzEz MCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyRG9jdW1lbnRMb2FkZXIoKSB7IG1fZG9jdW1l bnRMb2FkZXIgPSBudWxscHRyOyB9CiAgICAgUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29u c3Q7CiAKLSAgICB2b2lkIHJlbW92ZUNhY2hlZFJlc291cmNlKENhY2hlZFJlc291cmNlJik7Ci0K ICAgICB2b2lkIGxvYWREb25lKExvYWRDb21wbGV0aW9uVHlwZSwgYm9vbCBzaG91bGRQZXJmb3Jt UG9zdExvYWRBY3Rpb25zID0gdHJ1ZSk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGdhcmJh Z2VDb2xsZWN0RG9jdW1lbnRSZXNvdXJjZXMoKTsK