199302 2019-06-27 17:53:49 -0700 ASSERT that a sessionID is valid when encoding it 2019-08-07 09:09:06 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen alecflett beidson cdumez commit-queue darin ews-watchlist jsbell ryanhaddad sihui_liu webkit-bug-importer oldest_to_newest 1548683 0 youennf 2019-06-27 17:53:49 -0700 ASSERT that a sessionID is valid when encoding it 1548684 1 373074 youennf 2019-06-27 17:56:38 -0700 Created attachment 373074 Patch 1548685 2 webkit-bug-importer 2019-06-27 17:58:00 -0700 <rdar://problem/52298011> 1548837 3 youennf 2019-06-28 09:30:35 -0700 I plan to do a follow-up that will remove the sessionID from IDBValue. 1549095 4 373074 darin 2019-06-30 13:27:08 -0700 Comment on attachment 373074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373074&action=review > Source/WebCore/Modules/indexeddb/IDBValue.h:57 > - const PAL::SessionID& sessionID() const { return m_sessionID; } > + const PAL::SessionID& sessionID() const > + { > + // FIXME: We should assert m_sessionID is valid or remove m_sessionID. > + return m_sessionID; > + } When changing from a trivial to a multi-line inline function, I think it’s better style to put the function at the bottom of the file, outside the class definition, with other inline function and function template definitions. This helps keep class definitions smaller and easier to read. > Source/WebCore/Modules/indexeddb/IDBValue.h:78 > - encoder << m_sessionID; > + encoder << m_sessionID.isValid(); > + if (m_sessionID.isValid()) > + encoder << m_sessionID; Kind of inelegant to have the "invalid" concept built into SessionID but not work for encode/decode. Maybe change to not having "invalid" session IDs and use Optional<> instead as a cleanup later. That would make this code nicer like the m_databaseIdentifier example. > Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h:74 > - const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; } > + const IDBDatabaseIdentifier& databaseIdentifier() const > + { > + ASSERT(m_databaseIdentifier); > + if (!m_databaseIdentifier) > + m_databaseIdentifier = IDBDatabaseIdentifier { }; > + return *m_databaseIdentifier; > + } Same comment about moving definitions when making them non-trivial. > Source/WebCore/PAL/pal/SessionID.h:108 > + // FIXME: We should fail to decode an invalid sessionID. > + ASSERT(SessionID { *sessionID }.isValid()); When will we make that change? I understand that perhaps it’s too risky now, but when will it be possible? 1549681 5 youennf 2019-07-02 12:48:02 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 373074 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373074&action=review > > > Source/WebCore/Modules/indexeddb/IDBValue.h:57 > > - const PAL::SessionID& sessionID() const { return m_sessionID; } > > + const PAL::SessionID& sessionID() const > > + { > > + // FIXME: We should assert m_sessionID is valid or remove m_sessionID. > > + return m_sessionID; > > + } > > When changing from a trivial to a multi-line inline function, I think it’s > better style to put the function at the bottom of the file, outside the > class definition, with other inline function and function template > definitions. This helps keep class definitions smaller and easier to read. OK > > Source/WebCore/Modules/indexeddb/IDBValue.h:78 > > - encoder << m_sessionID; > > + encoder << m_sessionID.isValid(); > > + if (m_sessionID.isValid()) > > + encoder << m_sessionID; > > Kind of inelegant to have the "invalid" concept built into SessionID but not > work for encode/decode. Maybe change to not having "invalid" session IDs and > use Optional<> instead as a cleanup later. That would make this code nicer > like the m_databaseIdentifier example. Sure, the idea is to remove m_sessionID from IDBValue. See https://bugs.webkit.org/show_bug.cgi?id=199320 for such a patch. > > Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h:74 > > - const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; } > > + const IDBDatabaseIdentifier& databaseIdentifier() const > > + { > > + ASSERT(m_databaseIdentifier); > > + if (!m_databaseIdentifier) > > + m_databaseIdentifier = IDBDatabaseIdentifier { }; > > + return *m_databaseIdentifier; > > + } > > Same comment about moving definitions when making them non-trivial. > > > Source/WebCore/PAL/pal/SessionID.h:108 > > + // FIXME: We should fail to decode an invalid sessionID. > > + ASSERT(SessionID { *sessionID }.isValid()); > > When will we make that change? I understand that perhaps it’s too risky now, > but when will it be possible? I think we can do this in a couple of weeks. 1550112 6 373444 youennf 2019-07-03 17:38:59 -0700 Created attachment 373444 Patch 1550395 7 373444 commit-queue 2019-07-05 09:24:32 -0700 Comment on attachment 373444 Patch Clearing flags on attachment: 373444 Committed r247159: <https://trac.webkit.org/changeset/247159> 1550396 8 commit-queue 2019-07-05 09:24:34 -0700 All reviewed patches have been landed. Closing bug. 1550436 9 ryanhaddad 2019-07-05 10:59:41 -0700 IndexedDB layout tests are failing the new assert: https://build.webkit.org/results/Apple%20Mojave%20Debug%20WK2%20(Tests)/r247159%20(3424)/results.html 1550437 10 ryanhaddad 2019-07-05 11:00:59 -0700 Reverted r247159 for reason: IndexedDB layout tests are failing the new assert. Committed r247163: <https://trac.webkit.org/changeset/247163> 1559068 11 375687 youennf 2019-08-06 22:37:05 -0700 Created attachment 375687 Fixing assertion 1559131 12 375687 commit-queue 2019-08-07 09:09:04 -0700 Comment on attachment 375687 Fixing assertion Clearing flags on attachment: 375687 Committed r248366: <https://trac.webkit.org/changeset/248366> 1559132 13 commit-queue 2019-08-07 09:09:06 -0700 All reviewed patches have been landed. Closing bug. 373074 2019-06-27 17:56:38 -0700 2019-07-03 17:38:58 -0700 Patch bug-199302-20190627175637.patch text/plain 7308 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmI5M2Y0ZmJiNTVhNDVj ZDk3ZDdmMTg5ZDY3Njc0YTIwNGE2ODc4Yi4uOTkyMjUwZTEzMWRkN2FlYzA5M2U0NWZlOTJhZDc4 Njc5YWU0YzkxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlQgdGhhdCBhIHNl c3Npb25JRCBpcyB2YWxpZCB3aGVuIGVuY29kaW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzMDIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgSURCVmFsdWUsIGluc3RlYWQgb2YgZW5jb2Rp bmcgYW4gaW52YWxpZCBzZXNzaW9uIElELCBlbmNvZGUgYSBib29sZWFuIHRoYXQgdGVsbHMgdGhl cmUgaXMgbm8gc2Vzc2lvbklELgorICAgICAgICBGb3IgSURCUmVxdWVzdERhdGEsIGtlZXAgdHJh Y2sgb2Ygd2hldGhlciB0aGVyZSBpcyBhbiBJREJEYXRhYmFzZUlkZW50aWZpZXIKKyAgICAgICAg YW5kIGVuY29kZS9kZWNvZGUgYWNjb3JkaW5nbHkgdG8gbm90IGVuY29kZSBhbiBpbnZhbGlkIHNl c3Npb25JRC4KKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6 SURCVmFsdWU6OnNlc3Npb25JRCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJWYWx1ZTo6 ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlZhbHVlOjpkZWNvZGUpOgorICAg ICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJREJSZXF1ZXN0RGF0YTo6aXNvbGF0ZWRDb3B5KToKKyAgICAgICAgKiBN b2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaDoKKyAgICAgICAgKFdlYkNv cmU6OklEQlJlcXVlc3REYXRhOjpkYXRhYmFzZUlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6SURCUmVxdWVzdERhdGE6OmRlY29kZSk6CisKIDIwMTktMDYtMjcgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNPU10gZ2V0VXNlck1lZGlh IGNhbGxlZCBtdWx0aXBsZSB0aW1lcyBzaG91bGQgYmV0dGVyIGhhbmRsZSBjYW1lcmEgcmVzb2x1 dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggNGJiODdmNWVjYTIwMmYxZTg0NzNmZjRhNWU0ZGJi MTAzZTI1M2ZmYS4uODdiOWE0NmRlNTdkNTdhNDE1ZGZkNDZhNWI2NDQ2ZmRhMThiYjgwYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDYtMjcgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEFTU0VSVCB0aGF0IGEgc2Vzc2lvbklE IGlzIHZhbGlkIHdoZW4gZW5jb2RpbmcgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5OTMwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFTU0VSVCB0aGF0IGEgc2Vzc2lvbklEIGlzIHZhbGlkIGF0IGVu Y29kaW5nL2RlY29kaW5nIHRpbWUuCisKKyAgICAgICAgKiBwYWwvU2Vzc2lvbklELmg6CisgICAg ICAgIChQQUw6OlNlc3Npb25JRDo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFBBTDo6U2Vzc2lv bklEOjpkZWNvZGUpOgorCiAyMDE5LTA2LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBIVFRQQ29va2llQWNjZXB0UG9saWN5IGFu IGVudW0gY2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L0lEQlZhbHVlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5o CmluZGV4IGZiNDY3MDBhNzc1MzhhMTZlNmI2ODQ2ZjNhYmI2ZjM5Njg2NWNmMzYuLjQwNDdhNDI3 NjBiNmI5MGFlMWM0MDMzODZkMTUyNzEyOTlmOWY1NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaApAQCAtNTAsNyArNTAsMTEgQEAgcHVibGljOgogCiAg ICAgY29uc3QgVGhyZWFkU2FmZURhdGFCdWZmZXImIGRhdGEoKSBjb25zdCB7IHJldHVybiBtX2Rh dGE7IH0KICAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMoKSBjb25zdCB7IHJldHVy biBtX2Jsb2JVUkxzOyB9Ci0gICAgY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCgpIGNv bnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklEOyB9CisgICAgY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNl c3Npb25JRCgpIGNvbnN0CisgICAgeworICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFzc2Vy dCBtX3Nlc3Npb25JRCBpcyB2YWxpZCBvciByZW1vdmUgbV9zZXNzaW9uSUQuCisgICAgICAgIHJl dHVybiBtX3Nlc3Npb25JRDsKKyAgICB9CiAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JG aWxlUGF0aHMoKSBjb25zdCB7IHJldHVybiBtX2Jsb2JGaWxlUGF0aHM7IH0KIAogICAgIHRlbXBs YXRlPGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKQEAgLTY5LDcg KzczLDkgQEAgdm9pZCBJREJWYWx1ZTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7 CiAgICAgZW5jb2RlciA8PCBtX2RhdGE7CiAgICAgZW5jb2RlciA8PCBtX2Jsb2JVUkxzOwotICAg IGVuY29kZXIgPDwgbV9zZXNzaW9uSUQ7CisgICAgZW5jb2RlciA8PCBtX3Nlc3Npb25JRC5pc1Zh bGlkKCk7CisgICAgaWYgKG1fc2Vzc2lvbklELmlzVmFsaWQoKSkKKyAgICAgICAgZW5jb2RlciA8 PCBtX3Nlc3Npb25JRDsKICAgICBlbmNvZGVyIDw8IG1fYmxvYkZpbGVQYXRoczsKIH0KIApAQCAt ODMsOSArODksMTUgQEAgT3B0aW9uYWw8SURCVmFsdWU+IElEQlZhbHVlOjpkZWNvZGUoRGVjb2Rl ciYgZGVjb2RlcikKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2Jsb2JVUkxzKSkK ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0Lm1fc2Vzc2lvbklEKSkKKyAgICBib29sIGhhc1Nlc3Npb25JRDsKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKGhhc1Nlc3Npb25JRCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 CiAKKyAgICBpZiAoaGFzU2Vzc2lvbklEKSB7CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0Lm1fc2Vzc2lvbklEKSkKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Cisg ICAgfQorCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9ibG9iRmlsZVBhdGhzKSkK ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHAKaW5kZXgg NTc0ZWE4YjAxZDliYmYxMzI5Y2NlODllZGRjNTUyZWY1OWI4MTAzMi4uYjEwZDg0MDk5YjI1Mjhl NmY3M2MyOGIxNTA0YThhOTMyNGQwYjIxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuY3BwCkBAIC05OCw3 ICs5OCw4IEBAIHZvaWQgSURCUmVxdWVzdERhdGE6Omlzb2xhdGVkQ29weShjb25zdCBJREJSZXF1 ZXN0RGF0YSYgc291cmNlLCBJREJSZXF1ZXN0RGF0YSYKICAgICBkZXN0aW5hdGlvbi5tX3JlcXVl c3RlZFZlcnNpb24gPSBzb3VyY2UubV9yZXF1ZXN0ZWRWZXJzaW9uOwogICAgIGRlc3RpbmF0aW9u Lm1fcmVxdWVzdFR5cGUgPSBzb3VyY2UubV9yZXF1ZXN0VHlwZTsKIAotICAgIGRlc3RpbmF0aW9u Lm1fZGF0YWJhc2VJZGVudGlmaWVyID0gc291cmNlLm1fZGF0YWJhc2VJZGVudGlmaWVyLmlzb2xh dGVkQ29weSgpOworICAgIGlmIChzb3VyY2UubV9kYXRhYmFzZUlkZW50aWZpZXIpCisgICAgICAg IGRlc3RpbmF0aW9uLm1fZGF0YWJhc2VJZGVudGlmaWVyID0gc291cmNlLm1fZGF0YWJhc2VJZGVu dGlmaWVyLT5pc29sYXRlZENvcHkoKTsKIAogICAgIGlmIChzb3VyY2UubV9yZXF1ZXN0SWRlbnRp ZmllcikKICAgICAgICAgZGVzdGluYXRpb24ubV9yZXF1ZXN0SWRlbnRpZmllciA9IHN0ZDo6bWFr ZV91bmlxdWU8SURCUmVzb3VyY2VJZGVudGlmaWVyPigqc291cmNlLm1fcmVxdWVzdElkZW50aWZp ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVk L0lEQlJlcXVlc3REYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFy ZWQvSURCUmVxdWVzdERhdGEuaAppbmRleCBiNTgyMTY3NWJiOWFlYTEyZThkNjk5MWEwMjFkOWVl ZDE4ZmQ2NjUxLi45Zjg3NDc3YjFkOWFiODg1OTY3ZjM4NzdhMjUxZjM5MGRlMjQ4MTI2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVz dERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURC UmVxdWVzdERhdGEuaApAQCAtNjUsNyArNjUsMTQgQEAgcHVibGljOgogICAgIEluZGV4ZWREQjo6 SW5kZXhSZWNvcmRUeXBlIGluZGV4UmVjb3JkVHlwZSgpIGNvbnN0OwogICAgIElEQlJlc291cmNl SWRlbnRpZmllciBjdXJzb3JJZGVudGlmaWVyKCkgY29uc3Q7CiAKLSAgICBjb25zdCBJREJEYXRh YmFzZUlkZW50aWZpZXImIGRhdGFiYXNlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fZGF0 YWJhc2VJZGVudGlmaWVyOyB9CisgICAgY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBkYXRh YmFzZUlkZW50aWZpZXIoKSBjb25zdAorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fZGF0YWJhc2VJ ZGVudGlmaWVyKTsKKyAgICAgICAgaWYgKCFtX2RhdGFiYXNlSWRlbnRpZmllcikKKyAgICAgICAg ICAgIG1fZGF0YWJhc2VJZGVudGlmaWVyID0gSURCRGF0YWJhc2VJZGVudGlmaWVyIHsgfTsKKyAg ICAgICAgcmV0dXJuICptX2RhdGFiYXNlSWRlbnRpZmllcjsKKyAgICB9CisKICAgICB1aW50NjRf dCByZXF1ZXN0ZWRWZXJzaW9uKCkgY29uc3Q7CiAKICAgICBib29sIGlzT3BlblJlcXVlc3QoKSBj b25zdCB7IHJldHVybiBtX3JlcXVlc3RUeXBlID09IEluZGV4ZWREQjo6UmVxdWVzdFR5cGU6Ok9w ZW47IH0KQEAgLTg5LDcgKzk2LDcgQEAgcHJpdmF0ZToKICAgICB1aW50NjRfdCBtX2luZGV4SWRl bnRpZmllciB7IDAgfTsKICAgICBJbmRleGVkREI6OkluZGV4UmVjb3JkVHlwZSBtX2luZGV4UmVj b3JkVHlwZTsKIAotICAgIElEQkRhdGFiYXNlSWRlbnRpZmllciBtX2RhdGFiYXNlSWRlbnRpZmll cjsKKyAgICBtdXRhYmxlIE9wdGlvbmFsPElEQkRhdGFiYXNlSWRlbnRpZmllcj4gbV9kYXRhYmFz ZUlkZW50aWZpZXI7CiAgICAgdWludDY0X3QgbV9yZXF1ZXN0ZWRWZXJzaW9uIHsgMCB9OwogCiAg ICAgSW5kZXhlZERCOjpSZXF1ZXN0VHlwZSBtX3JlcXVlc3RUeXBlIHsgSW5kZXhlZERCOjpSZXF1 ZXN0VHlwZTo6T3RoZXIgfTsKQEAgLTEyOCw3ICsxMzUsNyBAQCBib29sIElEQlJlcXVlc3REYXRh OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgSURCUmVxdWVzdERhdGEmIHJlcXVlc3QpCiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXF1ZXN0Lm1faW5kZXhJZGVudGlmaWVyKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgT3B0aW9uYWw8SURCRGF0YWJhc2VJZGVudGlmaWVyPiBkYXRh YmFzZUlkZW50aWZpZXI7CisgICAgT3B0aW9uYWw8T3B0aW9uYWw8SURCRGF0YWJhc2VJZGVudGlm aWVyPj4gZGF0YWJhc2VJZGVudGlmaWVyOwogICAgIGRlY29kZXIgPj4gZGF0YWJhc2VJZGVudGlm aWVyOwogICAgIGlmICghZGF0YWJhc2VJZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1Nlc3Npb25JRC5oIGIvU291cmNl L1dlYkNvcmUvUEFML3BhbC9TZXNzaW9uSUQuaAppbmRleCAyYjFjZGIyOTg3NDk0MGY3MDA1ZjJi OTkyNDQ1MTQwMmEyY2FjZTFjLi5mN2NjYTdkZjEzNDdlMGNhMzkwNTVlY2NiMWVhYzgwYTkyMTQ2 YzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1Nlc3Npb25JRC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvU2Vzc2lvbklELmgKQEAgLTgwLDcgKzgwLDcgQEAgcHJp dmF0ZToKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIFNlc3Npb25JRDo6ZW5jb2RlKEVu Y29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IEVsaW1pbmF0ZSBwbGFjZXMg dGhhdCBlbmNvZGUgaW52YWxpZCBTZXNzaW9uSURzLCB0aGVuIEFTU0VSVCBoZXJlIHRoYXQgdGhl IHNlc3Npb25JRCBpcyB2YWxpZC4KKyAgICBBU1NFUlQoaXNWYWxpZCgpKTsKICAgICBlbmNvZGVy IDw8IG1fc2Vzc2lvbklEOwogfQogCkBAIC0xMDQsNyArMTA0LDggQEAgT3B0aW9uYWw8U2Vzc2lv bklEPiBTZXNzaW9uSUQ6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogICAgIGlmICghc2Vzc2lv bklEKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAgLy8gRklYTUU6IEVsaW1p bmF0ZSBwbGFjZXMgdGhhdCBlbmNvZGUgaW52YWxpZCBTZXNzaW9uSURzLCB0aGVuIGZhaWwgdG8g ZGVjb2RlIGFuIGludmFsaWQgc2Vzc2lvbklELgorICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgZmFp bCB0byBkZWNvZGUgYW4gaW52YWxpZCBzZXNzaW9uSUQuCisgICAgQVNTRVJUKFNlc3Npb25JRCB7 ICpzZXNzaW9uSUQgfS5pc1ZhbGlkKCkpOwogICAgIHJldHVybiBTZXNzaW9uSUQgeyAqc2Vzc2lv bklEIH07CiB9CiAK 373444 2019-07-03 17:38:59 -0700 2019-08-06 22:37:03 -0700 Patch bug-199302-20190703173859.patch text/plain 7015 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThmZTU4MGZhMTNkMzUz OTY4NDViMWEzMjAyY2NiZDlhMzczN2FmZS4uMGU0ZGM0ZDI3MTVjYmIyNzRlNmNkNDhhMGJkMmY4 NjAwOGY4N2Y5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA3LTAzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlQgdGhhdCBhIHNl c3Npb25JRCBpcyB2YWxpZCB3aGVuIGVuY29kaW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzMDIKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBGb3IgSURCVmFsdWUsIGluc3RlYWQgb2YgZW5jb2Rpbmcg YW4gaW52YWxpZCBzZXNzaW9uIElELCBlbmNvZGUgYSBib29sZWFuIHRoYXQgdGVsbHMgdGhlcmUg aXMgbm8gc2Vzc2lvbklELgorICAgICAgICBGb3IgSURCUmVxdWVzdERhdGEsIGtlZXAgdHJhY2sg b2Ygd2hldGhlciB0aGVyZSBpcyBhbiBJREJEYXRhYmFzZUlkZW50aWZpZXIKKyAgICAgICAgYW5k IGVuY29kZS9kZWNvZGUgYWNjb3JkaW5nbHkgdG8gbm90IGVuY29kZSBhbiBpbnZhbGlkIHNlc3Np b25JRC4KKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6SURC VmFsdWU6OnNlc3Npb25JRCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJWYWx1ZTo6ZW5j b2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlZhbHVlOjpkZWNvZGUpOgorICAgICAg ICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJREJSZXF1ZXN0RGF0YTo6aXNvbGF0ZWRDb3B5KToKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlJlcXVlc3REYXRhOjpkYXRhYmFzZUlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SURCUmVxdWVzdERhdGE6OmRlY29kZSk6CisKIDIwMTktMDctMDMgIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjI0NjYxNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCmluZGV4IGY0M2RhZThhMWFmYTcyMTQyY2VhNWM1 YjNhMDA5OTVmOWNiMDA4NDEuLjg5NDEyN2U4ZWU0ZWJjNDUzMDg5YmQ5OWViM2NkNmRmYjdiMzli NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA3LTAzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlQgdGhhdCBhIHNl c3Npb25JRCBpcyB2YWxpZCB3aGVuIGVuY29kaW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzMDIKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBBU1NFUlQgdGhhdCBhIHNlc3Npb25JRCBpcyB2YWxpZCBh dCBlbmNvZGluZy9kZWNvZGluZyB0aW1lLgorCisgICAgICAgICogcGFsL1Nlc3Npb25JRC5oOgor ICAgICAgICAoUEFMOjpTZXNzaW9uSUQ6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChQQUw6OlNl c3Npb25JRDo6ZGVjb2RlKToKKwogMjAxOS0wNy0wMyAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFk QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjQ2NjE2Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmgKaW5kZXggZmI0Njcw MGE3NzUzOGExNmU2YjY4NDZmM2FiYjZmMzk2ODY1Y2YzNi4uYzdmMjMyMmMwM2I3MjkyZDJjYTU0 OTdlOGZiZWQyYjRiZDViMDhiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCVmFsdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9JREJWYWx1ZS5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFRocmVh ZFNhZmVEYXRhQnVmZmVyJiBkYXRhKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhOyB9CiAgICAgY29u c3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzKCkgY29uc3QgeyByZXR1cm4gbV9ibG9iVVJMczsg fQotICAgIGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQoKSBjb25zdCB7IHJldHVybiBt X3Nlc3Npb25JRDsgfQorICAgIGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQoKSBjb25z dDsKICAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocygpIGNvbnN0IHsgcmV0 dXJuIG1fYmxvYkZpbGVQYXRoczsgfQogCiAgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9p ZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OwpAQCAtNTksMTAgKzU5LDE3IEBAIHB1YmxpYzoKIHBy aXZhdGU6CiAgICAgVGhyZWFkU2FmZURhdGFCdWZmZXIgbV9kYXRhOwogICAgIFZlY3RvcjxTdHJp bmc+IG1fYmxvYlVSTHM7Ci0gICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CisgICAgbXV0 YWJsZSBPcHRpb25hbDxQQUw6OlNlc3Npb25JRD4gbV9zZXNzaW9uSUQ7CiAgICAgVmVjdG9yPFN0 cmluZz4gbV9ibG9iRmlsZVBhdGhzOwogfTsKIAoraW5saW5lIGNvbnN0IFBBTDo6U2Vzc2lvbklE JiBJREJWYWx1ZTo6c2Vzc2lvbklEKCkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IGFzc2VydCBtX3Nlc3Npb25JRCBpcyB2YWxpZCBvciByZW1vdmUgbV9zZXNzaW9uSUQuCisgICAg aWYgKCFtX3Nlc3Npb25JRCkKKyAgICAgICAgbV9zZXNzaW9uSUQgPSBQQUw6OlNlc3Npb25JRCB7 IH07CisgICAgcmV0dXJuICptX3Nlc3Npb25JRDsKK30KIAogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rl cj4KIHZvaWQgSURCVmFsdWU6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3RE YXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1 ZXN0RGF0YS5jcHAKaW5kZXggNTc0ZWE4YjAxZDliYmYxMzI5Y2NlODllZGRjNTUyZWY1OWI4MTAz Mi4uYjEwZDg0MDk5YjI1MjhlNmY3M2MyOGIxNTA0YThhOTMyNGQwYjIxYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVz dERhdGEuY3BwCkBAIC05OCw3ICs5OCw4IEBAIHZvaWQgSURCUmVxdWVzdERhdGE6Omlzb2xhdGVk Q29weShjb25zdCBJREJSZXF1ZXN0RGF0YSYgc291cmNlLCBJREJSZXF1ZXN0RGF0YSYKICAgICBk ZXN0aW5hdGlvbi5tX3JlcXVlc3RlZFZlcnNpb24gPSBzb3VyY2UubV9yZXF1ZXN0ZWRWZXJzaW9u OwogICAgIGRlc3RpbmF0aW9uLm1fcmVxdWVzdFR5cGUgPSBzb3VyY2UubV9yZXF1ZXN0VHlwZTsK IAotICAgIGRlc3RpbmF0aW9uLm1fZGF0YWJhc2VJZGVudGlmaWVyID0gc291cmNlLm1fZGF0YWJh c2VJZGVudGlmaWVyLmlzb2xhdGVkQ29weSgpOworICAgIGlmIChzb3VyY2UubV9kYXRhYmFzZUlk ZW50aWZpZXIpCisgICAgICAgIGRlc3RpbmF0aW9uLm1fZGF0YWJhc2VJZGVudGlmaWVyID0gc291 cmNlLm1fZGF0YWJhc2VJZGVudGlmaWVyLT5pc29sYXRlZENvcHkoKTsKIAogICAgIGlmIChzb3Vy Y2UubV9yZXF1ZXN0SWRlbnRpZmllcikKICAgICAgICAgZGVzdGluYXRpb24ubV9yZXF1ZXN0SWRl bnRpZmllciA9IHN0ZDo6bWFrZV91bmlxdWU8SURCUmVzb3VyY2VJZGVudGlmaWVyPigqc291cmNl Lm1fcmVxdWVzdElkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaAppbmRleCBiNTgyMTY3NWJiOWFl YTEyZThkNjk5MWEwMjFkOWVlZDE4ZmQ2NjUxLi40NWNmZmFlYTYwM2E1M2I1OTkwNGM4YjE0Yjdh MWRlZjdkMjVmMzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6 CiAgICAgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgaW5kZXhSZWNvcmRUeXBlKCkgY29uc3Q7 CiAgICAgSURCUmVzb3VyY2VJZGVudGlmaWVyIGN1cnNvcklkZW50aWZpZXIoKSBjb25zdDsKIAot ICAgIGNvbnN0IElEQkRhdGFiYXNlSWRlbnRpZmllciYgZGF0YWJhc2VJZGVudGlmaWVyKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhYmFzZUlkZW50aWZpZXI7IH0KKyAgICBjb25zdCBJREJEYXRhYmFz ZUlkZW50aWZpZXImIGRhdGFiYXNlSWRlbnRpZmllcigpIGNvbnN0OwogICAgIHVpbnQ2NF90IHJl cXVlc3RlZFZlcnNpb24oKSBjb25zdDsKIAogICAgIGJvb2wgaXNPcGVuUmVxdWVzdCgpIGNvbnN0 IHsgcmV0dXJuIG1fcmVxdWVzdFR5cGUgPT0gSW5kZXhlZERCOjpSZXF1ZXN0VHlwZTo6T3Blbjsg fQpAQCAtODksMTIgKzg5LDIwIEBAIHByaXZhdGU6CiAgICAgdWludDY0X3QgbV9pbmRleElkZW50 aWZpZXIgeyAwIH07CiAgICAgSW5kZXhlZERCOjpJbmRleFJlY29yZFR5cGUgbV9pbmRleFJlY29y ZFR5cGU7CiAKLSAgICBJREJEYXRhYmFzZUlkZW50aWZpZXIgbV9kYXRhYmFzZUlkZW50aWZpZXI7 CisgICAgbXV0YWJsZSBPcHRpb25hbDxJREJEYXRhYmFzZUlkZW50aWZpZXI+IG1fZGF0YWJhc2VJ ZGVudGlmaWVyOwogICAgIHVpbnQ2NF90IG1fcmVxdWVzdGVkVmVyc2lvbiB7IDAgfTsKIAogICAg IEluZGV4ZWREQjo6UmVxdWVzdFR5cGUgbV9yZXF1ZXN0VHlwZSB7IEluZGV4ZWREQjo6UmVxdWVz dFR5cGU6Ok90aGVyIH07CiB9OwogCitpbmxpbmUgY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVy JiBJREJSZXF1ZXN0RGF0YTo6ZGF0YWJhc2VJZGVudGlmaWVyKCkgY29uc3QKK3sKKyAgICBBU1NF UlQobV9kYXRhYmFzZUlkZW50aWZpZXIpOworICAgIGlmICghbV9kYXRhYmFzZUlkZW50aWZpZXIp CisgICAgICAgIG1fZGF0YWJhc2VJZGVudGlmaWVyID0gSURCRGF0YWJhc2VJZGVudGlmaWVyIHsg fTsKKyAgICByZXR1cm4gKm1fZGF0YWJhc2VJZGVudGlmaWVyOworfQorCiB0ZW1wbGF0ZTxjbGFz cyBFbmNvZGVyPgogdm9pZCBJREJSZXF1ZXN0RGF0YTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIp IGNvbnN0CiB7CkBAIC0xMjgsNyArMTM2LDcgQEAgYm9vbCBJREJSZXF1ZXN0RGF0YTo6ZGVjb2Rl KERlY29kZXImIGRlY29kZXIsIElEQlJlcXVlc3REYXRhJiByZXF1ZXN0KQogICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVxdWVzdC5tX2luZGV4SWRlbnRpZmllcikpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgIE9wdGlvbmFsPElEQkRhdGFiYXNlSWRlbnRpZmllcj4gZGF0YWJhc2VJZGVu dGlmaWVyOworICAgIE9wdGlvbmFsPE9wdGlvbmFsPElEQkRhdGFiYXNlSWRlbnRpZmllcj4+IGRh dGFiYXNlSWRlbnRpZmllcjsKICAgICBkZWNvZGVyID4+IGRhdGFiYXNlSWRlbnRpZmllcjsKICAg ICBpZiAoIWRhdGFiYXNlSWRlbnRpZmllcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9TZXNzaW9uSUQuaCBiL1NvdXJjZS9XZWJDb3Jl L1BBTC9wYWwvU2Vzc2lvbklELmgKaW5kZXggMmIxY2RiMjk4NzQ5NDBmNzAwNWYyYjk5MjQ0NTE0 MDJhMmNhY2UxYy4uZjdjY2E3ZGYxMzQ3ZTBjYTM5MDU1ZWNjYjFlYWM4MGE5MjE0NmM3YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9TZXNzaW9uSUQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9QQUwvcGFsL1Nlc3Npb25JRC5oCkBAIC04MCw3ICs4MCw3IEBAIHByaXZhdGU6CiB0 ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgogdm9pZCBTZXNzaW9uSUQ6OmVuY29kZShFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBFbGltaW5hdGUgcGxhY2VzIHRoYXQgZW5j b2RlIGludmFsaWQgU2Vzc2lvbklEcywgdGhlbiBBU1NFUlQgaGVyZSB0aGF0IHRoZSBzZXNzaW9u SUQgaXMgdmFsaWQuCisgICAgQVNTRVJUKGlzVmFsaWQoKSk7CiAgICAgZW5jb2RlciA8PCBtX3Nl c3Npb25JRDsKIH0KIApAQCAtMTA0LDcgKzEwNCw4IEBAIE9wdGlvbmFsPFNlc3Npb25JRD4gU2Vz c2lvbklEOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBpZiAoIXNlc3Npb25JRCkKICAg ICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIC8vIEZJWE1FOiBFbGltaW5hdGUgcGxh Y2VzIHRoYXQgZW5jb2RlIGludmFsaWQgU2Vzc2lvbklEcywgdGhlbiBmYWlsIHRvIGRlY29kZSBh biBpbnZhbGlkIHNlc3Npb25JRC4KKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGZhaWwgdG8gZGVj b2RlIGFuIGludmFsaWQgc2Vzc2lvbklELgorICAgIEFTU0VSVChTZXNzaW9uSUQgeyAqc2Vzc2lv bklEIH0uaXNWYWxpZCgpKTsKICAgICByZXR1cm4gU2Vzc2lvbklEIHsgKnNlc3Npb25JRCB9Owog fQogCg== 375687 2019-08-06 22:37:05 -0700 2019-08-07 09:09:04 -0700 Fixing assertion bug-199302-20190806223704.patch text/plain 9167 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ1NmQ4ZjllY2QwZjlk ZGYxZGI3NDdlNzdhNDlhZWMxOTI5NGNlZC4uZmNjYzMzZmE3Mjg2OTJmMTgxOTYwNDQ2MWU2N2Vl MTVlOWQ4ZTM3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA4LTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBU1NFUlQgdGhhdCBhIHNl c3Npb25JRCBpcyB2YWxpZCB3aGVuIGVuY29kaW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkzMDIKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBGb3IgSURCVmFsdWUsIGluc3RlYWQgb2YgZW5jb2Rpbmcg YW4gaW52YWxpZCBzZXNzaW9uIElELCBlbmNvZGUgYSBib29sZWFuIHRoYXQgdGVsbHMgdGhlcmUg aXMgbm8gc2Vzc2lvbklELgorICAgICAgICBGb3IgSURCUmVxdWVzdERhdGEsIGtlZXAgdHJhY2sg b2Ygd2hldGhlciB0aGVyZSBpcyBhbiBJREJEYXRhYmFzZUlkZW50aWZpZXIKKyAgICAgICAgYW5k IGVuY29kZS9kZWNvZGUgYWNjb3JkaW5nbHkgdG8gbm90IGVuY29kZSBhbiBpbnZhbGlkIHNlc3Np b25JRC4KKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2Ugb2YgYmVoYXZpb3IuCisKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6SURC VmFsdWU6OnNlc3Npb25JRCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJWYWx1ZTo6ZW5j b2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlZhbHVlOjpkZWNvZGUpOgorICAgICAg ICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJREJSZXF1ZXN0RGF0YTo6aXNvbGF0ZWRDb3B5KToKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQlJlcXVlc3REYXRhOjpkYXRhYmFzZUlkZW50aWZpZXIgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SURCUmVxdWVzdERhdGE6OmRlY29kZSk6CisKIDIwMTktMDgtMDYgIFNhYW0gQmFyYXRp ICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dITFNMXSBSZWR1Y2UgdGhlIG51bWJl ciBvZiB2YXJpYWJsZXMgdGhhdCBtYWtlIGl0IGludG8gdGhlIGdsb2JhbCBzdHJ1Y3QgYnkgc2tp cHBpbmcgc3RkbGliIGZ1bmN0aW9ucyBhbmQgaW50ZXJuYWwgdXNlcyBvZiBNYWtlUG9pbnRlckV4 cHJlc3Npb24vTWFrZUFycmF5UmVmZXJlbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkOWRlMTc1 NmYwYzZhZmMwMzAxZWY0YzFiZWU4ZTRlMzIwOGQyY2ZlLi40ZTAzNmNjNDc0NmM5Yjk5NTg2NjE1 NDY2MWMwNzllMTkwMjBhNzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxOS0wOC0wNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAg QVNTRVJUIHRoYXQgYSBzZXNzaW9uSUQgaXMgdmFsaWQgd2hlbiBlbmNvZGluZyBpdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MzAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQVNTRVJUIHRoYXQgYSBzZXNz aW9uSUQgaXMgdmFsaWQgYXQgZW5jb2RpbmcvZGVjb2RpbmcgdGltZS4KKworICAgICAgICAqIHBh bC9TZXNzaW9uSUQuaDoKKyAgICAgICAgKFBBTDo6U2Vzc2lvbklEOjplbmNvZGUgY29uc3QpOgor ICAgICAgICAoUEFMOjpTZXNzaW9uSUQ6OmRlY29kZSk6CisKIDIwMTktMDctMzEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBDVEZvbnRDcmVhdGVGb3JD aGFyYWN0ZXJzV2l0aExhbmd1YWdlQW5kT3B0aW9uIGlmIGF2YWlsYWJsZSBpbnN0ZWFkIG9mIENU Rm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcAppbmRleCBiMTcxMDQ4ZmI1MWEwNjA2M2JkMmZk ZGU4Y2U4NjAyZmUxZTZhN2E4Li4wYzI3NjFjMGY1YWMxYmUxNzkxOTNlY2MyZTVjOWQxZWUyZjFm ZWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuY3Bw CkBAIC00MCw4ICs0MCw5IEBAIElEQlZhbHVlOjpJREJWYWx1ZSgpCiBJREJWYWx1ZTo6SURCVmFs dWUoY29uc3QgU2VyaWFsaXplZFNjcmlwdFZhbHVlJiBzY3JpcHRWYWx1ZSkKICAgICA6IG1fZGF0 YShUaHJlYWRTYWZlRGF0YUJ1ZmZlcjo6Y29weVZlY3RvcihzY3JpcHRWYWx1ZS5kYXRhKCkpKQog ICAgICwgbV9ibG9iVVJMcyhzY3JpcHRWYWx1ZS5ibG9iVVJMc0lzb2xhdGVkQ29weSgpKQotICAg ICwgbV9zZXNzaW9uSUQoc2NyaXB0VmFsdWUuc2Vzc2lvbklEKCkpCiB7CisgICAgaWYgKHNjcmlw dFZhbHVlLnNlc3Npb25JRCgpLmlzVmFsaWQoKSkKKyAgICAgICAgbV9zZXNzaW9uSUQgPSBzY3Jp cHRWYWx1ZS5zZXNzaW9uSUQoKTsKIH0KIAogSURCVmFsdWU6OklEQlZhbHVlKGNvbnN0IFRocmVh ZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSkKQEAgLTUyLDI2ICs1MywyOSBAQCBJREJWYWx1ZTo6SURC VmFsdWUoY29uc3QgVGhyZWFkU2FmZURhdGFCdWZmZXImIHZhbHVlKQogSURCVmFsdWU6OklEQlZh bHVlKGNvbnN0IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSYgc2NyaXB0VmFsdWUsIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBibG9iVVJMcywgY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgY29u c3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0aHMpCiAgICAgOiBtX2RhdGEoVGhyZWFkU2Fm ZURhdGFCdWZmZXI6OmNvcHlWZWN0b3Ioc2NyaXB0VmFsdWUuZGF0YSgpKSkKICAgICAsIG1fYmxv YlVSTHMoYmxvYlVSTHMpCi0gICAgLCBtX3Nlc3Npb25JRChzZXNzaW9uSUQpCiAgICAgLCBtX2Js b2JGaWxlUGF0aHMoYmxvYkZpbGVQYXRocykKIHsKICAgICBBU1NFUlQobV9kYXRhLmRhdGEoKSk7 CisgICAgaWYgKHNlc3Npb25JRC5pc1ZhbGlkKCkpCisgICAgICAgIG1fc2Vzc2lvbklEID0gc2Vz c2lvbklEOwogfQogCiBJREJWYWx1ZTo6SURCVmFsdWUoY29uc3QgVGhyZWFkU2FmZURhdGFCdWZm ZXImIHZhbHVlLCBWZWN0b3I8U3RyaW5nPiYmIGJsb2JVUkxzLCBjb25zdCBQQUw6OlNlc3Npb25J RCYgc2Vzc2lvbklELCBWZWN0b3I8U3RyaW5nPiYmIGJsb2JGaWxlUGF0aHMpCiAgICAgOiBtX2Rh dGEodmFsdWUpCiAgICAgLCBtX2Jsb2JVUkxzKFdURk1vdmUoYmxvYlVSTHMpKQotICAgICwgbV9z ZXNzaW9uSUQoc2Vzc2lvbklEKQogICAgICwgbV9ibG9iRmlsZVBhdGhzKFdURk1vdmUoYmxvYkZp bGVQYXRocykpCiB7CisgICAgaWYgKHNlc3Npb25JRC5pc1ZhbGlkKCkpCisgICAgICAgIG1fc2Vz c2lvbklEID0gc2Vzc2lvbklEOwogfQogCiBJREJWYWx1ZTo6SURCVmFsdWUoY29uc3QgVGhyZWFk U2FmZURhdGFCdWZmZXImIHZhbHVlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMsIGNv bnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9i RmlsZVBhdGhzKQogICAgIDogbV9kYXRhKHZhbHVlKQogICAgICwgbV9ibG9iVVJMcyhibG9iVVJM cykKLSAgICAsIG1fc2Vzc2lvbklEKHNlc3Npb25JRCkKICAgICAsIG1fYmxvYkZpbGVQYXRocyhi bG9iRmlsZVBhdGhzKQogeworICAgIGlmIChzZXNzaW9uSUQuaXNWYWxpZCgpKQorICAgICAgICBt X3Nlc3Npb25JRCA9IHNlc3Npb25JRDsKIH0KIAogdm9pZCBJREJWYWx1ZTo6c2V0QXNJc29sYXRl ZENvcHkoY29uc3QgSURCVmFsdWUmIG90aGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQlZhbHVlLmgKaW5kZXggZmI0NjcwMGE3NzUzOGExNmU2YjY4NDZmM2FiYjZmMzk2 ODY1Y2YzNi4uNjk2Zjc1MmU4ODNkMWU2ZTYwMzZkMjliZWEzZmU1NzA2NzBhYzZjMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVmFsdWUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oCkBAIC01MCw3ICs1MCw3 IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiBkYXRhKCkgY29u c3QgeyByZXR1cm4gbV9kYXRhOyB9CiAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxz KCkgY29uc3QgeyByZXR1cm4gbV9ibG9iVVJMczsgfQotICAgIGNvbnN0IFBBTDo6U2Vzc2lvbklE JiBzZXNzaW9uSUQoKSBjb25zdCB7IHJldHVybiBtX3Nlc3Npb25JRDsgfQorICAgIFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRCgpIGNvbnN0OwogICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9i RmlsZVBhdGhzKCkgY29uc3QgeyByZXR1cm4gbV9ibG9iRmlsZVBhdGhzOyB9CiAKICAgICB0ZW1w bGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIGVuY29kZShFbmNvZGVyJikgY29uc3Q7CkBAIC01OSwx MCArNTksMTcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBUaHJlYWRTYWZlRGF0YUJ1ZmZlciBt X2RhdGE7CiAgICAgVmVjdG9yPFN0cmluZz4gbV9ibG9iVVJMczsKLSAgICBQQUw6OlNlc3Npb25J RCBtX3Nlc3Npb25JRDsKKyAgICBPcHRpb25hbDxQQUw6OlNlc3Npb25JRD4gbV9zZXNzaW9uSUQ7 CiAgICAgVmVjdG9yPFN0cmluZz4gbV9ibG9iRmlsZVBhdGhzOwogfTsKIAoraW5saW5lIFBBTDo6 U2Vzc2lvbklEIElEQlZhbHVlOjpzZXNzaW9uSUQoKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYXNzZXJ0IG1fc2Vzc2lvbklEIGlzIHZhbGlkIG9yIHJlbW92ZSBtX3Nlc3Npb25J RC4KKyAgICBpZiAoIW1fc2Vzc2lvbklEKQorICAgICAgICByZXR1cm4geyB9OworICAgIHJldHVy biAqbV9zZXNzaW9uSUQ7Cit9CiAKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIElEQlZh bHVlOjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCUmVxdWVzdERhdGEuY3BwCmlu ZGV4IDU3NGVhOGIwMWQ5YmJmMTMyOWNjZTg5ZWRkYzU1MmVmNTliODEwMzIuLmIxMGQ4NDA5OWIy NTI4ZTZmNzNjMjhiMTUwNGE4YTkzMjRkMGIyMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJSZXF1ZXN0RGF0YS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJlcXVlc3REYXRhLmNwcApAQCAt OTgsNyArOTgsOCBAQCB2b2lkIElEQlJlcXVlc3REYXRhOjppc29sYXRlZENvcHkoY29uc3QgSURC UmVxdWVzdERhdGEmIHNvdXJjZSwgSURCUmVxdWVzdERhdGEmCiAgICAgZGVzdGluYXRpb24ubV9y ZXF1ZXN0ZWRWZXJzaW9uID0gc291cmNlLm1fcmVxdWVzdGVkVmVyc2lvbjsKICAgICBkZXN0aW5h dGlvbi5tX3JlcXVlc3RUeXBlID0gc291cmNlLm1fcmVxdWVzdFR5cGU7CiAKLSAgICBkZXN0aW5h dGlvbi5tX2RhdGFiYXNlSWRlbnRpZmllciA9IHNvdXJjZS5tX2RhdGFiYXNlSWRlbnRpZmllci5p c29sYXRlZENvcHkoKTsKKyAgICBpZiAoc291cmNlLm1fZGF0YWJhc2VJZGVudGlmaWVyKQorICAg ICAgICBkZXN0aW5hdGlvbi5tX2RhdGFiYXNlSWRlbnRpZmllciA9IHNvdXJjZS5tX2RhdGFiYXNl SWRlbnRpZmllci0+aXNvbGF0ZWRDb3B5KCk7CiAKICAgICBpZiAoc291cmNlLm1fcmVxdWVzdElk ZW50aWZpZXIpCiAgICAgICAgIGRlc3RpbmF0aW9uLm1fcmVxdWVzdElkZW50aWZpZXIgPSBzdGQ6 Om1ha2VfdW5pcXVlPElEQlJlc291cmNlSWRlbnRpZmllcj4oKnNvdXJjZS5tX3JlcXVlc3RJZGVu dGlmaWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3No YXJlZC9JREJSZXF1ZXN0RGF0YS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv c2hhcmVkL0lEQlJlcXVlc3REYXRhLmgKaW5kZXggYjU4MjE2NzViYjlhZWExMmU4ZDY5OTFhMDIx ZDllZWQxOGZkNjY1MS4uNDVjZmZhZWE2MDNhNTNiNTk5MDRjOGIxNGI3YTFkZWY3ZDI1ZjMxMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVkL0lEQlJl cXVlc3REYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2hhcmVk L0lEQlJlcXVlc3REYXRhLmgKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgIEluZGV4ZWRE Qjo6SW5kZXhSZWNvcmRUeXBlIGluZGV4UmVjb3JkVHlwZSgpIGNvbnN0OwogICAgIElEQlJlc291 cmNlSWRlbnRpZmllciBjdXJzb3JJZGVudGlmaWVyKCkgY29uc3Q7CiAKLSAgICBjb25zdCBJREJE YXRhYmFzZUlkZW50aWZpZXImIGRhdGFiYXNlSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YWJhc2VJZGVudGlmaWVyOyB9CisgICAgY29uc3QgSURCRGF0YWJhc2VJZGVudGlmaWVyJiBk YXRhYmFzZUlkZW50aWZpZXIoKSBjb25zdDsKICAgICB1aW50NjRfdCByZXF1ZXN0ZWRWZXJzaW9u KCkgY29uc3Q7CiAKICAgICBib29sIGlzT3BlblJlcXVlc3QoKSBjb25zdCB7IHJldHVybiBtX3Jl cXVlc3RUeXBlID09IEluZGV4ZWREQjo6UmVxdWVzdFR5cGU6Ok9wZW47IH0KQEAgLTg5LDEyICs4 OSwyMCBAQCBwcml2YXRlOgogICAgIHVpbnQ2NF90IG1faW5kZXhJZGVudGlmaWVyIHsgMCB9Owog ICAgIEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlIG1faW5kZXhSZWNvcmRUeXBlOwogCi0gICAg SURCRGF0YWJhc2VJZGVudGlmaWVyIG1fZGF0YWJhc2VJZGVudGlmaWVyOworICAgIG11dGFibGUg T3B0aW9uYWw8SURCRGF0YWJhc2VJZGVudGlmaWVyPiBtX2RhdGFiYXNlSWRlbnRpZmllcjsKICAg ICB1aW50NjRfdCBtX3JlcXVlc3RlZFZlcnNpb24geyAwIH07CiAKICAgICBJbmRleGVkREI6OlJl cXVlc3RUeXBlIG1fcmVxdWVzdFR5cGUgeyBJbmRleGVkREI6OlJlcXVlc3RUeXBlOjpPdGhlciB9 OwogfTsKIAoraW5saW5lIGNvbnN0IElEQkRhdGFiYXNlSWRlbnRpZmllciYgSURCUmVxdWVzdERh dGE6OmRhdGFiYXNlSWRlbnRpZmllcigpIGNvbnN0Cit7CisgICAgQVNTRVJUKG1fZGF0YWJhc2VJ ZGVudGlmaWVyKTsKKyAgICBpZiAoIW1fZGF0YWJhc2VJZGVudGlmaWVyKQorICAgICAgICBtX2Rh dGFiYXNlSWRlbnRpZmllciA9IElEQkRhdGFiYXNlSWRlbnRpZmllciB7IH07CisgICAgcmV0dXJu ICptX2RhdGFiYXNlSWRlbnRpZmllcjsKK30KKwogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZv aWQgSURCUmVxdWVzdERhdGE6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewpAQCAt MTI4LDcgKzEzNiw3IEBAIGJvb2wgSURCUmVxdWVzdERhdGE6OmRlY29kZShEZWNvZGVyJiBkZWNv ZGVyLCBJREJSZXF1ZXN0RGF0YSYgcmVxdWVzdCkKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl cXVlc3QubV9pbmRleElkZW50aWZpZXIpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBP cHRpb25hbDxJREJEYXRhYmFzZUlkZW50aWZpZXI+IGRhdGFiYXNlSWRlbnRpZmllcjsKKyAgICBP cHRpb25hbDxPcHRpb25hbDxJREJEYXRhYmFzZUlkZW50aWZpZXI+PiBkYXRhYmFzZUlkZW50aWZp ZXI7CiAgICAgZGVjb2RlciA+PiBkYXRhYmFzZUlkZW50aWZpZXI7CiAgICAgaWYgKCFkYXRhYmFz ZUlkZW50aWZpZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvU2Vzc2lvbklELmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL1Nlc3Np b25JRC5oCmluZGV4IDJiMWNkYjI5ODc0OTQwZjcwMDVmMmI5OTI0NDUxNDAyYTJjYWNlMWMuLmY3 Y2NhN2RmMTM0N2UwY2EzOTA1NWVjY2IxZWFjODBhOTIxNDZjN2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1BBTC9wYWwvU2Vzc2lvbklELmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3Bh bC9TZXNzaW9uSUQuaApAQCAtODAsNyArODAsNyBAQCBwcml2YXRlOgogdGVtcGxhdGU8Y2xhc3Mg RW5jb2Rlcj4KIHZvaWQgU2Vzc2lvbklEOjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QK IHsKLSAgICAvLyBGSVhNRTogRWxpbWluYXRlIHBsYWNlcyB0aGF0IGVuY29kZSBpbnZhbGlkIFNl c3Npb25JRHMsIHRoZW4gQVNTRVJUIGhlcmUgdGhhdCB0aGUgc2Vzc2lvbklEIGlzIHZhbGlkLgor ICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogICAgIGVuY29kZXIgPDwgbV9zZXNzaW9uSUQ7CiB9CiAK QEAgLTEwNCw3ICsxMDQsOCBAQCBPcHRpb25hbDxTZXNzaW9uSUQ+IFNlc3Npb25JRDo6ZGVjb2Rl KERlY29kZXImIGRlY29kZXIpCiAgICAgaWYgKCFzZXNzaW9uSUQpCiAgICAgICAgIHJldHVybiBX VEY6Om51bGxvcHQ7CiAKLSAgICAvLyBGSVhNRTogRWxpbWluYXRlIHBsYWNlcyB0aGF0IGVuY29k ZSBpbnZhbGlkIFNlc3Npb25JRHMsIHRoZW4gZmFpbCB0byBkZWNvZGUgYW4gaW52YWxpZCBzZXNz aW9uSUQuCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBmYWlsIHRvIGRlY29kZSBhbiBpbnZhbGlk IHNlc3Npb25JRC4KKyAgICBBU1NFUlQoU2Vzc2lvbklEIHsgKnNlc3Npb25JRCB9LmlzVmFsaWQo KSk7CiAgICAgcmV0dXJuIFNlc3Npb25JRCB7ICpzZXNzaW9uSUQgfTsKIH0KIAo=