226295 2021-05-26 14:37:43 -0700 Abandon pending tasks on background thread when WebIDBServer is closed 2021-05-27 14:55:52 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sihui_liu sihui_liu alecflett beidson benjamin bugs-noreply cdumez cmarcelo ews-watchlist ggaren jsbell oldest_to_newest 1764062 0 sihui_liu 2021-05-26 14:37:43 -0700 Potential fix for rdar://77532291. 1764196 1 429839 sihui_liu 2021-05-26 20:47:26 -0700 Created attachment 429839 Patch 1764199 2 429839 cdumez 2021-05-26 20:55:37 -0700 Comment on attachment 429839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429839&action=review > Source/WTF/ChangeLog:8 > + Make the wait ends with either a new message or queue being killed. Ends -> end > Source/WebKit/ChangeLog:9 > + tasks. We can ditch them by killing the CrossThreadQueue. For ongoing task, it can be blockd on quota check, so Typo: blockd > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:425 > + callOnMainRunLoop([protectedThis = WTFMove(protectedThis)]() mutable { }); Do we really need the mutable? > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:436 > m_closeCallback(); Is it ok to call the close callback before we’ve actually asynchronously done it? > Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.h:101 > + std::unique_ptr<WebCore::IDBServer::IDBServer> m_server WTF_GUARDED_BY_LOCK(m_serverLock); Nice :) 1764224 3 429839 sihui_liu 2021-05-26 23:00:45 -0700 Comment on attachment 429839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429839&action=review >> Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:425 >> + callOnMainRunLoop([protectedThis = WTFMove(protectedThis)]() mutable { }); > > Do we really need the mutable? Nope >> Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp:436 >> m_closeCallback(); > > Is it ok to call the close callback before we’ve actually asynchronously done it? Yes, this currently is just removing itself from the map of Network process and we keep the reference with CompletionCallback above. 1764226 4 429848 sihui_liu 2021-05-26 23:02:10 -0700 Created attachment 429848 Patch 1764344 5 429883 sihui_liu 2021-05-27 09:06:03 -0700 Created attachment 429883 Patch 1764347 6 429883 cdumez 2021-05-27 09:11:08 -0700 Comment on attachment 429883 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429883&action=review > Source/WebCore/ChangeLog:9 > + abort transactions on the main thread. Why is it safe then? There is no guarantee that SQLite is built with thread-safety support enabled or that SQLite mutexes are fully enabled at runtime. 1764371 7 sihui_liu 2021-05-27 09:52:06 -0700 (In reply to Chris Dumez from comment #6) > Comment on attachment 429883 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=429883&action=review > > > Source/WebCore/ChangeLog:9 > > + abort transactions on the main thread. > > Why is it safe then? There is no guarantee that SQLite is built with > thread-safety support enabled or that SQLite mutexes are fully enabled at > runtime. Tasks on the background thread need to acquire the lock for m_server to perform database operations. They acquire the lock at start, release the lock before performing quota check (which may be blocked on waiting user permission), and acquire the lock again after it. 1764378 8 429892 sihui_liu 2021-05-27 10:07:03 -0700 Created attachment 429892 Patch 1764430 9 429892 cdumez 2021-05-27 11:36:52 -0700 Comment on attachment 429892 Patch r=me 1764513 10 ews-feeder 2021-05-27 14:55:48 -0700 Committed r278179 (238222@main): <https://commits.webkit.org/238222@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429892. 429839 2021-05-26 20:47:26 -0700 2021-05-26 23:15:14 -0700 Patch bug-226295-20210526204725.patch text/plain 6083 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNjNTA3MTUwY2NkOTBiZTBhNGVmMmE5 OGZhMzYwN2M5MDIwYzFlNDguLmQwMThjZDQ5Y2Q1ZGQzYmFiOTAxMzEyODE1MzllN2M3ZWJiYWQ5 YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9uIGJhY2tncm91 bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgd2FpdCBlbmRzIHdpdGggZWl0 aGVyIGEgbmV3IG1lc3NhZ2Ugb3IgcXVldWUgYmVpbmcga2lsbGVkLgorCisgICAgICAgICogd3Rm L0Nyb3NzVGhyZWFkUXVldWUuaDoKKyAgICAgICAgKFdURjo6Q3Jvc3NUaHJlYWRRdWV1ZTxEYXRh VHlwZT46OndhaXRGb3JNZXNzYWdlKToKKwogMjAyMS0wNS0yNiAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFN0b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBXVEY6 OkF1dG9tYXRpY1RocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGM2YzRkZTQ1NGNjYTUzN2UzMDEyMDFiOWM0 ZGNjM2M5Mzg3ZDI3ZWUuLmEzMjFhZThjODI0NTI2ODgwNWNlMDc4YmJiZjM1OWRmMzJmNzljNTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNS0yNiAgU2lodWkgTGl1ICA8c2lo dWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBBYmFuZG9uIHBlbmRpbmcgdGFza3Mgb24gYmFj a2dyb3VuZCB0aHJlYWQgd2hlbiBXZWJJREJTZXJ2ZXIgaXMgY2xvc2VkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYyOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2Vy dmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldE9yRXN0YWJsaXNoRGF0YWJhc2VJbmZvKTog RGlzYWJsZSB0aHJlYWRpbmcgY2hlY2sgYXMgd2UgbWF5CisgICAgICAgIGFib3J0IHRyYW5zYWN0 aW9ucyBvbiB0aGUgbWFpbiB0aHJlYWQuCisKIDIwMjEtMDUtMjYgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIFNlY3VyaXR5UG9saWN5VmlvbGF0aW9uRXZl bnQncyBibG9ja2VkVVJMICYgZG9jdW1lbnRVUkwgYXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0OGJh OTM0ZWVkYjFmNDk3MWUyZmU3MDk0NmE3NGYyYWU1MmZiNDBmLi42NWE0ZGYzNDNiNjJjNDA4N2Y0 ZjQ1YzhjNWFmZjI2MmFkODk1YWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA1 LTI2ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFiYW5kb24g cGVuZGluZyB0YXNrcyBvbiBiYWNrZ3JvdW5kIHRocmVhZCB3aGVuIFdlYklEQlNlcnZlciBpcyBj bG9zZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NjI5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo ZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZCwgaXQgbWVhbnMgdGhlcmUgaXMgbm8gb3BlbiBjb25u ZWN0aW9uIHRvIGNsaWVudCwgc28gd2UgZG9uJ3QgbmVlZCB0byBoYW5kbGUgcGVuZGluZworICAg ICAgICB0YXNrcy4gV2UgY2FuIGRpdGNoIHRoZW0gYnkga2lsbGluZyB0aGUgQ3Jvc3NUaHJlYWRR dWV1ZS4gRm9yIG9uZ29pbmcgdGFzaywgaXQgY2FuIGJlIGJsb2NrZCBvbiBxdW90YSBjaGVjaywg c28KKyAgICAgICAgd2UganVzdCBzdG9wIGRhdGFiYXNlIGFjdGl2aXRpZXMgb24gdGhlIG1haW4g dGhyZWFkIHRvIG1ha2Ugc3VyZSBkYXRhYmFzZSBsb2NrIGlzIHJlbGVhc2VkLgorCisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYklEQlNlcnZlcjo6Y2xvc2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0lu ZGV4ZWREQi9XZWJJREJTZXJ2ZXIuaDoKKwogMjAyMS0wNS0yNSAgTGF1cm8gTW91cmEgIDxsbW91 cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBhbm90aGVyIEdDQzggYnVpbGQg Zml4IGFmdGVyIHIyNzgwMzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFk UXVldWUuaCBiL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkUXVldWUuaAppbmRleCA4NzI5YTZh ZDllYWU2OWYzYjQ0ZmI1NTA0MGYzODlmYmFiNzA5Y2Y5Li5kODJlYmI4ODUyOTQyMGMwNWRkOGY0 NjQ5YjIwMzExZGZmNzc4MjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVh ZFF1ZXVlLmgKKysrIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRRdWV1ZS5oCkBAIC03Myw3 ICs3Myw3IEBAIERhdGFUeXBlIENyb3NzVGhyZWFkUXVldWU8RGF0YVR5cGU+Ojp3YWl0Rm9yTWVz c2FnZSgpCiAgICAgTG9ja2VyIGxvY2tlciB7IG1fbG9jayB9OwogCiAgICAgYXV0byBmb3VuZCA9 IG1fcXVldWUuZW5kKCk7Ci0gICAgd2hpbGUgKGZvdW5kID09IG1fcXVldWUuZW5kKCkpIHsKKyAg ICB3aGlsZSAoIW1fa2lsbGVkIHx8IGZvdW5kID09IG1fcXVldWUuZW5kKCkpIHsKICAgICAgICAg Zm91bmQgPSBtX3F1ZXVlLmJlZ2luKCk7CiAgICAgICAgIGlmIChmb3VuZCAhPSBtX3F1ZXVlLmVu ZCgpKQogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3Bw CmluZGV4IDQ2NTFkYTcxMmE2MjQzMDUyNTdlZWFkOTViNGQwMmYyYTdlNzkzZmEuLmExMTQzMjVj YzYyYzM5YjkyNGY0NWM1MTlkYmJhMmQ0MDRmYTRjMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNr aW5nU3RvcmUuY3BwCkBAIC0xMDA0LDYgKzEwMDQsNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNr aW5nU3RvcmU6OmdldE9yRXN0YWJsaXNoRGF0YWJhc2VJbmZvKElEQkRhdGFiYXNlSW5mbyYgaW5m bwogICAgIGlmICghbV9zcWxpdGVEQikKICAgICAgICAgcmV0dXJuIElEQkVycm9yIHsgVW5rbm93 bkVycm9yLCAiVW5hYmxlIHRvIG9wZW4gZGF0YWJhc2UgZmlsZSBvbiBkaXNrIl9zIH07CiAKKyAg ICBtX3NxbGl0ZURCLT5kaXNhYmxlVGhyZWFkaW5nQ2hlY2tzKCk7CiAgICAgbV9zcWxpdGVEQi0+ ZW5hYmxlQXV0b21hdGljV0FMVHJ1bmNhdGlvbigpOwogCiAgICAgbV9zcWxpdGVEQi0+c2V0Q29s bGF0aW9uRnVuY3Rpb24oIklEQktFWSIsIFtdKGludCBhTGVuZ3RoLCBjb25zdCB2b2lkKiBhLCBp bnQgYkxlbmd0aCwgY29uc3Qgdm9pZCogYikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKaW5kZXggNTQ3ZGFhOGQ0 ZTAwMTQwNmZjMjAxYWJhZDZjZjQ3NzBjOTFhNTU3OS4uZTc4M2E2ODAwNWIxMDY5MTA4NDg4MDY3 MDc5MDIwN2I3ZjgyOWRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwCkBAIC00MTUsMTkgKzQxNSwyNCBAQCB2 b2lkIFdlYklEQlNlcnZlcjo6Y2xvc2UoKQogICAgIGZvciAoYXV0byogY29ubmVjdGlvbiA6IG1f Y29ubmVjdGlvbnMpCiAgICAgICAgIGNvbm5lY3Rpb24tPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6V2ViSURCU2VydmVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogCi0g ICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKFtwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKCkgbXV0YWJsZSB7CisgICAgQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyldKCkgbXV0YWJsZSB7CiAgICAgICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWlu KCkpOwotICAgICAgICBjYWxsT25NYWluUnVuTG9vcChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUo cHJvdGVjdGVkVGhpcyldKCkgbXV0YWJsZSB7IH0pOwotICAgIH0pOwogCi0gICAgcG9zdFRhc2so W3RoaXNdKCkgbXV0YWJsZSB7CiAgICAgICAgIG1fY29ubmVjdGlvbk1hcC5jbGVhcigpOwotCiAg ICAgICAgIExvY2tlciBsb2NrZXIgeyBtX3NlcnZlckxvY2sgfTsKICAgICAgICAgbV9zZXJ2ZXIg PSBudWxscHRyOwotICAgICAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7CisKKyAg ICAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3Rl ZFRoaXMpXSgpIG11dGFibGUgeyB9KTsKICAgICB9KTsKIAorICAgIHsKKyAgICAgICAgTG9ja2Vy IGxvY2tlciB7IG1fc2VydmVyTG9jayB9OworICAgICAgICBpZiAobV9zZXJ2ZXIpCisgICAgICAg ICAgICBtX3NlcnZlci0+c3RvcERhdGFiYXNlQWN0aXZpdGllc09uTWFpblRocmVhZCgpOworICAg IH0KKworICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OmtpbGwoKTsKKwogICAgIG1fY2xvc2VD YWxsYmFjaygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5oCmluZGV4IDNmODBhYTIyNGY5N2U1YWNiYWEyOWY4YTg1 NjM2MzVkYzZhMjczMDguLjhiNGFkYmE1ZjdjMTgzZjlkN2RkOGJkYTg3NzEyNDRjMGRjZTZkZDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklE QlNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dl YklEQlNlcnZlci5oCkBAIC05OCw3ICs5OCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB0cnlDbG9z ZSgpOwogCiAgICAgTG9jayBtX3NlcnZlckxvY2s7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNv cmU6OklEQlNlcnZlcjo6SURCU2VydmVyPiBtX3NlcnZlcjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI+IG1fc2VydmVyIFdURl9HVUFSREVEX0JZX0xP Q0sobV9zZXJ2ZXJMb2NrKTsKICAgICBib29sIG1faXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogCiAg ICAgSGFzaE1hcDxJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlELCBzdGQ6OnVuaXF1ZV9wdHI8V2Vi SURCQ29ubmVjdGlvblRvQ2xpZW50Pj4gbV9jb25uZWN0aW9uTWFwOwo= 429848 2021-05-26 23:02:10 -0700 2021-05-27 09:06:00 -0700 Patch bug-226295-20210526230209.patch text/plain 6129 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDc0MmRmMjdmYzIzOTVjMGI0OTUwZmI4 YTZmMzQ1ZDQxODg5MzQ0NDUuLjRjYWYxNzIyMjFlZDhiOWEyNWI2ODI2MDBlYTM1YjkyZGMwZmNh N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9uIGJhY2tncm91 bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgd2FpdCBlbmQgd2l0aCBlaXRo ZXIgYSBuZXcgbWVzc2FnZSBvciBxdWV1ZSBiZWluZyBraWxsZWQuCisKKyAgICAgICAgKiB3dGYv Q3Jvc3NUaHJlYWRRdWV1ZS5oOgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFF1ZXVlPERhdGFU eXBlPjo6d2FpdEZvck1lc3NhZ2UpOgorCiAyMDIxLTA1LTI2ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgTGV2ZXJhZ2UgdGhlIG5ldyBWZWN0b3IoY29uc3QgVCos IHNpemVfdCkgY29uc3RydWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNjdjNDcxNTk2Njk3ZDA4NDEyOGE0 NzEyZDEwMWQ0NTFhZTA0YmI1Li5mMGE0YTczMTMwZWQzY2YzNGQxMzkwNzI1MzhlZmQwMGMzZDhm ZGNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjYgIFNpaHVpIExpdSAg PHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9u IGJhY2tncm91bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcDogRGlzYWJsZSB0aHJlYWRpbmcgY2hl Y2sgYXMgd2UgbWF5CisgICAgICAgIGFib3J0IHRyYW5zYWN0aW9ucyBvbiB0aGUgbWFpbiB0aHJl YWQuCisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6 Z2V0T3JFc3RhYmxpc2hEYXRhYmFzZUluZm8pOgorCiAyMDIxLTA1LTI2ICBGdWppaSBIaXJvbm9y aSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtDYWlyb10gUmVtb3ZlIHVu dXNlZCBtZW1iZXJzIG93bmVkUGxhdGZvcm1Db250ZXh0IGFuZCBwbGF0Zm9ybUNvbnRleHQgb2Yg R3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxMjVhNDRkMzg4ZjVi YjI2MzllYjEwYzAxMDI0MzFiNWM1MDVlYTAuLmRkZDU2MDBjY2M5MjYxN2RmYmMyYmZhOWFmODA5 NmI5M2Y2N2RjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDUtMjYgIFNpaHVp IExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRh c2tzIG9uIGJhY2tncm91bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBXZWJJREJT ZXJ2ZXIgaXMgY2xvc2VkLCBpdCBtZWFucyB0aGVyZSBpcyBubyBvcGVuIGNvbm5lY3Rpb24gdG8g Y2xpZW50LCBzbyB3ZSBkb24ndCBuZWVkIHRvIGhhbmRsZSBwZW5kaW5nCisgICAgICAgIHRhc2tz LiBXZSBjYW4gZGl0Y2ggdGhlbSBieSBraWxsaW5nIHRoZSBDcm9zc1RocmVhZFF1ZXVlLiBGb3Ig b25nb2luZyB0YXNrLCBpdCBjYW4gYmUgYmxvY2tlZCBvbiBxdW90YSBjaGVjaywgc28KKyAgICAg ICAgbGV0J3MganVzdCBzdG9wIGRhdGFiYXNlIGFjdGl2aXRpZXMgb24gdGhlIG1haW4gdGhyZWFk IHRvIG1ha2Ugc3VyZSBkYXRhYmFzZSBsb2NrIGlzIHJlbGVhc2VkLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYklEQlNlcnZlcjo6Y2xvc2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0luZGV4ZWRE Qi9XZWJJREJTZXJ2ZXIuaDoKKwogMjAyMS0wNS0yNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIExldmVyYWdlIHRoZSBuZXcgVmVjdG9yKGNvbnN0IFQqLCBzaXpl X3QpIGNvbnN0cnVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFF1 ZXVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFF1ZXVlLmgKaW5kZXggODcyOWE2YWQ5 ZWFlNjlmM2I0NGZiNTUwNDBmMzg5ZmJhYjcwOWNmOS4uYTI0OTgwYTZiZTAwNDkyY2E1MzE1OTFm Zjg0M2E3OTA5ZWJmOWMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRR dWV1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkUXVldWUuaApAQCAtNzMsNyAr NzMsNyBAQCBEYXRhVHlwZSBDcm9zc1RocmVhZFF1ZXVlPERhdGFUeXBlPjo6d2FpdEZvck1lc3Nh Z2UoKQogICAgIExvY2tlciBsb2NrZXIgeyBtX2xvY2sgfTsKIAogICAgIGF1dG8gZm91bmQgPSBt X3F1ZXVlLmVuZCgpOwotICAgIHdoaWxlIChmb3VuZCA9PSBtX3F1ZXVlLmVuZCgpKSB7CisgICAg d2hpbGUgKCFtX2tpbGxlZCAmJiBmb3VuZCA9PSBtX3F1ZXVlLmVuZCgpKSB7CiAgICAgICAgIGZv dW5kID0gbV9xdWV1ZS5iZWdpbigpOwogICAgICAgICBpZiAoZm91bmQgIT0gbV9xdWV1ZS5lbmQo KSkKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcApp bmRleCA0NjUxZGE3MTJhNjI0MzA1MjU3ZWVhZDk1YjRkMDJmMmE3ZTc5M2ZhLi5hMTE0MzI1Y2M2 MmMzOWI5MjRmNDVjNTE5ZGJiYTJkNDA0ZmE0YzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2lu Z1N0b3JlLmNwcApAQCAtMTAwNCw2ICsxMDA0LDcgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2lu Z1N0b3JlOjpnZXRPckVzdGFibGlzaERhdGFiYXNlSW5mbyhJREJEYXRhYmFzZUluZm8mIGluZm8K ICAgICBpZiAoIW1fc3FsaXRlREIpCiAgICAgICAgIHJldHVybiBJREJFcnJvciB7IFVua25vd25F cnJvciwgIlVuYWJsZSB0byBvcGVuIGRhdGFiYXNlIGZpbGUgb24gZGlzayJfcyB9OwogCisgICAg bV9zcWxpdGVEQi0+ZGlzYWJsZVRocmVhZGluZ0NoZWNrcygpOwogICAgIG1fc3FsaXRlREItPmVu YWJsZUF1dG9tYXRpY1dBTFRydW5jYXRpb24oKTsKIAogICAgIG1fc3FsaXRlREItPnNldENvbGxh dGlvbkZ1bmN0aW9uKCJJREJLRVkiLCBbXShpbnQgYUxlbmd0aCwgY29uc3Qgdm9pZCogYSwgaW50 IGJMZW5ndGgsIGNvbnN0IHZvaWQqIGIpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwCmluZGV4IDU0N2RhYThkNGUw MDE0MDZmYzIwMWFiYWQ2Y2Y0NzcwYzkxYTU1NzkuLjI5OTdhYmJiZjNhOTY2ZWJhMzdlOGQyYTI2 MTgxNzRjYjMwMGE3OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcApAQCAtNDE1LDE5ICs0MTUsMjQgQEAgdm9p ZCBXZWJJREJTZXJ2ZXI6OmNsb3NlKCkKICAgICBmb3IgKGF1dG8qIGNvbm5lY3Rpb24gOiBtX2Nv bm5lY3Rpb25zKQogICAgICAgICBjb25uZWN0aW9uLT5yZW1vdmVUaHJlYWRNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OldlYklEQlNlcnZlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKIAotICAg IENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFjayhbcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIG11dGFibGUgeworICAgIENyb3NzVGhyZWFkVGFza0hh bmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFjayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpXSgpIG11dGFibGUgewogICAgICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigp KTsKLSAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHBy b3RlY3RlZFRoaXMpXSgpIG11dGFibGUgeyB9KTsKLSAgICB9KTsKIAotICAgIHBvc3RUYXNrKFt0 aGlzXSgpIG11dGFibGUgewogICAgICAgICBtX2Nvbm5lY3Rpb25NYXAuY2xlYXIoKTsKLQogICAg ICAgICBMb2NrZXIgbG9ja2VyIHsgbV9zZXJ2ZXJMb2NrIH07CiAgICAgICAgIG1fc2VydmVyID0g bnVsbHB0cjsKLSAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6a2lsbCgpOworCisgICAg ICAgIGNhbGxPbk1haW5SdW5Mb29wKFtwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRU aGlzKVtdIHsgfSk7CiAgICAgfSk7CiAKKyAgICB7CisgICAgICAgIExvY2tlciBsb2NrZXIgeyBt X3NlcnZlckxvY2sgfTsKKyAgICAgICAgaWYgKG1fc2VydmVyKQorICAgICAgICAgICAgbV9zZXJ2 ZXItPnN0b3BEYXRhYmFzZUFjdGl2aXRpZXNPbk1haW5UaHJlYWQoKTsKKyAgICB9CisKKyAgICBD cm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7CisKICAgICBtX2Nsb3NlQ2FsbGJhY2soKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIv V2ViSURCU2VydmVyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9X ZWJJREJTZXJ2ZXIuaAppbmRleCAzZjgwYWEyMjRmOTdlNWFjYmFhMjlmOGE4NTYzNjM1ZGM2YTI3 MzA4Li44YjRhZGJhNWY3YzE4M2Y5ZDdkZDhiZGE4NzcxMjQ0YzBkY2U2ZGQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIu aApAQCAtOTgsNyArOTgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgdHJ5Q2xvc2UoKTsKIAogICAg IExvY2sgbV9zZXJ2ZXJMb2NrOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpJREJTZXJ2 ZXI6OklEQlNlcnZlcj4gbV9zZXJ2ZXI7CisgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OklE QlNlcnZlcjo6SURCU2VydmVyPiBtX3NlcnZlciBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fc2VydmVy TG9jayk7CiAgICAgYm9vbCBtX2lzU3VzcGVuZGVkIHsgZmFsc2UgfTsKIAogICAgIEhhc2hNYXA8 SVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgc3RkOjp1bmlxdWVfcHRyPFdlYklEQkNvbm5lY3Rp b25Ub0NsaWVudD4+IG1fY29ubmVjdGlvbk1hcDsK 429883 2021-05-27 09:06:03 -0700 2021-05-27 11:10:26 -0700 Patch bug-226295-20210527090602.patch text/plain 6172 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDk3OTdkNWVhODk2M2VlOTg4NGE0MGY2 OGI0YzJkNmJlYTVlNTMwYTMuLjBkZTJjNmZiZDBlOGNlMjQ1MDllYmVkZTBmYzUyNjk1MDIxZjky OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjcgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9uIGJhY2tncm91 bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgd2FpdCBlbmQgd2l0aCBlaXRo ZXIgYSBuZXcgbWVzc2FnZSBvciBxdWV1ZSBiZWluZyBraWxsZWQuCisKKyAgICAgICAgKiB3dGYv Q3Jvc3NUaHJlYWRRdWV1ZS5oOgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFF1ZXVlPERhdGFU eXBlPjo6d2FpdEZvck1lc3NhZ2UpOgorCiAyMDIxLTA1LTI2ICBDYW1lcm9uIE1jQ29ybWFjayAg PGhleWNhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCBzYml4IGdseXBocyBmcm9tIGJl aW5nIHJlbmRlcmVkIGluIHRoZSBHUFUgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQ1MTc4NTNmMWY2 NDRmNDIxZDIzZWIwZDE5YjNkNTIyM2U0OTJmMjYuLmVmODk1YzlkNjAyNjRlYjAyNjY4Y2VlMTQ3 YjU4MDA2ZjI3NTE4MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNS0yNyAg U2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBBYmFuZG9uIHBlbmRp bmcgdGFza3Mgb24gYmFja2dyb3VuZCB0aHJlYWQgd2hlbiBXZWJJREJTZXJ2ZXIgaXMgY2xvc2Vk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYyOTUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVs ZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOiBEaXNhYmxlIHRo cmVhZGluZyBjaGVjayBhcyB3ZSBtYXkKKyAgICAgICAgYWJvcnQgdHJhbnNhY3Rpb25zIG9uIHRo ZSBtYWluIHRocmVhZC4KKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFj a2luZ1N0b3JlOjpnZXRPckVzdGFibGlzaERhdGFiYXNlSW5mbyk6CisKIDIwMjEtMDUtMjcgIEFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNDQ0 MzQpIERpc3BhdGNoIGludHJpbnNpY0NvbnRlbnRzU2l6ZUNoYW5nZWQgb24gdGhlIG1haW4gZnJh bWUgb25seQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCA5YjQ5ODhiZWI2MmZlODIxNjZiMDA1NmQ5OTdhNWI0NmI5NDNl ZGFhLi4xYjgyNTZkMDkxMWY1N2UyNmJiN2I5MmFmMTg1OGEyMmU5MTBmYWVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDIxLTA1LTI3ICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUu Y29tPgorCisgICAgICAgIEFiYW5kb24gcGVuZGluZyB0YXNrcyBvbiBiYWNrZ3JvdW5kIHRocmVh ZCB3aGVuIFdlYklEQlNlcnZlciBpcyBjbG9zZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjI5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZCwgaXQgbWVh bnMgdGhlcmUgaXMgbm8gb3BlbiBjb25uZWN0aW9uIHRvIGNsaWVudCwgc28gd2UgZG9uJ3QgbmVl ZCB0byBoYW5kbGUgcGVuZGluZworICAgICAgICB0YXNrcy4gV2UgY2FuIGRpdGNoIHRoZW0gYnkg a2lsbGluZyB0aGUgQ3Jvc3NUaHJlYWRRdWV1ZS4gRm9yIG9uZ29pbmcgdGFzaywgaXQgY2FuIGJl IGJsb2NrZWQgb24gcXVvdGEgY2hlY2ssIHNvCisgICAgICAgIGxldCdzIGp1c3Qgc3RvcCBkYXRh YmFzZSBhY3Rpdml0aWVzIG9uIHRoZSBtYWluIHRocmVhZCB0byBtYWtlIHN1cmUgZGF0YWJhc2Ug bG9jayBpcyByZWxlYXNlZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9X ZWJJREJTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXI6OmNsb3NlKToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmg6CisKIDIw MjEtMDUtMjcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgW0dQVSBQcm9jZXNzXSBBZGQgdmFsaWRhdGlvbiB3aGVuIHJlYWRpbmcgRGlzcGxheUxpc3RT aGFyZWRNZW1vcnlIZWFkZXI6OndhaXRpbmdTdGF0dXMgaW4gRGlzcGxheUxpc3RSZWFkZXJIYW5k bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkUXVldWUuaCBiL1NvdXJj ZS9XVEYvd3RmL0Nyb3NzVGhyZWFkUXVldWUuaAppbmRleCA4NzI5YTZhZDllYWU2OWYzYjQ0ZmI1 NTA0MGYzODlmYmFiNzA5Y2Y5Li5hMjQ5ODBhNmJlMDA0OTJjYTUzMTU5MWZmODQzYTc5MDllYmY5 YzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFF1ZXVlLmgKKysrIGIv U291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRRdWV1ZS5oCkBAIC03Myw3ICs3Myw3IEBAIERhdGFU eXBlIENyb3NzVGhyZWFkUXVldWU8RGF0YVR5cGU+Ojp3YWl0Rm9yTWVzc2FnZSgpCiAgICAgTG9j a2VyIGxvY2tlciB7IG1fbG9jayB9OwogCiAgICAgYXV0byBmb3VuZCA9IG1fcXVldWUuZW5kKCk7 Ci0gICAgd2hpbGUgKGZvdW5kID09IG1fcXVldWUuZW5kKCkpIHsKKyAgICB3aGlsZSAoIW1fa2ls bGVkICYmIGZvdW5kID09IG1fcXVldWUuZW5kKCkpIHsKICAgICAgICAgZm91bmQgPSBtX3F1ZXVl LmJlZ2luKCk7CiAgICAgICAgIGlmIChmb3VuZCAhPSBtX3F1ZXVlLmVuZCgpKQogICAgICAgICAg ICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IDI4Yjk4Yzk3 NmZjNmU5Y2EzZDBjYWVhZDU2ZTI5NTMwOTI2MjA4NjYuLjA3MjJkYTZlMTU4NzAwYTE2NzMwOWY1 MzhlYjc3NzBmYTEyMWVkYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBA IC0xMDA0LDYgKzEwMDQsNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldE9y RXN0YWJsaXNoRGF0YWJhc2VJbmZvKElEQkRhdGFiYXNlSW5mbyYgaW5mbwogICAgIGlmICghbV9z cWxpdGVEQikKICAgICAgICAgcmV0dXJuIElEQkVycm9yIHsgVW5rbm93bkVycm9yLCAiVW5hYmxl IHRvIG9wZW4gZGF0YWJhc2UgZmlsZSBvbiBkaXNrIl9zIH07CiAKKyAgICBtX3NxbGl0ZURCLT5k aXNhYmxlVGhyZWFkaW5nQ2hlY2tzKCk7CiAgICAgbV9zcWxpdGVEQi0+ZW5hYmxlQXV0b21hdGlj V0FMVHJ1bmNhdGlvbigpOwogCiAgICAgbV9zcWxpdGVEQi0+c2V0Q29sbGF0aW9uRnVuY3Rpb24o IklEQktFWSIsIFtdKGludCBhTGVuZ3RoLCBjb25zdCB2b2lkKiBhLCBpbnQgYkxlbmd0aCwgY29u c3Qgdm9pZCogYikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9J bmRleGVkREIvV2ViSURCU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKaW5kZXggNTQ3ZGFhOGQ0ZTAwMTQwNmZjMjAxYWJh ZDZjZjQ3NzBjOTFhNTU3OS4uYWY4YjJiNGQxM2I2YWNjZTQ1NTEwMDdmY2ZjMDFhNzhmNmU4Njgz OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2Vi SURCU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWRE Qi9XZWJJREJTZXJ2ZXIuY3BwCkBAIC00MTUsMTkgKzQxNSwyNCBAQCB2b2lkIFdlYklEQlNlcnZl cjo6Y2xvc2UoKQogICAgIGZvciAoYXV0byogY29ubmVjdGlvbiA6IG1fY29ubmVjdGlvbnMpCiAg ICAgICAgIGNvbm5lY3Rpb24tPnJlbW92ZVRocmVhZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 V2ViSURCU2VydmVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogCi0gICAgQ3Jvc3NUaHJlYWRU YXNrSGFuZGxlcjo6c2V0Q29tcGxldGlvbkNhbGxiYWNrKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyldKCkgbXV0YWJsZSB7CisgICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6c2V0Q29t cGxldGlvbkNhbGxiYWNrKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldKCkg bXV0YWJsZSB7CiAgICAgICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwotICAgICAgICBj YWxsT25NYWluUnVuTG9vcChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyld KCkgbXV0YWJsZSB7IH0pOwotICAgIH0pOwogCi0gICAgcG9zdFRhc2soW3RoaXNdKCkgbXV0YWJs ZSB7CiAgICAgICAgIG1fY29ubmVjdGlvbk1hcC5jbGVhcigpOwotCiAgICAgICAgIExvY2tlciBs b2NrZXIgeyBtX3NlcnZlckxvY2sgfTsKICAgICAgICAgbV9zZXJ2ZXIgPSBudWxscHRyOwotICAg ICAgICBDcm9zc1RocmVhZFRhc2tIYW5kbGVyOjpraWxsKCk7CisKKyAgICAgICAgY2FsbE9uTWFp blJ1bkxvb3AoW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSB7IH0pOwog ICAgIH0pOwogCisgICAgeworICAgICAgICBMb2NrZXIgbG9ja2VyIHsgbV9zZXJ2ZXJMb2NrIH07 CisgICAgICAgIGlmIChtX3NlcnZlcikKKyAgICAgICAgICAgIG1fc2VydmVyLT5zdG9wRGF0YWJh c2VBY3Rpdml0aWVzT25NYWluVGhyZWFkKCk7CisgICAgfQorCisgICAgQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlcjo6a2lsbCgpOworCiAgICAgbV9jbG9zZUNhbGxiYWNrKCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5o IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmgK aW5kZXggM2Y4MGFhMjI0Zjk3ZTVhY2JhYTI5ZjhhODU2MzYzNWRjNmEyNzMwOC4uOGI0YWRiYTVm N2MxODNmOWQ3ZGQ4YmRhODc3MTI0NGMwZGNlNmRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmgKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmgKQEAgLTk4LDcgKzk4 LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHRyeUNsb3NlKCk7CiAKICAgICBMb2NrIG1fc2VydmVy TG9jazsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI+ IG1fc2VydmVyOworICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpJREJTZXJ2ZXI6OklEQlNl cnZlcj4gbV9zZXJ2ZXIgV1RGX0dVQVJERURfQllfTE9DSyhtX3NlcnZlckxvY2spOwogICAgIGJv b2wgbV9pc1N1c3BlbmRlZCB7IGZhbHNlIH07CiAKICAgICBIYXNoTWFwPElQQzo6Q29ubmVjdGlv bjo6VW5pcXVlSUQsIHN0ZDo6dW5pcXVlX3B0cjxXZWJJREJDb25uZWN0aW9uVG9DbGllbnQ+PiBt X2Nvbm5lY3Rpb25NYXA7Cg== 429892 2021-05-27 10:07:03 -0700 2021-05-27 14:55:50 -0700 Patch bug-226295-20210527100702.patch text/plain 7565 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDk3OTdkNWVhODk2M2VlOTg4NGE0MGY2 OGI0YzJkNmJlYTVlNTMwYTMuLmU1MGEyYjVmMjYyNGU2YjFjMzE0ZDhmZTIwMzUyOTljZTFhZmEw NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjcgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgQWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9uIGJhY2tncm91 bmQgdGhyZWFkIHdoZW4gV2ViSURCU2VydmVyIGlzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUgd2FpdCBlbmQgd2l0aCBlaXRo ZXIgYSBuZXcgbWVzc2FnZSBvciBxdWV1ZSBiZWluZyBraWxsZWQuCisKKyAgICAgICAgKiB3dGYv Q3Jvc3NUaHJlYWRRdWV1ZS5oOgorICAgICAgICAoV1RGOjpDcm9zc1RocmVhZFF1ZXVlPERhdGFU eXBlPjo6d2FpdEZvck1lc3NhZ2UpOgorICAgICAgICAqIHd0Zi9Dcm9zc1RocmVhZFRhc2suaDoK KyAgICAgICAgKFdURjo6Q3Jvc3NUaHJlYWRUYXNrOjpvcGVyYXRvciBib29sIGNvbnN0KToKKyAg ICAgICAgKiB3dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHA6CisgICAgICAgIChXVEY6OkNy b3NzVGhyZWFkVGFza0hhbmRsZXI6OnRhc2tSdW5Mb29wKToKKwogMjAyMS0wNS0yNiAgQ2FtZXJv biBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFByZXZlbnQgc2JpeCBn bHlwaHMgZnJvbSBiZWluZyByZW5kZXJlZCBpbiB0aGUgR1BVIHByb2Nlc3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCBkNTE3ODUzZjFmNjQ0ZjQyMWQyM2ViMGQxOWIzZDUyMjNlNDkyZjI2Li5lZjg5NWM5ZDYwMjY0 ZWIwMjY2OGNlZTE0N2I1ODAwNmYyNzUxODIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjEtMDUtMjcgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAg QWJhbmRvbiBwZW5kaW5nIHRhc2tzIG9uIGJhY2tncm91bmQgdGhyZWFkIHdoZW4gV2ViSURCU2Vy dmVyIGlzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI2Mjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNw cDogRGlzYWJsZSB0aHJlYWRpbmcgY2hlY2sgYXMgd2UgbWF5CisgICAgICAgIGFib3J0IHRyYW5z YWN0aW9ucyBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6 OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0T3JFc3RhYmxpc2hEYXRhYmFzZUluZm8pOgorCiAy MDIxLTA1LTI3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OIChyMjQ0NDM0KSBEaXNwYXRjaCBpbnRyaW5zaWNDb250ZW50c1NpemVDaGFuZ2VkIG9u IHRoZSBtYWluIGZyYW1lIG9ubHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOWI0OTg4YmViNjJmZTgyMTY2YjAwNTZk OTk3YTViNDZiOTQzZWRhYS4uMWI4MjU2ZDA5MTFmNTdlMjZiYjdiOTJhZjE4NThhMjJlOTEwZmFl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wNS0yNyAgU2lodWkgTGl1ICA8c2lo dWlfbGl1QGFwcGxlLmNvbT4KKworICAgICAgICBBYmFuZG9uIHBlbmRpbmcgdGFza3Mgb24gYmFj a2dyb3VuZCB0aHJlYWQgd2hlbiBXZWJJREJTZXJ2ZXIgaXMgY2xvc2VkCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYyOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIFdlYklEQlNlcnZlciBpcyBj bG9zZWQsIGl0IG1lYW5zIHRoZXJlIGlzIG5vIG9wZW4gY29ubmVjdGlvbiB0byBjbGllbnQsIHNv IHdlIGRvbid0IG5lZWQgdG8gaGFuZGxlIHBlbmRpbmcKKyAgICAgICAgdGFza3MuIFdlIGNhbiBk aXRjaCB0aGVtIGJ5IGtpbGxpbmcgdGhlIENyb3NzVGhyZWFkUXVldWUuIEZvciBvbmdvaW5nIHRh c2ssIGl0IGNhbiBiZSBibG9ja2VkIG9uIHF1b3RhIGNoZWNrLCBzbworICAgICAgICBsZXQncyBq dXN0IHN0b3AgZGF0YWJhc2UgYWN0aXZpdGllcyBvbiB0aGUgbWFpbiB0aHJlYWQgdG8gbWFrZSBz dXJlIGRhdGFiYXNlIGxvY2sgaXMgcmVsZWFzZWQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSURCU2Vy dmVyOjpjbG9zZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNl cnZlci5oOgorCiAyMDIxLTA1LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gQWRkIHZhbGlkYXRpb24gd2hlbiByZWFkaW5n IERpc3BsYXlMaXN0U2hhcmVkTWVtb3J5SGVhZGVyOjp3YWl0aW5nU3RhdHVzIGluIERpc3BsYXlM aXN0UmVhZGVySGFuZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFF1 ZXVlLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFF1ZXVlLmgKaW5kZXggODcyOWE2YWQ5 ZWFlNjlmM2I0NGZiNTUwNDBmMzg5ZmJhYjcwOWNmOS4uYTI0OTgwYTZiZTAwNDkyY2E1MzE1OTFm Zjg0M2E3OTA5ZWJmOWMzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRR dWV1ZS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkUXVldWUuaApAQCAtNzMsNyAr NzMsNyBAQCBEYXRhVHlwZSBDcm9zc1RocmVhZFF1ZXVlPERhdGFUeXBlPjo6d2FpdEZvck1lc3Nh Z2UoKQogICAgIExvY2tlciBsb2NrZXIgeyBtX2xvY2sgfTsKIAogICAgIGF1dG8gZm91bmQgPSBt X3F1ZXVlLmVuZCgpOwotICAgIHdoaWxlIChmb3VuZCA9PSBtX3F1ZXVlLmVuZCgpKSB7CisgICAg d2hpbGUgKCFtX2tpbGxlZCAmJiBmb3VuZCA9PSBtX3F1ZXVlLmVuZCgpKSB7CiAgICAgICAgIGZv dW5kID0gbV9xdWV1ZS5iZWdpbigpOwogICAgICAgICBpZiAoZm91bmQgIT0gbV9xdWV1ZS5lbmQo KSkKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvQ3Jvc3NU aHJlYWRUYXNrLmggYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2suaAppbmRleCBkMDJl MTZlMzE5YTM3MzZmYWExMmViMDk0OGNjNjlhNGQzY2Y0MTZjLi41YzgxYzhjNjZkOWU5NjE4MWFk YzA5N2E3OTY1ZmMxMzE3MDFhYjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1Ro cmVhZFRhc2suaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Dcm9zc1RocmVhZFRhc2suaApAQCAtNDks NiArNDksOCBAQCBwdWJsaWM6CiAgICAgICAgIG1fdGFza0Z1bmN0aW9uKCk7CiAgICAgfQogCisg ICAgZXhwbGljaXQgb3BlcmF0b3IgYm9vbCgpIGNvbnN0IHsgcmV0dXJuICEhbV90YXNrRnVuY3Rp b247IH0KKwogcHJvdGVjdGVkOgogICAgIEZ1bmN0aW9uPHZvaWQgKCk+IG1fdGFza0Z1bmN0aW9u OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0Nyb3NzVGhyZWFkVGFza0hhbmRsZXIu Y3BwIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlci5jcHAKaW5kZXggMmMw MjZjMGUzYmIzYTc4OTA0NmViYjI2NDU3ZGVlNWQ2MzQ1ZGQ1Ny4uYWFmMDdiNWEyYjQzYjEwMTY2 NzZkNTIxYWJhM2M3NzM5ZjI3Y2M5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ3Jvc3NU aHJlYWRUYXNrSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dURi93dGYvQ3Jvc3NUaHJlYWRUYXNr SGFuZGxlci5jcHAKQEAgLTc0LDEwICs3NCwxMCBAQCB2b2lkIENyb3NzVGhyZWFkVGFza0hhbmRs ZXI6OnRhc2tSdW5Mb29wKCkKICAgICAgICAgTG9ja2VyPExvY2s+IGxvY2tlcihtX3Rhc2tUaHJl YWRDcmVhdGlvbkxvY2spOwogICAgIH0KIAotICAgIHdoaWxlICghbV90YXNrUXVldWUuaXNLaWxs ZWQoKSkgeworICAgIHdoaWxlIChhdXRvIHRhc2sgPSBtX3Rhc2tRdWV1ZS53YWl0Rm9yTWVzc2Fn ZSgpKSB7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxBdXRvZHJhaW5lZFBvb2w+IGF1dG9kcmFp bmVkUG9vbCA9IChtX3VzZUF1dG9kcmFpbmVkUG9vbCA9PSBBdXRvZHJhaW5lZFBvb2xGb3JSdW5M b29wOjpVc2UpID8gbWFrZVVuaXF1ZTxBdXRvZHJhaW5lZFBvb2w+KCkgOiBudWxscHRyOwogCi0g ICAgICAgIG1fdGFza1F1ZXVlLndhaXRGb3JNZXNzYWdlKCkucGVyZm9ybVRhc2soKTsKKyAgICAg ICAgdGFzay5wZXJmb3JtVGFzaygpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2lu Z1N0b3JlLmNwcAppbmRleCAyOGI5OGM5NzZmYzZlOWNhM2QwY2FlYWQ1NmUyOTUzMDkyNjIwODY2 Li4wNzIyZGE2ZTE1ODcwMGExNjczMDlmNTM4ZWI3NzcwZmExMjFlZGI5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FM aXRlSURCQmFja2luZ1N0b3JlLmNwcApAQCAtMTAwNCw2ICsxMDA0LDcgQEAgSURCRXJyb3IgU1FM aXRlSURCQmFja2luZ1N0b3JlOjpnZXRPckVzdGFibGlzaERhdGFiYXNlSW5mbyhJREJEYXRhYmFz ZUluZm8mIGluZm8KICAgICBpZiAoIW1fc3FsaXRlREIpCiAgICAgICAgIHJldHVybiBJREJFcnJv ciB7IFVua25vd25FcnJvciwgIlVuYWJsZSB0byBvcGVuIGRhdGFiYXNlIGZpbGUgb24gZGlzayJf cyB9OwogCisgICAgbV9zcWxpdGVEQi0+ZGlzYWJsZVRocmVhZGluZ0NoZWNrcygpOwogICAgIG1f c3FsaXRlREItPmVuYWJsZUF1dG9tYXRpY1dBTFRydW5jYXRpb24oKTsKIAogICAgIG1fc3FsaXRl REItPnNldENvbGxhdGlvbkZ1bmN0aW9uKCJJREJLRVkiLCBbXShpbnQgYUxlbmd0aCwgY29uc3Qg dm9pZCogYSwgaW50IGJMZW5ndGgsIGNvbnN0IHZvaWQqIGIpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuY3BwCmluZGV4 IDU0N2RhYThkNGUwMDE0MDZmYzIwMWFiYWQ2Y2Y0NzcwYzkxYTU1NzkuLmFmOGIyYjRkMTNiNmFj Y2U0NTUxMDA3ZmNmYzAxYTc4ZjZlODY4MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklEQlNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9JbmRleGVkREIvV2ViSURCU2VydmVyLmNwcApAQCAtNDE1LDE5ICs0 MTUsMjQgQEAgdm9pZCBXZWJJREJTZXJ2ZXI6OmNsb3NlKCkKICAgICBmb3IgKGF1dG8qIGNvbm5l Y3Rpb24gOiBtX2Nvbm5lY3Rpb25zKQogICAgICAgICBjb25uZWN0aW9uLT5yZW1vdmVUaHJlYWRN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYklEQlNlcnZlcjo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpKTsKIAotICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFj ayhbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIG11dGFibGUgeworICAgIENyb3Nz VGhyZWFkVGFza0hhbmRsZXI6OnNldENvbXBsZXRpb25DYWxsYmFjayhbdGhpcywgcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWYoKnRoaXMpXSgpIG11dGFibGUgewogICAgICAgICBBU1NFUlQoIVJ1bkxv b3A6OmlzTWFpbigpKTsKLSAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3Byb3RlY3RlZFRoaXMg PSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpXSgpIG11dGFibGUgeyB9KTsKLSAgICB9KTsKIAotICAg IHBvc3RUYXNrKFt0aGlzXSgpIG11dGFibGUgewogICAgICAgICBtX2Nvbm5lY3Rpb25NYXAuY2xl YXIoKTsKLQogICAgICAgICBMb2NrZXIgbG9ja2VyIHsgbV9zZXJ2ZXJMb2NrIH07CiAgICAgICAg IG1fc2VydmVyID0gbnVsbHB0cjsKLSAgICAgICAgQ3Jvc3NUaHJlYWRUYXNrSGFuZGxlcjo6a2ls bCgpOworCisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFtwcm90ZWN0ZWRUaGlzID0gV1RGTW92 ZShwcm90ZWN0ZWRUaGlzKV0geyB9KTsKICAgICB9KTsKIAorICAgIHsKKyAgICAgICAgTG9ja2Vy IGxvY2tlciB7IG1fc2VydmVyTG9jayB9OworICAgICAgICBpZiAobV9zZXJ2ZXIpCisgICAgICAg ICAgICBtX3NlcnZlci0+c3RvcERhdGFiYXNlQWN0aXZpdGllc09uTWFpblRocmVhZCgpOworICAg IH0KKworICAgIENyb3NzVGhyZWFkVGFza0hhbmRsZXI6OmtpbGwoKTsKKwogICAgIG1fY2xvc2VD YWxsYmFjaygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L0luZGV4ZWREQi9XZWJJREJTZXJ2ZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv SW5kZXhlZERCL1dlYklEQlNlcnZlci5oCmluZGV4IDNmODBhYTIyNGY5N2U1YWNiYWEyOWY4YTg1 NjM2MzVkYzZhMjczMDguLjhiNGFkYmE1ZjdjMTgzZjlkN2RkOGJkYTg3NzEyNDRjMGRjZTZkZDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dlYklE QlNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvSW5kZXhlZERCL1dl YklEQlNlcnZlci5oCkBAIC05OCw3ICs5OCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB0cnlDbG9z ZSgpOwogCiAgICAgTG9jayBtX3NlcnZlckxvY2s7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNv cmU6OklEQlNlcnZlcjo6SURCU2VydmVyPiBtX3NlcnZlcjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQ29yZTo6SURCU2VydmVyOjpJREJTZXJ2ZXI+IG1fc2VydmVyIFdURl9HVUFSREVEX0JZX0xP Q0sobV9zZXJ2ZXJMb2NrKTsKICAgICBib29sIG1faXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogCiAg ICAgSGFzaE1hcDxJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlELCBzdGQ6OnVuaXF1ZV9wdHI8V2Vi SURCQ29ubmVjdGlvblRvQ2xpZW50Pj4gbV9jb25uZWN0aW9uTWFwOwo=