212916 2020-06-08 13:15:56 -0700 ResourceLoadStatisticsDatabaseStore::domainIDFromString failed, error message: bad parameter or other API misuse 2020-06-08 16:48:23 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham sihui_liu webkit-bug-importer wilander oldest_to_newest 1660344 0 katherine_cheney 2020-06-08 13:15:56 -0700 The ResourceLoadStatisticsDatabaseStore is reporting "bad parameter or other API misuse" errors. 1660345 1 katherine_cheney 2020-06-08 13:16:15 -0700 <rdar://problem/64127238> 1660349 2 401364 katherine_cheney 2020-06-08 13:25:32 -0700 Created attachment 401364 Patch 1660366 3 401364 sihui_liu 2020-06-08 14:06:22 -0700 Comment on attachment 401364 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401364&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:2226 > + // Reset this statement because it will be used again in the same scope > + // when calling insertObservedDomain. > + scopedStatement->reset(); Can we put the scopedStatement in scope stead? like: { auto scopedStatement = this->scopedStatement(m_domainIDFromStringStatement, domainIDFromStringQuery, "ensureResourceStatisticsForRegistrableDomain"_s); if (!scopedStatement || scopedStatement->bindText(1, domain.string()) != SQLITE_OK) { RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - ResourceLoadStatisticsDatabaseStore::ensureResourceStatisticsForRegistrableDomain failed, error message: %{private}s", this, m_database.lastErrorMsg()); ASSERT_NOT_REACHED(); return { AddedRecord::No, 0 }; } if (scopedStatement->step() == SQLITE_ROW) { unsigned domainID = scopedStatement->getColumnInt(0); return { AddedRecord::No, domainID }; } } 1660411 4 401376 katherine_cheney 2020-06-08 14:51:31 -0700 Created attachment 401376 Patch 1660412 5 katherine_cheney 2020-06-08 14:52:33 -0700 (In reply to Sihui Liu from comment #3) > Comment on attachment 401364 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401364&action=review > > > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:2226 > > + // Reset this statement because it will be used again in the same scope > > + // when calling insertObservedDomain. > > + scopedStatement->reset(); > > Can we put the scopedStatement in scope stead? like: > { > auto scopedStatement = > this->scopedStatement(m_domainIDFromStringStatement, > domainIDFromStringQuery, "ensureResourceStatisticsForRegistrableDomain"_s); > if (!scopedStatement > || scopedStatement->bindText(1, domain.string()) != SQLITE_OK) { > RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - > ResourceLoadStatisticsDatabaseStore:: > ensureResourceStatisticsForRegistrableDomain failed, error message: > %{private}s", this, m_database.lastErrorMsg()); > ASSERT_NOT_REACHED(); > return { AddedRecord::No, 0 }; > } > > if (scopedStatement->step() == SQLITE_ROW) { > unsigned domainID = scopedStatement->getColumnInt(0); > return { AddedRecord::No, domainID }; > } > } Yes, probably a better idea, I did this in the latest patch. 1660461 6 401376 sihui_liu 2020-06-08 16:05:49 -0700 Comment on attachment 401376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401376&action=review > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:2211 > +{ Nit: indent the block 1660467 7 401392 katherine_cheney 2020-06-08 16:09:33 -0700 Created attachment 401392 Patch for landing 1660492 8 ews-feeder 2020-06-08 16:47:27 -0700 Committed r262752: <https://trac.webkit.org/changeset/262752> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401392. 1660493 9 webkit-bug-importer 2020-06-08 16:48:23 -0700 <rdar://problem/64140844> 401364 2020-06-08 13:25:32 -0700 2020-06-08 14:51:30 -0700 Patch bug-212916-20200608132531.patch text/plain 2750 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ4MTk5ZjVmZmIxYmZjMjAx N2Y0NDU4MDEzMzJmYmQxN2NlODRiNjYuLmMwYTg0ZTUyMjVjOWU1ODFmNWRkYjYxZjk0YTk2NDgy NjdmYWVjZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDYtMDggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmRvbWFpbklERnJvbVN0cmluZyBmYWlsZWQsIGVycm9y IG1lc3NhZ2U6IGJhZCBwYXJhbWV0ZXIgb3Igb3RoZXIgQVBJIG1pc3VzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyOTE2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82NDEyNzIzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbiBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjYxODky IHdlIHN0YXJ0ZWQgdXNpbmcKKyAgICAgICAgU1FMaXRlU3RhdGVtZW50QXV0b1Jlc2V0U2NvcGUg dG8gYXZvaWQgbmVlZGluZyB0byByZXNldCBlYWNoIFNRTGl0ZSBzdGF0ZW1lbnQKKyAgICAgICAg d2hlbiBpdCBnb2VzIG91dCBvZiBzY29wZS4gSG93ZXZlciwgd2UgbmVlZCB0byByZXNldCB0aGUg c2NvcGVkU3RhdGVtZW50IGluCisgICAgICAgIGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclJl Z2lzdHJhYmxlRG9tYWluKCkKKyAgICAgICAgYmVjYXVzZSBtX2RvbWFpbklERnJvbVN0cmluZ1N0 YXRlbWVudCBpcyB1c2VkIHR3aWNlIGluIHRoZSBzYW1lIHNjb3BlLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9y ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0 b3JlOjpkb21haW5JRCBjb25zdCk6CisgICAgICAgIEFkZCBkZWJ1ZyBhc3NlcnQgdG8gZW5zdXJl IHRoYXQgdGVzdHMgY2F0Y2ggdGhpcyBjYXNlLgorCisgICAgICAgIChXZWJLaXQ6OlJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjplbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JS ZWdpc3RyYWJsZURvbWFpbiBjb25zdCk6CisKIDIwMjAtMDYtMDggIFBlciBBcm5lIFZvbGxhbiAg PHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gQ0ZQcmVmcyBzeW5jaHJvbml6 YXRpb24gZG9lcyBub3QgYWx3YXlzIHdvcmsgZm9yIGdsb2JhbCBwcmVmZXJlbmNlIGNoYW5nZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUu Y3BwCmluZGV4IDIzNTQwYWZmMjE3NGVmMTMxMGU4NDc3YzdlMTliZTkzYjlmOWNhY2MuLjgwNTQ2 N2ZlYTg2MTNmZGQwYTlhY2JlODRjYzdmNDkyYmNhMTg0YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YWJhc2VTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lm aWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcApAQCAtNzUxLDYgKzc1 MSw3IEBAIE9wdGlvbmFsPHVuc2lnbmVkPiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VT dG9yZTo6ZG9tYWluSUQoY29uc3QgUmVnaXN0cmFiCiAgICAgaWYgKCFzY29wZWRTdGF0ZW1lbnQK ICAgICAgICAgfHwgc2NvcGVkU3RhdGVtZW50LT5iaW5kVGV4dCgxLCBkb21haW4uc3RyaW5nKCkp ICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKG1f c2Vzc2lvbklELCAiJXAgLSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZG9t YWluSURGcm9tU3RyaW5nIGZhaWxlZCwgZXJyb3IgbWVzc2FnZTogJXtwcml2YXRlfXMiLCB0aGlz LCBtX2RhdGFiYXNlLmxhc3RFcnJvck1zZygpKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgfQogICAgIApAQCAtMjIyMCw2 ICsyMjIxLDEwIEBAIHN0ZDo6cGFpcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9y ZTo6QWRkZWRSZWNvcmQsIE9wdGlvbmFsPHVuc2lnbmVkPj4KICAgICAgICAgcmV0dXJuIHsgQWRk ZWRSZWNvcmQ6Ok5vLCBkb21haW5JRCB9OwogICAgIH0KIAorICAgIC8vIFJlc2V0IHRoaXMgc3Rh dGVtZW50IGJlY2F1c2UgaXQgd2lsbCBiZSB1c2VkIGFnYWluIGluIHRoZSBzYW1lIHNjb3BlCisg ICAgLy8gd2hlbiBjYWxsaW5nIGluc2VydE9ic2VydmVkRG9tYWluLgorICAgIHNjb3BlZFN0YXRl bWVudC0+cmVzZXQoKTsKKwogICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgbmV3T2JzZXJ2YXRp b24oZG9tYWluKTsKICAgICBhdXRvIHJlc3VsdCA9IGluc2VydE9ic2VydmVkRG9tYWluKG5ld09i c2VydmF0aW9uKTsKIAo= 401376 2020-06-08 14:51:31 -0700 2020-06-08 16:09:31 -0700 Patch bug-212916-20200608145130.patch text/plain 3079 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ4MTk5ZjVmZmIxYmZjMjAx N2Y0NDU4MDEzMzJmYmQxN2NlODRiNjYuLmM5MDc4MmZmM2JiMjZlZWMyZGQ0ZTgxODRiMTE2ZTZh YzE2ZTE0YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDYtMDggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmRvbWFpbklERnJvbVN0cmluZyBmYWlsZWQsIGVycm9y IG1lc3NhZ2U6IGJhZCBwYXJhbWV0ZXIgb3Igb3RoZXIgQVBJIG1pc3VzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyOTE2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82NDEyNzIzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIHN1cmUgbV9kb21haW5JREZyb21TdHJpbmdTdGF0ZW1lbnQgaXMg YWNjZXNzZWQgaW4gYSBzZXBhcmF0ZQorICAgICAgICBzY29wZSBpbiBlbnN1cmVSZXNvdXJjZVN0 YXRpc3RpY3NGb3JSZWdpc3RyYWJsZURvbWFpbigpIHNvIGl0IHdpbGwgYmUKKyAgICAgICAgcmVz ZXQgYmVmb3JlIGJlaW5nIHVzZWQgYWdhaW4uCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9D bGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmRvbWFpbklE IGNvbnN0KToKKyAgICAgICAgQWRkIGRlYnVnIGFzc2VydCB0byBlbnN1cmUgdGhhdCB0ZXN0cyBj YXRjaCB0aGlzIGNhc2UuCisKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFiYXNlU3RvcmU6OmVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclJlZ2lzdHJhYmxlRG9t YWluIGNvbnN0KToKKwogMjAyMC0wNi0wOCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDRlByZWZzIHN5bmNocm9uaXphdGlvbiBkb2VzIG5v dCBhbHdheXMgd29yayBmb3IgZ2xvYmFsIHByZWZlcmVuY2UgY2hhbmdlcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3NEYXRhYmFzZVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xh c3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKaW5kZXggMjM1 NDBhZmYyMTc0ZWYxMzEwZTg0NzdjN2UxOWJlOTNiOWY5Y2FjYy4uZWIzMjg4ODkyMWJjODkwOTVm MjBlMjIyZmZkODYwZmRjOTg5YWNhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCkBAIC03NTEsNiArNzUxLDcgQEAgT3B0aW9u YWw8dW5zaWduZWQ+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpkb21haW5J RChjb25zdCBSZWdpc3RyYWIKICAgICBpZiAoIXNjb3BlZFN0YXRlbWVudAogICAgICAgICB8fCBz Y29wZWRTdGF0ZW1lbnQtPmJpbmRUZXh0KDEsIGRvbWFpbi5zdHJpbmcoKSkgIT0gU1FMSVRFX09L KSB7CiAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQobV9zZXNzaW9uSUQsICIl cCAtIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpkb21haW5JREZyb21TdHJp bmcgZmFpbGVkLCBlcnJvciBtZXNzYWdlOiAle3ByaXZhdGV9cyIsIHRoaXMsIG1fZGF0YWJhc2Uu bGFzdEVycm9yTXNnKCkpOworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICB9CiAgICAgCkBAIC0yMjA2LDcgKzIyMDcsOCBAQCB2 b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpzZXRUb3BGcmFtZVVuaXF1 ZVJlZGlyZWN0RnJvbShjb25zdCBUbwogc3RkOjpwYWlyPFJlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhYmFzZVN0b3JlOjpBZGRlZFJlY29yZCwgT3B0aW9uYWw8dW5zaWduZWQ+PiBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVn aXN0cmFibGVEb21haW4oY29uc3QgUmVnaXN0cmFibGVEb21haW4mIGRvbWFpbikKIHsKICAgICBB U1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICAKKworewogICAgIGF1dG8gc2NvcGVkU3Rh dGVtZW50ID0gdGhpcy0+c2NvcGVkU3RhdGVtZW50KG1fZG9tYWluSURGcm9tU3RyaW5nU3RhdGVt ZW50LCBkb21haW5JREZyb21TdHJpbmdRdWVyeSwgImVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clJlZ2lzdHJhYmxlRG9tYWluIl9zKTsKICAgICBpZiAoIXNjb3BlZFN0YXRlbWVudAogICAgICAg ICB8fCBzY29wZWRTdGF0ZW1lbnQtPmJpbmRUZXh0KDEsIGRvbWFpbi5zdHJpbmcoKSkgIT0gU1FM SVRFX09LKSB7CkBAIC0yMjE5LDYgKzIyMjEsNyBAQCBzdGQ6OnBhaXI8UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RhdGFiYXNlU3RvcmU6OkFkZGVkUmVjb3JkLCBPcHRpb25hbDx1bnNpZ25lZD4+CiAg ICAgICAgIHVuc2lnbmVkIGRvbWFpbklEID0gc2NvcGVkU3RhdGVtZW50LT5nZXRDb2x1bW5JbnQo MCk7CiAgICAgICAgIHJldHVybiB7IEFkZGVkUmVjb3JkOjpObywgZG9tYWluSUQgfTsKICAgICB9 Cit9CiAKICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIG5ld09ic2VydmF0aW9uKGRvbWFpbik7 CiAgICAgYXV0byByZXN1bHQgPSBpbnNlcnRPYnNlcnZlZERvbWFpbihuZXdPYnNlcnZhdGlvbik7 Cg== 401392 2020-06-08 16:09:33 -0700 2020-06-08 16:47:27 -0700 Patch for landing bug-212916-20200608160933.patch text/plain 4020 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ4MTk5ZjVmZmIxYmZjMjAx N2Y0NDU4MDEzMzJmYmQxN2NlODRiNjYuLjE2ZWNhM2U4ZjhhODUzMGE2YjIxMWEzODdmNzNiYzgz NmVmYzFmZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDYtMDggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmRvbWFpbklERnJvbVN0cmluZyBmYWlsZWQsIGVycm9y IG1lc3NhZ2U6IGJhZCBwYXJhbWV0ZXIgb3Igb3RoZXIgQVBJIG1pc3VzZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyOTE2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82NDEyNzIzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBTaWh1aSBMaXUuCisK KyAgICAgICAgTWFrZSBzdXJlIG1fZG9tYWluSURGcm9tU3RyaW5nU3RhdGVtZW50IGlzIGFjY2Vz c2VkIGluIGEgc2VwYXJhdGUKKyAgICAgICAgc2NvcGUgaW4gZW5zdXJlUmVzb3VyY2VTdGF0aXN0 aWNzRm9yUmVnaXN0cmFibGVEb21haW4oKSBzbyBpdCB3aWxsIGJlCisgICAgICAgIHJlc2V0IGJl Zm9yZSBiZWluZyB1c2VkIGFnYWluLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3Np Zmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpkb21haW5JRCBjb25z dCk6CisgICAgICAgIEFkZCBkZWJ1ZyBhc3NlcnQgdG8gZW5zdXJlIHRoYXQgdGVzdHMgY2F0Y2gg dGhpcyBjYXNlLgorCisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRh YmFzZVN0b3JlOjplbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JSZWdpc3RyYWJsZURvbWFpbiBj b25zdCk6CisKIDIwMjAtMDYtMDggIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtDb2NvYV0gQ0ZQcmVmcyBzeW5jaHJvbml6YXRpb24gZG9lcyBub3QgYWx3 YXlzIHdvcmsgZm9yIGdsb2JhbCBwcmVmZXJlbmNlIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCmluZGV4IDIzNTQwYWZm MjE3NGVmMTMxMGU4NDc3YzdlMTliZTkzYjlmOWNhY2MuLjQzNGRjOWZjNTYxMTU2ZDc1NTY3MGNj ZmE4MzJmOTk3OThlYzIzMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcApAQCAtNzUxLDYgKzc1MSw3IEBAIE9wdGlvbmFsPHVu c2lnbmVkPiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZG9tYWluSUQoY29u c3QgUmVnaXN0cmFiCiAgICAgaWYgKCFzY29wZWRTdGF0ZW1lbnQKICAgICAgICAgfHwgc2NvcGVk U3RhdGVtZW50LT5iaW5kVGV4dCgxLCBkb21haW4uc3RyaW5nKCkpICE9IFNRTElURV9PSykgewog ICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKG1fc2Vzc2lvbklELCAiJXAgLSBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZG9tYWluSURGcm9tU3RyaW5nIGZh aWxlZCwgZXJyb3IgbWVzc2FnZTogJXtwcml2YXRlfXMiLCB0aGlzLCBtX2RhdGFiYXNlLmxhc3RF cnJvck1zZygpKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAgICAgfQogICAgIApAQCAtMjIwNiwxOCArMjIwNywyMCBAQCB2b2lk IFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlOjpzZXRUb3BGcmFtZVVuaXF1ZVJl ZGlyZWN0RnJvbShjb25zdCBUbwogc3RkOjpwYWlyPFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRh YmFzZVN0b3JlOjpBZGRlZFJlY29yZCwgT3B0aW9uYWw8dW5zaWduZWQ+PiBSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVnaXN0 cmFibGVEb21haW4oY29uc3QgUmVnaXN0cmFibGVEb21haW4mIGRvbWFpbikKIHsKICAgICBBU1NF UlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICAKLSAgICBhdXRvIHNjb3BlZFN0YXRlbWVudCA9 IHRoaXMtPnNjb3BlZFN0YXRlbWVudChtX2RvbWFpbklERnJvbVN0cmluZ1N0YXRlbWVudCwgZG9t YWluSURGcm9tU3RyaW5nUXVlcnksICJlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JSZWdpc3Ry YWJsZURvbWFpbiJfcyk7Ci0gICAgaWYgKCFzY29wZWRTdGF0ZW1lbnQKLSAgICAgICAgfHwgc2Nv cGVkU3RhdGVtZW50LT5iaW5kVGV4dCgxLCBkb21haW4uc3RyaW5nKCkpICE9IFNRTElURV9PSykg ewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKG1fc2Vzc2lvbklELCAiJXAg LSBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6ZW5zdXJlUmVzb3VyY2VTdGF0 aXN0aWNzRm9yUmVnaXN0cmFibGVEb21haW4gZmFpbGVkLCBlcnJvciBtZXNzYWdlOiAle3ByaXZh dGV9cyIsIHRoaXMsIG1fZGF0YWJhc2UubGFzdEVycm9yTXNnKCkpOwotICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIHsgQWRkZWRSZWNvcmQ6Ok5vLCAwIH07Ci0g ICAgfQotICAgIAotICAgIGlmIChzY29wZWRTdGF0ZW1lbnQtPnN0ZXAoKSA9PSBTUUxJVEVfUk9X KSB7Ci0gICAgICAgIHVuc2lnbmVkIGRvbWFpbklEID0gc2NvcGVkU3RhdGVtZW50LT5nZXRDb2x1 bW5JbnQoMCk7Ci0gICAgICAgIHJldHVybiB7IEFkZGVkUmVjb3JkOjpObywgZG9tYWluSUQgfTsK KworICAgIHsKKyAgICAgICAgYXV0byBzY29wZWRTdGF0ZW1lbnQgPSB0aGlzLT5zY29wZWRTdGF0 ZW1lbnQobV9kb21haW5JREZyb21TdHJpbmdTdGF0ZW1lbnQsIGRvbWFpbklERnJvbVN0cmluZ1F1 ZXJ5LCAiZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUmVnaXN0cmFibGVEb21haW4iX3MpOwor ICAgICAgICBpZiAoIXNjb3BlZFN0YXRlbWVudAorICAgICAgICAgICAgfHwgc2NvcGVkU3RhdGVt ZW50LT5iaW5kVGV4dCgxLCBkb21haW4uc3RyaW5nKCkpICE9IFNRTElURV9PSykgeworICAgICAg ICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChtX3Nlc3Npb25JRCwgIiVwIC0gUmVz b3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmVuc3VyZVJlc291cmNlU3RhdGlzdGlj c0ZvclJlZ2lzdHJhYmxlRG9tYWluIGZhaWxlZCwgZXJyb3IgbWVzc2FnZTogJXtwcml2YXRlfXMi LCB0aGlzLCBtX2RhdGFiYXNlLmxhc3RFcnJvck1zZygpKTsKKyAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJuIHsgQWRkZWRSZWNvcmQ6Ok5vLCAwIH07 CisgICAgICAgIH0KKworICAgICAgICBpZiAoc2NvcGVkU3RhdGVtZW50LT5zdGVwKCkgPT0gU1FM SVRFX1JPVykgeworICAgICAgICAgICAgdW5zaWduZWQgZG9tYWluSUQgPSBzY29wZWRTdGF0ZW1l bnQtPmdldENvbHVtbkludCgwKTsKKyAgICAgICAgICAgIHJldHVybiB7IEFkZGVkUmVjb3JkOjpO bywgZG9tYWluSUQgfTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIFJlc291cmNlTG9hZFN0YXRp c3RpY3MgbmV3T2JzZXJ2YXRpb24oZG9tYWluKTsK