185124 2018-04-29 11:59:04 -0700 SubresourceLoader::didFail() should only log message if state is Initialized 2018-06-22 18:23:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED EasyFix, InRadar P2 Normal --- 1 dbates wwang153 bfulgham cdumez commit-queue ews-watchlist japhet webkit-bug-importer wilander youennf oldest_to_newest 1418918 0 dbates 2018-04-29 11:59:04 -0700 SubresourceLoader::didFail() has the followzing code: [[ void SubresourceLoader::didFail(const ResourceError& error) { if (m_frame && m_frame->document() && error.isAccessControl()) m_frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, error.localizedDescription()); #if USE(QUICK_LOOK) ... #endif if (m_state != Initialized) return; ASSERT(!reachedTerminalState()); LOG(ResourceLoading, "Failed to load '%s'.\n", m_resource->url().string().latin1().data()); ... ]] The logic to log a console message should be moved after LOG() such that we only perform this logic if m_state != Initialized. Moreover, we do not need to null check m_frame once we move the code because it can never be null so long as we have not reached he terminal state. 1435609 1 343369 wwang153 2018-06-22 14:38:21 -0700 Created attachment 343369 Patch 1435705 2 343402 wwang153 2018-06-22 17:32:44 -0700 Created attachment 343402 Patch 1435712 3 343403 wwang153 2018-06-22 17:40:40 -0700 Created attachment 343403 Patch 1435740 4 343403 commit-queue 2018-06-22 18:22:10 -0700 Comment on attachment 343403 Patch Clearing flags on attachment: 343403 Committed r233117: <https://trac.webkit.org/changeset/233117> 1435741 5 commit-queue 2018-06-22 18:22:12 -0700 All reviewed patches have been landed. Closing bug. 1435743 6 webkit-bug-importer 2018-06-22 18:23:17 -0700 <rdar://problem/41389563> 343369 2018-06-22 14:38:21 -0700 2018-06-22 17:32:42 -0700 Patch bug-185124-20180622143821.patch text/plain 2359 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI1NGRkYWVjNWZiZDA5 NzQ5OGI3YzQyNGExYzJjNmE5MmU5ZjE1MS4uYzRkZWMwNjI1ZmYwMzMzMGUzOTcxYjBlMzAyOTU1 YzBiNzZmZTQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA2LTIyICBXb29k cm93IFdhbmcgIDx3b29kcm93X3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIFN1YnJlc291cmNl TG9hZGVyOjpkaWRGYWlsKCkgc2hvdWxkIG9ubHkgbG9nIG1lc3NhZ2UgaWYgc3RhdGUgaXMgSW5p dGlhbGl6ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NTEyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZ1bmN0aW9uYWxpdHkgZG9lcyBub3QgY2hhbmdlLiBNb3ZpbmcgY29uc29sZSBsb2dnaW5nIHRv IGJlIAorICAgICAgICBhZnRlciBjaGVja2luZyBzdGF0ZSBvZiBzdWJyZXNvdXJjZSBsb2FkZXIu IFdlIG9ubHkgbmVlZCB0byAKKyAgICAgICAgcGVyZm9ybSB0aGlzIGxvZyBpZiB0aGUgc3RhdGUg aXMgaW5pdGlhbGl6ZWQgdG8gc3RheSAKKyAgICAgICAgY29uc2lzdGVudCB3aXRoIG90aGVyIGZ1 bmN0aW9ucyBpbiBmaWxlLiBXZSBjYW4gYWxzbyByZW1vdmUgYQorICAgICAgICBudWxsIGNoZWNr IGZvciB0aGUgZnJhbWUsIGFzIHdlIGhhdmUgYXNzZXJ0aW9ucyB0byBlbnN1cmUgaXQKKyAgICAg ICAgaXMgbm90IG51bGwgYWxyZWFkeS4KKworICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbCk6 CisKIDIwMTgtMDYtMjIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlY2FsYyBzdHlsZXMgZXZlcnkgdGltZSBkZWZhdWx0QXBwZWFyYW5jZSBjaGFuZ2Vz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYTRh MTVkODFmYmM1MjA5MDFhNzVjYzJlZjEwMzMzNGM0NDM1YjJjMC4uYjAzNWQwYjA4YTA2MzBlN2Qx NzBmOTczZDE1ZmQ0NmE1MTI3ODEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVz b3VyY2VMb2FkZXIuY3BwCkBAIC02NDgsOCArNjQ4LDYgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRl cjo6ZGlkRmluaXNoTG9hZGluZyhjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmIG5ldHdvcmtMb2Fk TWUKIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9y JiBlcnJvcikKIHsKLSAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpICYmIGVy cm9yLmlzQWNjZXNzQ29udHJvbCgpKQotICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5hZGRD b25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJv ciwgZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSk7CiAKICNpZiBVU0UoUVVJQ0tfTE9PSykK ICAgICBpZiAoYXV0byBwcmV2aWV3TG9hZGVyID0gbV9wcmV2aWV3TG9hZGVyLmdldCgpKQpAQCAt NjYwLDYgKzY1OCw5IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZEZhaWwoY29uc3QgUmVz b3VyY2VFcnJvciYgZXJyb3IpCiAgICAgICAgIHJldHVybjsKICAgICBBU1NFUlQoIXJlYWNoZWRU ZXJtaW5hbFN0YXRlKCkpOwogICAgIExPRyhSZXNvdXJjZUxvYWRpbmcsICJGYWlsZWQgdG8gbG9h ZCAnJXMnLlxuIiwgbV9yZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCkuZGF0YSgpKTsK KyAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSAmJiBlcnJvci5pc0FjY2Vzc0NvbnRyb2woKSkK KyAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNv dXJjZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIGVycm9yLmxvY2FsaXplZERlc2Ny aXB0aW9uKCkpOworCiAKICAgICBSZWY8U3VicmVzb3VyY2VMb2FkZXI+IHByb3RlY3RlZFRoaXMo KnRoaXMpOwogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBwcm90ZWN0 UmVzb3VyY2UobV9yZXNvdXJjZSk7Cg== 343402 2018-06-22 17:32:44 -0700 2018-06-22 17:39:45 -0700 Patch bug-185124-20180622173243.patch text/plain 2714 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI1NGRkYWVjNWZiZDA5 NzQ5OGI3YzQyNGExYzJjNmE5MmU5ZjE1MS4uYTNlYTVmM2IxMWEwODk0YTVmMjMyNjZlYTU2ZmUw MTk0ZDRkYzM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA2LTIyICBXb29k cm93IFdhbmcgIDx3b29kcm93X3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIFN1YnJlc291cmNl TG9hZGVyOjpkaWRGYWlsKCkgc2hvdWxkIG9ubHkgbG9nIG1lc3NhZ2UgaWYgc3RhdGUgaXMgSW5p dGlhbGl6ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NTEyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZ1bmN0aW9uYWxpdHkgZG9lcyBub3QgY2hhbmdlLiBNb3ZlZCBjb25zb2xlIGxvZ2dpbmcgdG8g YmUgCisgICAgICAgIGFmdGVyIGNoZWNraW5nIHN0YXRlIG9mIHN1YnJlc291cmNlIGxvYWRlci4g V2Ugb25seSBuZWVkIHRvIAorICAgICAgICBsb2cgaWYgdGhlIHN0YXRlIGlzIGluaXRpYWxpemVk LiBUaGlzIGlzIGNvbnNpc3RlbnQgd2l0aCBvdGhlcgorICAgICAgICBmdW5jdGlvbnMgaW4gZmls ZS4gV2UgY2FuIGFsc28gcmVtb3ZlIGEgbnVsbCBjaGVjayBmb3IgdGhlIAorICAgICAgICBmcmFt ZSBwb2ludGVyIChtX2ZyYW1lKS4gVGhlIHN1cGVyY2xhc3MgUmVzb3VyY2VMb2FkZXIgY29uc3Ry dWN0b3IKKyAgICAgICAgdGFrZXMgYW4gbHZhbHVlIHJlZmVyZW5jZSBhbmQgaW5pdGlhbGl6ZXMg bV9mcmFtZSwgZW5zdXJpbmcKKyAgICAgICAgbV9mcmFtZSBjYW5ub3QgYmUgbnVsbC4gSXQgaXMg b25seSBzZXQgdG8gbnVsbCBieSAKKyAgICAgICAgUmVzb3VyY2VMb2FkZXI6OnJlbGVhc2VSZXNv dXJjZXMoKSwgd2hpY2ggaXMgb25seSBjYWxsZWQgYWZ0ZXIgdGhlIAorICAgICAgICByZXNvdXJj ZSBmaW5pc2hlcyBsb2FkaW5nIG9yIGZhaWxzIHRvIGxvYWQuIFRodXMsIGluIGRpZEZhaWwoKSwg CisgICAgICAgIG1fZnJhbWUgbXVzdCBiZSBub24tbnVsbCB3aGVuIHdlJ3JlIGxvZ2dpbmcgYW5k IHVwIHVudGlsIHRoZSBlbmQgb2YgdGhlIGZ1bmN0aW9uLiAgCisKKyAgICAgICAgKiBsb2FkZXIv U3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2Fk ZXI6OmRpZEZhaWwpOgorCiAyMDE4LTA2LTIyICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFw cGxlLmNvbT4KIAogICAgICAgICBSZWNhbGMgc3R5bGVzIGV2ZXJ5IHRpbWUgZGVmYXVsdEFwcGVh cmFuY2UgY2hhbmdlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNv dXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIu Y3BwCmluZGV4IGE0YTE1ZDgxZmJjNTIwOTAxYTc1Y2MyZWYxMDMzMzRjNDQzNWIyYzAuLmIwMzVk MGIwOGEwNjMwZTdkMTcwZjk3M2QxNWZkNDZhNTEyNzgxMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtNjQ4LDggKzY0OCw2IEBAIHZvaWQgU3Vi cmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcoY29uc3QgTmV0d29ya0xvYWRNZXRyaWNz JiBuZXR3b3JrTG9hZE1lCiAKIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZEZhaWwoY29uc3Qg UmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7Ci0gICAgaWYgKG1fZnJhbWUgJiYgbV9mcmFtZS0+ZG9j dW1lbnQoKSAmJiBlcnJvci5pc0FjY2Vzc0NvbnRyb2woKSkKLSAgICAgICAgbV9mcmFtZS0+ZG9j dW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2VjdXJpdHksIE1lc3Nh Z2VMZXZlbDo6RXJyb3IsIGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkpOwogCiAjaWYgVVNF KFFVSUNLX0xPT0spCiAgICAgaWYgKGF1dG8gcHJldmlld0xvYWRlciA9IG1fcHJldmlld0xvYWRl ci5nZXQoKSkKQEAgLTY2MCw2ICs2NTgsOSBAQCB2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpkaWRG YWlsKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAgICAgICByZXR1cm47CiAgICAgQVNT RVJUKCFyZWFjaGVkVGVybWluYWxTdGF0ZSgpKTsKICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAi RmFpbGVkIHRvIGxvYWQgJyVzJy5cbiIsIG1fcmVzb3VyY2UtPnVybCgpLnN0cmluZygpLmxhdGlu MSgpLmRhdGEoKSk7CisgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkgJiYgZXJyb3IuaXNBY2Nl c3NDb250cm9sKCkpCisgICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNz YWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBlcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbigpKTsKKwogCiAgICAgUmVmPFN1YnJlc291cmNlTG9hZGVyPiBw cm90ZWN0ZWRUaGlzKCp0aGlzKTsKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNv dXJjZT4gcHJvdGVjdFJlc291cmNlKG1fcmVzb3VyY2UpOwo= 343403 2018-06-22 17:40:40 -0700 2018-06-22 18:22:10 -0700 Patch bug-185124-20180622174039.patch text/plain 2718 wwang153 U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI1NGRkYWVjNWZiZDA5 NzQ5OGI3YzQyNGExYzJjNmE5MmU5ZjE1MS4uYjc0MWQwM2VlOTE2MzQzN2Y5MWMyMzMzNjYyYjgy MTJjMzcxOTgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA2LTIyICBXb29k cm93IFdhbmcgIDx3b29kcm93X3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIFN1YnJlc291cmNl TG9hZGVyOjpkaWRGYWlsKCkgc2hvdWxkIG9ubHkgbG9nIG1lc3NhZ2UgaWYgc3RhdGUgaXMgSW5p dGlhbGl6ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NTEyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZ1bmN0aW9uYWxpdHkgZG9lcyBub3QgY2hhbmdlLiBNb3ZlZCBjb25zb2xlIGxvZ2dpbmcgdG8g YmUgCisgICAgICAgIGFmdGVyIGNoZWNraW5nIHN0YXRlIG9mIHN1YnJlc291cmNlIGxvYWRlci4g V2Ugb25seSBuZWVkIHRvIAorICAgICAgICBsb2cgaWYgdGhlIHN0YXRlIGlzIGluaXRpYWxpemVk LiBUaGlzIGlzIGNvbnNpc3RlbnQgd2l0aCBvdGhlcgorICAgICAgICBmdW5jdGlvbnMgaW4gdGhl IGZpbGUuIFdlIGNhbiBhbHNvIHJlbW92ZSBhIG51bGwgY2hlY2sgZm9yIHRoZSAKKyAgICAgICAg ZnJhbWUgcG9pbnRlciAobV9mcmFtZSkuIFRoZSBzdXBlcmNsYXNzIFJlc291cmNlTG9hZGVyIGNv bnN0cnVjdG9yCisgICAgICAgIHRha2VzIGFuIGx2YWx1ZSByZWZlcmVuY2UgYW5kIGluaXRpYWxp emVzIG1fZnJhbWUsIGVuc3VyaW5nCisgICAgICAgIG1fZnJhbWUgY2Fubm90IGJlIG51bGwuIEl0 IGlzIG9ubHkgc2V0IHRvIG51bGwgYnkgCisgICAgICAgIFJlc291cmNlTG9hZGVyOjpyZWxlYXNl UmVzb3VyY2VzKCksIHdoaWNoIGlzIG9ubHkgY2FsbGVkIGFmdGVyIHRoZSAKKyAgICAgICAgcmVz b3VyY2UgZmluaXNoZXMgbG9hZGluZyBvciBmYWlscyB0byBsb2FkLiBUaHVzLCBpbiBkaWRGYWls KCksIAorICAgICAgICBtX2ZyYW1lIG11c3QgYmUgbm9uLW51bGwgd2hlbiB3ZSdyZSBsb2dnaW5n IGFuZCB1cCB1bnRpbCB0aGUgZW5kIG9mIHRoZSBmdW5jdGlvbi4gIAorCisgICAgICAgICogbG9h ZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNl TG9hZGVyOjpkaWRGYWlsKToKKwogMjAxOC0wNi0yMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3Ro eUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVjYWxjIHN0eWxlcyBldmVyeSB0aW1lIGRlZmF1bHRB cHBlYXJhbmNlIGNoYW5nZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3Vi cmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9h ZGVyLmNwcAppbmRleCBhNGExNWQ4MWZiYzUyMDkwMWE3NWNjMmVmMTAzMzM0YzQ0MzViMmMwLi5i MDM1ZDBiMDhhMDYzMGU3ZDE3MGY5NzNkMTVmZDQ2YTUxMjc4MTAwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKQEAgLTY0OCw4ICs2NDgsNiBAQCB2b2lk IFN1YnJlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKGNvbnN0IE5ldHdvcmtMb2FkTWV0 cmljcyYgbmV0d29ya0xvYWRNZQogCiB2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpkaWRGYWlsKGNv bnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogewotICAgIGlmIChtX2ZyYW1lICYmIG1fZnJhbWUt PmRvY3VtZW50KCkgJiYgZXJyb3IuaXNBY2Nlc3NDb250cm9sKCkpCi0gICAgICAgIG1fZnJhbWUt PmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBN ZXNzYWdlTGV2ZWw6OkVycm9yLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpKTsKIAogI2lm IFVTRShRVUlDS19MT09LKQogICAgIGlmIChhdXRvIHByZXZpZXdMb2FkZXIgPSBtX3ByZXZpZXdM b2FkZXIuZ2V0KCkpCkBAIC02NjAsNiArNjU4LDkgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6 ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAgICAgcmV0dXJuOwogICAg IEFTU0VSVCghcmVhY2hlZFRlcm1pbmFsU3RhdGUoKSk7CiAgICAgTE9HKFJlc291cmNlTG9hZGlu ZywgIkZhaWxlZCB0byBsb2FkICclcycuXG4iLCBtX3Jlc291cmNlLT51cmwoKS5zdHJpbmcoKS5s YXRpbjEoKS5kYXRhKCkpOworICAgIGlmIChtX2ZyYW1lLT5kb2N1bWVudCgpICYmIGVycm9yLmlz QWNjZXNzQ29udHJvbCgpKQorICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5hZGRDb25zb2xl TWVzc2FnZShNZXNzYWdlU291cmNlOjpTZWN1cml0eSwgTWVzc2FnZUxldmVsOjpFcnJvciwgZXJy b3IubG9jYWxpemVkRGVzY3JpcHRpb24oKSk7CisKIAogICAgIFJlZjxTdWJyZXNvdXJjZUxvYWRl cj4gcHJvdGVjdGVkVGhpcygqdGhpcyk7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVk UmVzb3VyY2U+IHByb3RlY3RSZXNvdXJjZShtX3Jlc291cmNlKTsK