194239 2019-02-04 13:46:21 -0800 Take additional process assertion while downloading 2019-02-05 20:54:34 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson cdumez commit-queue david_quesada ggaren oldest_to_newest 1501998 0 beidson 2019-02-04 13:46:21 -0800 Take additional process assertion while downloading <rdar://problem/47741356> 1502036 1 361103 beidson 2019-02-04 14:51:23 -0800 Created attachment 361103 Patch 1502039 2 361103 cdumez 2019-02-04 14:55:49 -0800 Comment on attachment 361103 Patch r=me 1502042 3 361105 beidson 2019-02-04 15:04:56 -0800 Created attachment 361105 Patch 1502053 4 361108 beidson 2019-02-04 15:17:13 -0800 Created attachment 361108 Patch 1502073 5 361113 beidson 2019-02-04 15:42:15 -0800 Created attachment 361113 Patch 1502160 6 361113 commit-queue 2019-02-04 17:27:28 -0800 Comment on attachment 361113 Patch Clearing flags on attachment: 361113 Committed r240954: <https://trac.webkit.org/changeset/240954> 1502161 7 commit-queue 2019-02-04 17:27:30 -0800 All reviewed patches have been landed. Closing bug. 1502367 8 david_quesada 2019-02-05 08:27:45 -0800 Don't we also need to take the assertion in DownloadManager::resumeDownload()? 1502374 9 cdumez 2019-02-05 08:50:35 -0800 (In reply to David Quesada from comment #8) > Don't we also need to take the assertion in > DownloadManager::resumeDownload()? Well, if you want to resume downloads, I guess that makes sense :P 1502380 10 beidson 2019-02-05 09:05:17 -0800 Yup, I could've sworn I searched for all the m_downloads.add calls but I clearly missed that one. I'm going to refactor that map to make it impossible to miss in the future. 1502427 11 beidson 2019-02-05 10:51:34 -0800 Following up in https://bugs.webkit.org/show_bug.cgi?id=194294 1502679 12 361113 ggaren 2019-02-05 20:54:34 -0800 Comment on attachment 361113 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361113&action=review > Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp:79 > + if (m_downloads.size() == 1) { > + ASSERT(!m_downloadAssertion); > + m_downloadAssertion = std::make_unique<ProcessAssertion>(getpid(), "WebKit downloads"_s, AssertionState::Download); > + } I think this would be clearer and more robust if you just tested !m_downloadAssertion. It's true that m_downloads.size() should be 1 if and only if m_downloadAssertion is null. But there's no need to assert that relationship or depend on it. > Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp:185 > + ASSERT(m_downloadAssertion); Here, we can ASSERT(m_downloadAssertion) regardless of whether m_downloads is empty. We believe that we should always have an assertion while downloading. 361103 2019-02-04 14:51:23 -0800 2019-02-04 15:04:54 -0800 Patch bug-194239-20190204145122.patch text/plain 10318 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyZDIxOGEwZDZjMDUxNWUy N2JkN2ExMTJkN2YxMWQ3ZjRlNzhhZmUuLmQwNWNiOTJmY2Y1NDkzNmY0NjhkODhjMTFlNGVlMjJk MmU5MmRhOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMDQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFRha2UgYWRkaXRpb25hbCBwcm9j ZXNzIGFzc2VydGlvbiB3aGlsZSBkb3dubG9hZGluZy4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ3NzQxMzU2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdo ZW4gdGhlIGZpcnN0IGRvd25sb2FkIHN0YXJ0cywgZ3JhYiB0aGlzIG5ldyBhc3NlcnRpb24uCisg ICAgICAgIFdoZW4gdGhlIGxhc3QgZG93bmxvYWQgZW5kcywgcmVsZWFzZSBpdC4KKworICAgICAg ICAqIENvbmZpZ3VyYXRpb25zL05ldHdvcmstaU9TLmVudGl0bGVtZW50czoKKworICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpEb3dubG9hZE1hbmFnZXI6OmRhdGFUYXNrQmVjYW1lRG93bmxvYWRUYXNrKToKKyAg ICAgICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjpkb3dubG9hZEZpbmlzaGVkKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmg6CisKKyAgICAg ICAgKiBQbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmg6CisKKyAgICAgICAg KiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nl c3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9j ZXNzQXNzZXJ0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nl c3NBc3NlcnRpb24pOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkU2V0QXNzZXJ0aW9uU3RhdGUp OgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAg ICAgICAoV2ViS2l0OjpmbGFnc0ZvclN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6cmVhc29uRm9y U3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0 aW9uKToKKwogMjAxOS0wMi0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBQYWdlT3ZlcmxheUNvbnRyb2xsZXIncyBsYXllcnMgc2hvdWxkIGJlIGNy ZWF0ZWQgbGF6aWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL05l dHdvcmstaU9TLmVudGl0bGVtZW50cyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0 d29yay1pT1MuZW50aXRsZW1lbnRzCmluZGV4IGNjOTZjODJjNWNjYWFiNjUwODVhMTkwYmJjN2Uw ZmU2YWM0NzA5YWEuLjVmNzQ5MDM0MDQwNjliNWI3ZGE4YTc1ZmVhYWRiZjAyZjJiZWQyYjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRs ZW1lbnRzCisrKyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50 aXRsZW1lbnRzCkBAIC0xNiw2ICsxNiw4IEBACiAJPGFycmF5PgogCQk8c3RyaW5nPmNvbS5hcHBs ZS5XZWJLaXQuTmV0d29ya2luZzwvc3RyaW5nPgogCTwvYXJyYXk+CisJPGtleT5jb20uYXBwbGUu bXVsdGl0YXNraW5nLnN5c3RlbWFwcGFzc2VydGlvbnM8L2tleT4KKwk8dHJ1ZS8+CiAJPGtleT5j b20uYXBwbGUucHJpdmF0ZS5tZW1vcnlzdGF0dXM8L2tleT4KIAk8dHJ1ZS8+CiA8L2RpY3Q+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9h ZE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWRNYW5hZ2VyLmNwcAppbmRleCA0MWNlYzM3MDZkZWRhMmJjYWM5Yzc0ODczOTAyNmFkMmQz MmExYjMyLi5kYTM3N2I4OTQ2OTk2MzMwNzIwNWZmZDAxZjZiMmI2MWY3YjczOTY3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25s b2FkTWFuYWdlci5jcHAKQEAgLTcxLDYgKzcxLDEzIEBAIHZvaWQgRG93bmxvYWRNYW5hZ2VyOjpk YXRhVGFza0JlY2FtZURvd25sb2FkVGFzayhEb3dubG9hZElEIGRvd25sb2FkSUQsIHN0ZDo6dW5p CiAgICAgQVNTRVJUKCFtX2Rvd25sb2Fkcy5jb250YWlucyhkb3dubG9hZElEKSk7CiAgICAgbV9k b3dubG9hZHNBZnRlckRlc3RpbmF0aW9uRGVjaWRlZC5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAg bV9kb3dubG9hZHMuYWRkKGRvd25sb2FkSUQsIFdURk1vdmUoZG93bmxvYWQpKTsKKworI2lmIEVO QUJMRShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBpZiAobV9kb3dubG9hZHMuc2l6ZSgp ID09IDEpIHsKKyAgICAgICAgQVNTRVJUKCFtX2Rvd25sb2FkQXNzZXJ0aW9uKTsKKyAgICAgICAg bV9kb3dubG9hZEFzc2VydGlvbiA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4o Z2V0cGlkKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6RG93bmxvYWQp OworICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIERvd25sb2FkTWFuYWdlcjo6Y29udGludWVXaWxs U2VuZFJlcXVlc3QoRG93bmxvYWRJRCBkb3dubG9hZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmJiByZXF1ZXN0KQpAQCAtMTcyLDYgKzE3OSwxMyBAQCB2b2lkIERvd25sb2FkTWFuYWdlcjo6 ZG93bmxvYWRGaW5pc2hlZChEb3dubG9hZCogZG93bmxvYWQpCiB7CiAgICAgQVNTRVJUKG1fZG93 bmxvYWRzLmNvbnRhaW5zKGRvd25sb2FkLT5kb3dubG9hZElEKCkpKTsKICAgICBtX2Rvd25sb2Fk cy5yZW1vdmUoZG93bmxvYWQtPmRvd25sb2FkSUQoKSk7CisgICAgCisjaWYgRU5BQkxFKFRBS0Vf RE9XTkxPQURfQVNTRVJUSU9OKQorICAgIGlmIChtX2Rvd25sb2Fkcy5pc0VtcHR5KCkpIHsKKyAg ICAgICAgQVNTRVJUKG1fZG93bmxvYWRBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkQXNz ZXJ0aW9uID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFn ZXI6OmRpZENyZWF0ZURvd25sb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKaW5kZXggOGEwZWQ0OTk2ODc3 NTdkODIwMTVjM2U4Yjc0Nzc0YWQ3NWM1YTFhOS4uZmZlMWFkMDQ1YTk1ZjI0NmNlZmZjNjBhMzUz NTQ5Yjc1YjkyNmZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNs dWRlICJEb3dubG9hZElELmgiCiAjaW5jbHVkZSAiTmV0d29ya0RhdGFUYXNrLmgiCiAjaW5jbHVk ZSAiUGVuZGluZ0Rvd25sb2FkLmgiCisjaW5jbHVkZSAiUHJvY2Vzc0Fzc2VydGlvbi5oIgogI2lu Y2x1ZGUgIlNhbmRib3hFeHRlbnNpb24uaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVu dGVkLmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTExMyw2ICsxMTQsMTAgQEAgcHJp dmF0ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIHN0ZDo6cGFpcjxSZWZQdHI8TmV0d29ya0Rh dGFUYXNrPiwgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcj4+IG1fZG93bmxvYWRzV2FpdGluZ0Zv ckRlc3RpbmF0aW9uOwogICAgIEhhc2hNYXA8RG93bmxvYWRJRCwgUmVmUHRyPE5ldHdvcmtEYXRh VGFzaz4+IG1fZG93bmxvYWRzQWZ0ZXJEZXN0aW5hdGlvbkRlY2lkZWQ7CiAgICAgSGFzaE1hcDxE b3dubG9hZElELCBzdGQ6OnVuaXF1ZV9wdHI8RG93bmxvYWQ+PiBtX2Rvd25sb2FkczsKKworI2lm IEVOQUJMRShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJv Y2Vzc0Fzc2VydGlvbj4gbV9kb3dubG9hZEFzc2VydGlvbjsKKyNlbmRpZgogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvQXNzZXJ0aW9uU2VydmljZXNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv cy9Bc3NlcnRpb25TZXJ2aWNlc1NQSS5oCmluZGV4IGUyZmNlYTBmNDYzMjJkOWQ2ZmJkNzZmYWJk MzQ5NTYzOWNlNzYyYTQuLmZhZTJhMTEyOTI4OGIzMzQ5OGZlNjVmN2MwNTJlM2YxMjNhMmVjNDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25T ZXJ2aWNlc1NQSS5oCkBAIC02OSw2ICs2OSw3IEBAIHR5cGVkZWYgdWludDMyX3QgQktTUHJvY2Vz c0Fzc2VydGlvbkZsYWdzOwogCiBlbnVtIHsKICAgICBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29u RXh0ZW5zaW9uID0gMTMsCisgICAgQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbkZpbmlzaFRhc2tV bmJvdW5kZWQgPSAxMDAwNCwKIH07CiB0eXBlZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRp b25SZWFzb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NB c3NlcnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5j cHAKaW5kZXggNTRjMTJkZGVmZjNlZjkxODQyMDU1ZjM5ZGZlZTRkM2VmMzI0MTA0NC4uODU5MmEx M2E2ZTY2Yzk0ZDM0OTc1OWEwOGNjOGVkOWZhODFjYjNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTM1LDYgKzM1LDExIEBAIFByb2Nlc3NB c3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSBhc3Nl cnRpb25TdGF0ZSwgRnVuCiB7CiB9CiAKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRp b24oUHJvY2Vzc0lELCBjb25zdCYgU3RyaW5nLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0 ZSwgRnVuY3Rpb248dm9pZCgpPiYmKQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25T dGF0ZSkKK3sKK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQogewog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IGI5YjFl MTYzYTc2ZDQ4YWY3OWM2NzVmYTNkZDdmOTJiMzliYWMxN2UuLjMxMDUwOTAyZDk4MzhlOTJiMzVm YTU4ZjJjY2FkNjE1MGYxYjg5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1Byb2Nlc3NBc3NlcnRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNz QXNzZXJ0aW9uLmgKQEAgLTQ0LDYgKzQ0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBlbnVtIGNs YXNzIEFzc2VydGlvblN0YXRlIHsKICAgICBTdXNwZW5kZWQsCiAgICAgQmFja2dyb3VuZCwKKyAg ICBEb3dubG9hZCwKICAgICBGb3JlZ3JvdW5kCiB9OwogCkBAIC02MCw2ICs2MSw3IEBAIGNsYXNz IFByb2Nlc3NBc3NlcnRpb24KIHsKIHB1YmxpYzoKICAgICBQcm9jZXNzQXNzZXJ0aW9uKFByb2Nl c3NJRCwgQXNzZXJ0aW9uU3RhdGUsIEZ1bmN0aW9uPHZvaWQoKT4mJiBpbnZhbGlkYXRpb25DYWxs YmFjayA9IHsgfSk7CisgICAgUHJvY2Vzc0Fzc2VydGlvbihQcm9jZXNzSUQsIGNvbnN0IFN0cmlu ZyYgcmVhc29uLCBBc3NlcnRpb25TdGF0ZSwgRnVuY3Rpb248dm9pZCgpPiYmIGludmFsaWRhdGlv bkNhbGxiYWNrID0geyB9KTsKICAgICB2aXJ0dWFsIH5Qcm9jZXNzQXNzZXJ0aW9uKCk7CiAKICAg ICB2aXJ0dWFsIHZvaWQgc2V0Q2xpZW50KFByb2Nlc3NBc3NlcnRpb25DbGllbnQmIGNsaWVudCkg eyBtX2NsaWVudCA9ICZjbGllbnQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCmluZGV4IDg2ZDU2YjQ2ZDM3MGQ1OWIxOTBiZjcxZmRkZDAxN2VkNTRkNTQ2 YjUuLmIyZGEzYmI4NzY1ZTE2NmY5NzJlNTk2ZGUxZTM3ZWY2YmVkMzlmNzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMTA3Nyw2ICsxMDc3LDkg QEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFNldEFzc2VydGlvblN0YXRlKEFzc2VydGlvblN0 YXRlIHN0YXRlKQogICAgICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkp CiAgICAgICAgICAgICBwYWdlLT5wcm9jZXNzV2lsbEJlY29tZUZvcmVncm91bmQoKTsKICAgICAg ICAgYnJlYWs7CisgICAgCisgICAgY2FzZSBBc3NlcnRpb25TdGF0ZTo6RG93bmxvYWQ6CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAgIEFTU0VSVCghbV9iYWNrZ3Jv dW5kVG9rZW4gfHwgIW1fZm9yZWdyb3VuZFRva2VuKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggNzBkNzQyOWM4M2MzN2E0 NTdjNDYxZWRlMDM2YTg0MTA2ODQwYmZlZS4uNDA4OTk1ZDk0YzU0OTNjNDc0YzM5YjdlMjNlMTZh NjU1ZTE0M2I3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nl c3NBc3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nl c3NBc3NlcnRpb25JT1MubW0KQEAgLTE1MywyMCArMTUzLDM4IEBAIHN0YXRpYyBCS1NQcm9jZXNz QXNzZXJ0aW9uRmxhZ3MgZmxhZ3NGb3JTdGF0ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0 ZSkKICAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQ6CiAgICAgICAgIHJldHVybiBz dXNwZW5kZWRUYWJGbGFnczsKICAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpCYWNrZ3JvdW5kOgor ICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OkRvd25sb2FkOgogICAgICAgICByZXR1cm4gYmFja2dy b3VuZFRhYkZsYWdzOwogICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OkZvcmVncm91bmQ6CiAgICAg ICAgIHJldHVybiBmb3JlZ3JvdW5kVGFiRmxhZ3M7CiAgICAgfQogfQogCitzdGF0aWMgQktTUHJv Y2Vzc0Fzc2VydGlvblJlYXNvbiByZWFzb25Gb3JTdGF0ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSkKK3sKKyAgICBzd2l0Y2ggKGFzc2VydGlvblN0YXRlKSB7CisgICAgY2FzZSBBc3Nl cnRpb25TdGF0ZTo6RG93bmxvYWQ6CisgICAgICAgIHJldHVybiBCS1NQcm9jZXNzQXNzZXJ0aW9u UmVhc29uRmluaXNoVGFza1VuYm91bmRlZDsKKyAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpTdXNw ZW5kZWQ6CisgICAgY2FzZSBBc3NlcnRpb25TdGF0ZTo6QmFja2dyb3VuZDoKKyAgICBjYXNlIEFz c2VydGlvblN0YXRlOjpGb3JlZ3JvdW5kOgorICAgICAgICByZXR1cm4gQktTUHJvY2Vzc0Fzc2Vy dGlvblJlYXNvbkV4dGVuc2lvbjsKKyAgICB9Cit9CisKIFByb2Nlc3NBc3NlcnRpb246OlByb2Nl c3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwgRnVu Y3Rpb248dm9pZCgpPiYmIGludmFsaWRhdGlvbkNhbGxiYWNrKQorICAgIDogUHJvY2Vzc0Fzc2Vy dGlvbihwaWQsICJXZWIgY29udGVudCB2aXNpYmlsaXR5Il9zLCBhc3NlcnRpb25TdGF0ZSwgV1RG TW92ZShpbnZhbGlkYXRpb25DYWxsYmFjaykpCit7Cit9CisKK1Byb2Nlc3NBc3NlcnRpb246OlBy b2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBjb25zdCBTdHJpbmcmIG5hbWUsIEFzc2VydGlvblN0 YXRlIGFzc2VydGlvblN0YXRlLCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0aW9uQ2FsbGJh Y2spCiAgICAgOiBtX2ludmFsaWRhdGlvbkNhbGxiYWNrKFdURk1vdmUoaW52YWxpZGF0aW9uQ2Fs bGJhY2spKQogICAgICwgbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKICAgICBh dXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpOwogICAgIEJLU1Byb2Nlc3NBc3NlcnRp b25BY3F1aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewogICAgICAg ICBpZiAoIWFjcXVpcmVkKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNz U3VzcGVuc2lvbiwgIiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBVbmFibGUgdG8gYWNxdWlyZSBh c3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBwaWQpOworICAgICAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICIgJXAgLSBQcm9jZXNzQXNz ZXJ0aW9uKCkgUElEICVkIFVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3 aXRoIFBJRCAlZCIsIHRoaXMsIGdldHBpZCgpLCBwaWQpOwogICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFp bl9xdWV1ZSgpLCBeewogICAgICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykKQEAgLTE3NCw4ICsx OTIsOSBAQCBQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNz ZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIEZ1bgogICAgICAgICAgICAgfSk7CiAgICAgICAg IH0KICAgICB9OwotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9j ZXNzQXNzZXJ0aW9uKCkgQWNxdWlyaW5nIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAl ZCIsIHRoaXMsIHBpZCk7Ci0gICAgbV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fz c2VydGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0 aW9uU3RhdGUpIHJlYXNvbjpCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uIG5hbWU6 QCJXZWIgY29udGVudCB2aXNpYmlsaXR5IiB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7CisgICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQSUQg JWQgYWNxdWlyaW5nIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCIsIHRoaXMsIGdl dHBpZCgpLCBwaWQpOworICAgIAorICAgIG1fYXNzZXJ0aW9uID0gYWRvcHROUyhbW0JLU1Byb2Nl c3NBc3NlcnRpb24gYWxsb2NdIGluaXRXaXRoUElEOnBpZCBmbGFnczpmbGFnc0ZvclN0YXRlKGFz c2VydGlvblN0YXRlKSByZWFzb246cmVhc29uRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIG5hbWU6 KE5TU3RyaW5nICopbmFtZSB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7CiAgICAgbV9hc3NlcnRpb24u Z2V0KCkuaW52YWxpZGF0aW9uSGFuZGxlciA9IF4oKSB7CiAgICAgICAgIGRpc3BhdGNoX2FzeW5j KGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBSRUxFQVNFX0xPRyhQ cm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigpIFByb2Nlc3MgYXNzZXJ0 aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIHdhcyBpbnZhbGlkYXRlZCIsIHRoaXMsIHBpZCk7 Cg== 361105 2019-02-04 15:04:56 -0800 2019-02-04 15:17:12 -0800 Patch bug-194239-20190204150455.patch text/plain 10404 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyZDIxOGEwZDZjMDUxNWUy N2JkN2ExMTJkN2YxMWQ3ZjRlNzhhZmUuLmNmMTg1YzhlODk2OGRiMDhiNzBkMTMxOTI0NDQ4OWM2 ZDU2Nzc2Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMDQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFRha2UgYWRkaXRpb25hbCBwcm9j ZXNzIGFzc2VydGlvbiB3aGlsZSBkb3dubG9hZGluZy4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ3NzQxMzU2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdoZW4g dGhlIGZpcnN0IGRvd25sb2FkIHN0YXJ0cywgZ3JhYiB0aGlzIG5ldyBhc3NlcnRpb24uCisgICAg ICAgIFdoZW4gdGhlIGxhc3QgZG93bmxvYWQgZW5kcywgcmVsZWFzZSBpdC4KKworICAgICAgICAq IENvbmZpZ3VyYXRpb25zL05ldHdvcmstaU9TLmVudGl0bGVtZW50czoKKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpEb3dubG9hZE1hbmFnZXI6OmRhdGFUYXNrQmVjYW1lRG93bmxvYWRUYXNrKToKKyAgICAg ICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjpkb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmg6CisKKyAgICAgICAg KiBQbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmg6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NB c3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNz QXNzZXJ0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NB c3NlcnRpb24pOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkU2V0QXNzZXJ0aW9uU3RhdGUpOgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAg ICAoV2ViS2l0OjpmbGFnc0ZvclN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6cmVhc29uRm9yU3Rh dGUpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKwogMjAxOS0wMi0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBQYWdlT3ZlcmxheUNvbnRyb2xsZXIncyBsYXllcnMgc2hvdWxkIGJlIGNyZWF0 ZWQgbGF6aWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL05ldHdv cmstaU9TLmVudGl0bGVtZW50cyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29y ay1pT1MuZW50aXRsZW1lbnRzCmluZGV4IGNjOTZjODJjNWNjYWFiNjUwODVhMTkwYmJjN2UwZmU2 YWM0NzA5YWEuLjVmNzQ5MDM0MDQwNjliNWI3ZGE4YTc1ZmVhYWRiZjAyZjJiZWQyYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRsZW1l bnRzCisrKyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRs ZW1lbnRzCkBAIC0xNiw2ICsxNiw4IEBACiAJPGFycmF5PgogCQk8c3RyaW5nPmNvbS5hcHBsZS5X ZWJLaXQuTmV0d29ya2luZzwvc3RyaW5nPgogCTwvYXJyYXk+CisJPGtleT5jb20uYXBwbGUubXVs dGl0YXNraW5nLnN5c3RlbWFwcGFzc2VydGlvbnM8L2tleT4KKwk8dHJ1ZS8+CiAJPGtleT5jb20u YXBwbGUucHJpdmF0ZS5tZW1vcnlzdGF0dXM8L2tleT4KIAk8dHJ1ZS8+CiA8L2RpY3Q+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWRNYW5hZ2VyLmNwcAppbmRleCA0MWNlYzM3MDZkZWRhMmJjYWM5Yzc0ODczOTAyNmFkMmQzMmEx YjMyLi5kYTM3N2I4OTQ2OTk2MzMwNzIwNWZmZDAxZjZiMmI2MWY3YjczOTY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk TWFuYWdlci5jcHAKQEAgLTcxLDYgKzcxLDEzIEBAIHZvaWQgRG93bmxvYWRNYW5hZ2VyOjpkYXRh VGFza0JlY2FtZURvd25sb2FkVGFzayhEb3dubG9hZElEIGRvd25sb2FkSUQsIHN0ZDo6dW5pCiAg ICAgQVNTRVJUKCFtX2Rvd25sb2Fkcy5jb250YWlucyhkb3dubG9hZElEKSk7CiAgICAgbV9kb3du bG9hZHNBZnRlckRlc3RpbmF0aW9uRGVjaWRlZC5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAgbV9k b3dubG9hZHMuYWRkKGRvd25sb2FkSUQsIFdURk1vdmUoZG93bmxvYWQpKTsKKworI2lmIEVOQUJM RShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBpZiAobV9kb3dubG9hZHMuc2l6ZSgpID09 IDEpIHsKKyAgICAgICAgQVNTRVJUKCFtX2Rvd25sb2FkQXNzZXJ0aW9uKTsKKyAgICAgICAgbV9k b3dubG9hZEFzc2VydGlvbiA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4oZ2V0 cGlkKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6RG93bmxvYWQpOwor ICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIERvd25sb2FkTWFuYWdlcjo6Y29udGludWVXaWxsU2Vu ZFJlcXVlc3QoRG93bmxvYWRJRCBkb3dubG9hZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiByZXF1ZXN0KQpAQCAtMTcyLDYgKzE3OSwxMyBAQCB2b2lkIERvd25sb2FkTWFuYWdlcjo6ZG93 bmxvYWRGaW5pc2hlZChEb3dubG9hZCogZG93bmxvYWQpCiB7CiAgICAgQVNTRVJUKG1fZG93bmxv YWRzLmNvbnRhaW5zKGRvd25sb2FkLT5kb3dubG9hZElEKCkpKTsKICAgICBtX2Rvd25sb2Fkcy5y ZW1vdmUoZG93bmxvYWQtPmRvd25sb2FkSUQoKSk7CisgICAgCisjaWYgRU5BQkxFKFRBS0VfRE9X TkxPQURfQVNTRVJUSU9OKQorICAgIGlmIChtX2Rvd25sb2Fkcy5pc0VtcHR5KCkpIHsKKyAgICAg ICAgQVNTRVJUKG1fZG93bmxvYWRBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0 aW9uID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFnZXI6 OmRpZENyZWF0ZURvd25sb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKaW5kZXggOGEwZWQ0OTk2ODc3NTdk ODIwMTVjM2U4Yjc0Nzc0YWQ3NWM1YTFhOS4uZmZlMWFkMDQ1YTk1ZjI0NmNlZmZjNjBhMzUzNTQ5 Yjc1YjkyNmZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl ICJEb3dubG9hZElELmgiCiAjaW5jbHVkZSAiTmV0d29ya0RhdGFUYXNrLmgiCiAjaW5jbHVkZSAi UGVuZGluZ0Rvd25sb2FkLmgiCisjaW5jbHVkZSAiUHJvY2Vzc0Fzc2VydGlvbi5oIgogI2luY2x1 ZGUgIlNhbmRib3hFeHRlbnNpb24uaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTExMyw2ICsxMTQsMTAgQEAgcHJpdmF0 ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIHN0ZDo6cGFpcjxSZWZQdHI8TmV0d29ya0RhdGFU YXNrPiwgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcj4+IG1fZG93bmxvYWRzV2FpdGluZ0ZvckRl c3RpbmF0aW9uOwogICAgIEhhc2hNYXA8RG93bmxvYWRJRCwgUmVmUHRyPE5ldHdvcmtEYXRhVGFz az4+IG1fZG93bmxvYWRzQWZ0ZXJEZXN0aW5hdGlvbkRlY2lkZWQ7CiAgICAgSGFzaE1hcDxEb3du bG9hZElELCBzdGQ6OnVuaXF1ZV9wdHI8RG93bmxvYWQ+PiBtX2Rvd25sb2FkczsKKworI2lmIEVO QUJMRShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vz c0Fzc2VydGlvbj4gbV9kb3dubG9hZEFzc2VydGlvbjsKKyNlbmRpZgogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3Mv QXNzZXJ0aW9uU2VydmljZXNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9B c3NlcnRpb25TZXJ2aWNlc1NQSS5oCmluZGV4IGUyZmNlYTBmNDYzMjJkOWQ2ZmJkNzZmYWJkMzQ5 NTYzOWNlNzYyYTQuLmZhZTJhMTEyOTI4OGIzMzQ5OGZlNjVmN2MwNTJlM2YxMjNhMmVjNDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNl c1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oCkBAIC02OSw2ICs2OSw3IEBAIHR5cGVkZWYgdWludDMyX3QgQktTUHJvY2Vzc0Fz c2VydGlvbkZsYWdzOwogCiBlbnVtIHsKICAgICBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0 ZW5zaW9uID0gMTMsCisgICAgQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbkZpbmlzaFRhc2tVbmJv dW5kZWQgPSAxMDAwNCwKIH07CiB0eXBlZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRpb25S ZWFzb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3Nl cnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAK aW5kZXggNTRjMTJkZGVmZjNlZjkxODQyMDU1ZjM5ZGZlZTRkM2VmMzI0MTA0NC4uODU5MmExM2E2 ZTY2Yzk0ZDM0OTc1OWEwOGNjOGVkOWZhODFjYjNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTM1LDYgKzM1LDExIEBAIFByb2Nlc3NBc3Nl cnRpb246OlByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSwgRnVuCiB7CiB9CiAKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24o UHJvY2Vzc0lELCBjb25zdCYgU3RyaW5nLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwg RnVuY3Rpb248dm9pZCgpPiYmKQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0 ZSkKK3sKK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IGI5YjFlMTYz YTc2ZDQ4YWY3OWM2NzVmYTNkZDdmOTJiMzliYWMxN2UuLjdlM2IyODk0M2FjZTc0NDAwNGU0OGY3 NWM2ZjRlYjUxZjc3ZGY0NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b2Nlc3NBc3NlcnRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNz ZXJ0aW9uLmgKQEAgLTM5LDExICszOSwxNiBAQAogT0JKQ19DTEFTUyBCS1NQcm9jZXNzQXNzZXJ0 aW9uOwogI2VuZGlmCiAKK25hbWVzcGFjZSBXVEYgeworY2xhc3MgU3RyaW5nOworfQorCiBuYW1l c3BhY2UgV2ViS2l0IHsKICAgICAKIGVudW0gY2xhc3MgQXNzZXJ0aW9uU3RhdGUgewogICAgIFN1 c3BlbmRlZCwKICAgICBCYWNrZ3JvdW5kLAorICAgIERvd25sb2FkLAogICAgIEZvcmVncm91bmQK IH07CiAKQEAgLTYwLDYgKzY1LDcgQEAgY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbgogewogcHVibGlj OgogICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSwgRnVuY3Rp b248dm9pZCgpPiYmIGludmFsaWRhdGlvbkNhbGxiYWNrID0geyB9KTsKKyAgICBQcm9jZXNzQXNz ZXJ0aW9uKFByb2Nlc3NJRCwgY29uc3QgU3RyaW5nJiByZWFzb24sIEFzc2VydGlvblN0YXRlLCBG dW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7IH0pOwogICAgIHZpcnR1 YWwgflByb2Nlc3NBc3NlcnRpb24oKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDbGllbnQoUHJv Y2Vzc0Fzc2VydGlvbkNsaWVudCYgY2xpZW50KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggODZkNTZiNDZk MzcwZDU5YjE5MGJmNzFmZGRkMDE3ZWQ1NGQ1NDZiNS4uYjJkYTNiYjg3NjVlMTY2Zjk3MmU1OTZk ZTFlMzdlZjZiZWQzOWY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwCkBAIC0xMDc3LDYgKzEwNzcsOSBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlk U2V0QXNzZXJ0aW9uU3RhdGUoQXNzZXJ0aW9uU3RhdGUgc3RhdGUpCiAgICAgICAgIGZvciAoYXV0 byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKICAgICAgICAgICAgIHBhZ2UtPnByb2Nlc3NX aWxsQmVjb21lRm9yZWdyb3VuZCgpOwogICAgICAgICBicmVhazsKKyAgICAKKyAgICBjYXNlIEFz c2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAg ICAgfQogCiAgICAgQVNTRVJUKCFtX2JhY2tncm91bmRUb2tlbiB8fCAhbV9mb3JlZ3JvdW5kVG9r ZW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3Nl cnRpb25JT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlv bklPUy5tbQppbmRleCA3MGQ3NDI5YzgzYzM3YTQ1N2M0NjFlZGUwMzZhODQxMDY4NDBiZmVlLi40 MDg5OTVkOTRjNTQ5M2M0NzRjMzliN2UyM2UxNmE2NTVlMTQzYjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtMTUzLDIw ICsxNTMsMzggQEAgc3RhdGljIEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBmbGFnc0ZvclN0YXRl KEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQogICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6 OlN1c3BlbmRlZDoKICAgICAgICAgcmV0dXJuIHN1c3BlbmRlZFRhYkZsYWdzOwogICAgIGNhc2Ug QXNzZXJ0aW9uU3RhdGU6OkJhY2tncm91bmQ6CisgICAgY2FzZSBBc3NlcnRpb25TdGF0ZTo6RG93 bmxvYWQ6CiAgICAgICAgIHJldHVybiBiYWNrZ3JvdW5kVGFiRmxhZ3M7CiAgICAgY2FzZSBBc3Nl cnRpb25TdGF0ZTo6Rm9yZWdyb3VuZDoKICAgICAgICAgcmV0dXJuIGZvcmVncm91bmRUYWJGbGFn czsKICAgICB9CiB9CiAKK3N0YXRpYyBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uIHJlYXNvbkZv clN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQoreworICAgIHN3aXRjaCAoYXNz ZXJ0aW9uU3RhdGUpIHsKKyAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAgICAg ICAgcmV0dXJuIEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb25GaW5pc2hUYXNrVW5ib3VuZGVkOwor ICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZDoKKyAgICBjYXNlIEFzc2VydGlvblN0 YXRlOjpCYWNrZ3JvdW5kOgorICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OkZvcmVncm91bmQ6Cisg ICAgICAgIHJldHVybiBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uOworICAgIH0K K30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFzc2Vy dGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0aW9u Q2FsbGJhY2spCisgICAgOiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgIldlYiBjb250ZW50IHZpc2li aWxpdHkiX3MsIGFzc2VydGlvblN0YXRlLCBXVEZNb3ZlKGludmFsaWRhdGlvbkNhbGxiYWNrKSkK K3sKK30KKworUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIGNv bnN0IFN0cmluZyYgbmFtZSwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIEZ1bmN0aW9u PHZvaWQoKT4mJiBpbnZhbGlkYXRpb25DYWxsYmFjaykKICAgICA6IG1faW52YWxpZGF0aW9uQ2Fs bGJhY2soV1RGTW92ZShpbnZhbGlkYXRpb25DYWxsYmFjaykpCiAgICAgLCBtX2Fzc2VydGlvblN0 YXRlKGFzc2VydGlvblN0YXRlKQogewogICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigq dGhpcyk7CiAgICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5kbGVy ID0gXihCT09MIGFjcXVpcmVkKSB7CiAgICAgICAgIGlmICghYWNxdWlyZWQpIHsKLSAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiICVwIC0gUHJvY2Vzc0Fz c2VydGlvbigpIFVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJ RCAlZCIsIHRoaXMsIHBpZCk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNz U3VzcGVuc2lvbiwgIiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQSUQgJWQgVW5hYmxlIHRvIGFj cXVpcmUgYXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlkKCks IHBpZCk7CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGRp c3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICAg ICAgaWYgKHdlYWtUaGlzKQpAQCAtMTc0LDggKzE5Miw5IEBAIFByb2Nlc3NBc3NlcnRpb246OlBy b2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwg RnVuCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogICAgIH07Ci0gICAgUkVMRUFTRV9MT0co UHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBBY3F1aXJpbmcgYXNz ZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgcGlkKTsKLSAgICBtX2Fzc2Vy dGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aFBJRDpw aWQgZmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgcmVhc29uOkJLU1Byb2Nlc3NB c3NlcnRpb25SZWFzb25FeHRlbnNpb24gbmFtZTpAIldlYiBjb250ZW50IHZpc2liaWxpdHkiIHdp dGhIYW5kbGVyOmhhbmRsZXJdKTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg IiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigpIFBJRCAlZCBhY3F1aXJpbmcgYXNzZXJ0aW9uIGZvciBw cm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlkKCksIHBpZCk7CisgICAgCisgICAgbV9h c3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhQ SUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIHJlYXNvbjpyZWFzb25G b3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgbmFtZTooTlNTdHJpbmcgKiluYW1lIHdpdGhIYW5kbGVy OmhhbmRsZXJdKTsKICAgICBtX2Fzc2VydGlvbi5nZXQoKS5pbnZhbGlkYXRpb25IYW5kbGVyID0g XigpIHsKICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwg XnsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9j ZXNzQXNzZXJ0aW9uKCkgUHJvY2VzcyBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQg d2FzIGludmFsaWRhdGVkIiwgdGhpcywgcGlkKTsK 361108 2019-02-04 15:17:13 -0800 2019-02-04 15:42:14 -0800 Patch bug-194239-20190204151712.patch text/plain 10464 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyZDIxOGEwZDZjMDUxNWUy N2JkN2ExMTJkN2YxMWQ3ZjRlNzhhZmUuLmNmMTg1YzhlODk2OGRiMDhiNzBkMTMxOTI0NDQ4OWM2 ZDU2Nzc2Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMDQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFRha2UgYWRkaXRpb25hbCBwcm9j ZXNzIGFzc2VydGlvbiB3aGlsZSBkb3dubG9hZGluZy4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ3NzQxMzU2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdoZW4g dGhlIGZpcnN0IGRvd25sb2FkIHN0YXJ0cywgZ3JhYiB0aGlzIG5ldyBhc3NlcnRpb24uCisgICAg ICAgIFdoZW4gdGhlIGxhc3QgZG93bmxvYWQgZW5kcywgcmVsZWFzZSBpdC4KKworICAgICAgICAq IENvbmZpZ3VyYXRpb25zL05ldHdvcmstaU9TLmVudGl0bGVtZW50czoKKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpEb3dubG9hZE1hbmFnZXI6OmRhdGFUYXNrQmVjYW1lRG93bmxvYWRUYXNrKToKKyAgICAg ICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjpkb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmg6CisKKyAgICAgICAg KiBQbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmg6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NB c3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNz QXNzZXJ0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NB c3NlcnRpb24pOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkU2V0QXNzZXJ0aW9uU3RhdGUpOgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAg ICAoV2ViS2l0OjpmbGFnc0ZvclN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6cmVhc29uRm9yU3Rh dGUpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKwogMjAxOS0wMi0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBQYWdlT3ZlcmxheUNvbnRyb2xsZXIncyBsYXllcnMgc2hvdWxkIGJlIGNyZWF0 ZWQgbGF6aWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL05ldHdv cmstaU9TLmVudGl0bGVtZW50cyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29y ay1pT1MuZW50aXRsZW1lbnRzCmluZGV4IGNjOTZjODJjNWNjYWFiNjUwODVhMTkwYmJjN2UwZmU2 YWM0NzA5YWEuLjVmNzQ5MDM0MDQwNjliNWI3ZGE4YTc1ZmVhYWRiZjAyZjJiZWQyYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRsZW1l bnRzCisrKyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRs ZW1lbnRzCkBAIC0xNiw2ICsxNiw4IEBACiAJPGFycmF5PgogCQk8c3RyaW5nPmNvbS5hcHBsZS5X ZWJLaXQuTmV0d29ya2luZzwvc3RyaW5nPgogCTwvYXJyYXk+CisJPGtleT5jb20uYXBwbGUubXVs dGl0YXNraW5nLnN5c3RlbWFwcGFzc2VydGlvbnM8L2tleT4KKwk8dHJ1ZS8+CiAJPGtleT5jb20u YXBwbGUucHJpdmF0ZS5tZW1vcnlzdGF0dXM8L2tleT4KIAk8dHJ1ZS8+CiA8L2RpY3Q+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWRNYW5hZ2VyLmNwcAppbmRleCA0MWNlYzM3MDZkZWRhMmJjYWM5Yzc0ODczOTAyNmFkMmQzMmEx YjMyLi5kYTM3N2I4OTQ2OTk2MzMwNzIwNWZmZDAxZjZiMmI2MWY3YjczOTY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk TWFuYWdlci5jcHAKQEAgLTcxLDYgKzcxLDEzIEBAIHZvaWQgRG93bmxvYWRNYW5hZ2VyOjpkYXRh VGFza0JlY2FtZURvd25sb2FkVGFzayhEb3dubG9hZElEIGRvd25sb2FkSUQsIHN0ZDo6dW5pCiAg ICAgQVNTRVJUKCFtX2Rvd25sb2Fkcy5jb250YWlucyhkb3dubG9hZElEKSk7CiAgICAgbV9kb3du bG9hZHNBZnRlckRlc3RpbmF0aW9uRGVjaWRlZC5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAgbV9k b3dubG9hZHMuYWRkKGRvd25sb2FkSUQsIFdURk1vdmUoZG93bmxvYWQpKTsKKworI2lmIEVOQUJM RShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBpZiAobV9kb3dubG9hZHMuc2l6ZSgpID09 IDEpIHsKKyAgICAgICAgQVNTRVJUKCFtX2Rvd25sb2FkQXNzZXJ0aW9uKTsKKyAgICAgICAgbV9k b3dubG9hZEFzc2VydGlvbiA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4oZ2V0 cGlkKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6RG93bmxvYWQpOwor ICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIERvd25sb2FkTWFuYWdlcjo6Y29udGludWVXaWxsU2Vu ZFJlcXVlc3QoRG93bmxvYWRJRCBkb3dubG9hZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiByZXF1ZXN0KQpAQCAtMTcyLDYgKzE3OSwxMyBAQCB2b2lkIERvd25sb2FkTWFuYWdlcjo6ZG93 bmxvYWRGaW5pc2hlZChEb3dubG9hZCogZG93bmxvYWQpCiB7CiAgICAgQVNTRVJUKG1fZG93bmxv YWRzLmNvbnRhaW5zKGRvd25sb2FkLT5kb3dubG9hZElEKCkpKTsKICAgICBtX2Rvd25sb2Fkcy5y ZW1vdmUoZG93bmxvYWQtPmRvd25sb2FkSUQoKSk7CisgICAgCisjaWYgRU5BQkxFKFRBS0VfRE9X TkxPQURfQVNTRVJUSU9OKQorICAgIGlmIChtX2Rvd25sb2Fkcy5pc0VtcHR5KCkpIHsKKyAgICAg ICAgQVNTRVJUKG1fZG93bmxvYWRBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0 aW9uID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFnZXI6 OmRpZENyZWF0ZURvd25sb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKaW5kZXggOGEwZWQ0OTk2ODc3NTdk ODIwMTVjM2U4Yjc0Nzc0YWQ3NWM1YTFhOS4uZmZlMWFkMDQ1YTk1ZjI0NmNlZmZjNjBhMzUzNTQ5 Yjc1YjkyNmZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl ICJEb3dubG9hZElELmgiCiAjaW5jbHVkZSAiTmV0d29ya0RhdGFUYXNrLmgiCiAjaW5jbHVkZSAi UGVuZGluZ0Rvd25sb2FkLmgiCisjaW5jbHVkZSAiUHJvY2Vzc0Fzc2VydGlvbi5oIgogI2luY2x1 ZGUgIlNhbmRib3hFeHRlbnNpb24uaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTExMyw2ICsxMTQsMTAgQEAgcHJpdmF0 ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIHN0ZDo6cGFpcjxSZWZQdHI8TmV0d29ya0RhdGFU YXNrPiwgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcj4+IG1fZG93bmxvYWRzV2FpdGluZ0ZvckRl c3RpbmF0aW9uOwogICAgIEhhc2hNYXA8RG93bmxvYWRJRCwgUmVmUHRyPE5ldHdvcmtEYXRhVGFz az4+IG1fZG93bmxvYWRzQWZ0ZXJEZXN0aW5hdGlvbkRlY2lkZWQ7CiAgICAgSGFzaE1hcDxEb3du bG9hZElELCBzdGQ6OnVuaXF1ZV9wdHI8RG93bmxvYWQ+PiBtX2Rvd25sb2FkczsKKworI2lmIEVO QUJMRShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vz c0Fzc2VydGlvbj4gbV9kb3dubG9hZEFzc2VydGlvbjsKKyNlbmRpZgogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3Mv QXNzZXJ0aW9uU2VydmljZXNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9B c3NlcnRpb25TZXJ2aWNlc1NQSS5oCmluZGV4IGUyZmNlYTBmNDYzMjJkOWQ2ZmJkNzZmYWJkMzQ5 NTYzOWNlNzYyYTQuLmZhZTJhMTEyOTI4OGIzMzQ5OGZlNjVmN2MwNTJlM2YxMjNhMmVjNDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNl c1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oCkBAIC02OSw2ICs2OSw3IEBAIHR5cGVkZWYgdWludDMyX3QgQktTUHJvY2Vzc0Fz c2VydGlvbkZsYWdzOwogCiBlbnVtIHsKICAgICBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0 ZW5zaW9uID0gMTMsCisgICAgQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbkZpbmlzaFRhc2tVbmJv dW5kZWQgPSAxMDAwNCwKIH07CiB0eXBlZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRpb25S ZWFzb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3Nl cnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAK aW5kZXggNTRjMTJkZGVmZjNlZjkxODQyMDU1ZjM5ZGZlZTRkM2VmMzI0MTA0NC4uODU5MmExM2E2 ZTY2Yzk0ZDM0OTc1OWEwOGNjOGVkOWZhODFjYjNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTM1LDYgKzM1LDExIEBAIFByb2Nlc3NBc3Nl cnRpb246OlByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSwgRnVuCiB7CiB9CiAKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24o UHJvY2Vzc0lELCBjb25zdCYgU3RyaW5nLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwg RnVuY3Rpb248dm9pZCgpPiYmKQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0 ZSkKK3sKK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IGI5YjFlMTYz YTc2ZDQ4YWY3OWM2NzVmYTNkZDdmOTJiMzliYWMxN2UuLmU5YjEzYzQzOGU4YmQwZWNlMmIxZTc0 MjQ0NzNlYjlkZjA4YTUxYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b2Nlc3NBc3NlcnRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNz ZXJ0aW9uLmgKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgPHd0Zi9GdW5jdGlvbi5oPgog I2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KIAogI2lmICFPUyhXSU5ET1dTKQogI2luY2x1ZGUgPHVuaXN0ZC5oPgpAQCAtNDQsNiArNDUs NyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGVudW0gY2xhc3MgQXNzZXJ0aW9uU3RhdGUgewogICAg IFN1c3BlbmRlZCwKICAgICBCYWNrZ3JvdW5kLAorICAgIERvd25sb2FkLAogICAgIEZvcmVncm91 bmQKIH07CiAKQEAgLTYwLDYgKzYyLDcgQEAgY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbgogewogcHVi bGljOgogICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSwgRnVu Y3Rpb248dm9pZCgpPiYmIGludmFsaWRhdGlvbkNhbGxiYWNrID0geyB9KTsKKyAgICBQcm9jZXNz QXNzZXJ0aW9uKFByb2Nlc3NJRCwgY29uc3QgU3RyaW5nJiByZWFzb24sIEFzc2VydGlvblN0YXRl LCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7IH0pOwogICAgIHZp cnR1YWwgflByb2Nlc3NBc3NlcnRpb24oKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDbGllbnQo UHJvY2Vzc0Fzc2VydGlvbkNsaWVudCYgY2xpZW50KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggODZkNTZi NDZkMzcwZDU5YjE5MGJmNzFmZGRkMDE3ZWQ1NGQ1NDZiNS4uYjJkYTNiYjg3NjVlMTY2Zjk3MmU1 OTZkZTFlMzdlZjZiZWQzOWY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCkBAIC0xMDc3LDYgKzEwNzcsOSBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6 ZGlkU2V0QXNzZXJ0aW9uU3RhdGUoQXNzZXJ0aW9uU3RhdGUgc3RhdGUpCiAgICAgICAgIGZvciAo YXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKICAgICAgICAgICAgIHBhZ2UtPnByb2Nl c3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpOwogICAgICAgICBicmVhazsKKyAgICAKKyAgICBjYXNl IEFzc2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiAgICAgfQogCiAgICAgQVNTRVJUKCFtX2JhY2tncm91bmRUb2tlbiB8fCAhbV9mb3JlZ3JvdW5k VG9rZW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2Vy dGlvbklPUy5tbQppbmRleCA3MGQ3NDI5YzgzYzM3YTQ1N2M0NjFlZGUwMzZhODQxMDY4NDBiZmVl Li40MDg5OTVkOTRjNTQ5M2M0NzRjMzliN2UyM2UxNmE2NTVlMTQzYjc3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtMTUz LDIwICsxNTMsMzggQEAgc3RhdGljIEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBmbGFnc0ZvclN0 YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQogICAgIGNhc2UgQXNzZXJ0aW9uU3Rh dGU6OlN1c3BlbmRlZDoKICAgICAgICAgcmV0dXJuIHN1c3BlbmRlZFRhYkZsYWdzOwogICAgIGNh c2UgQXNzZXJ0aW9uU3RhdGU6OkJhY2tncm91bmQ6CisgICAgY2FzZSBBc3NlcnRpb25TdGF0ZTo6 RG93bmxvYWQ6CiAgICAgICAgIHJldHVybiBiYWNrZ3JvdW5kVGFiRmxhZ3M7CiAgICAgY2FzZSBB c3NlcnRpb25TdGF0ZTo6Rm9yZWdyb3VuZDoKICAgICAgICAgcmV0dXJuIGZvcmVncm91bmRUYWJG bGFnczsKICAgICB9CiB9CiAKK3N0YXRpYyBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uIHJlYXNv bkZvclN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQoreworICAgIHN3aXRjaCAo YXNzZXJ0aW9uU3RhdGUpIHsKKyAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAg ICAgICAgcmV0dXJuIEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb25GaW5pc2hUYXNrVW5ib3VuZGVk OworICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZDoKKyAgICBjYXNlIEFzc2VydGlv blN0YXRlOjpCYWNrZ3JvdW5kOgorICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OkZvcmVncm91bmQ6 CisgICAgICAgIHJldHVybiBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uOworICAg IH0KK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFz c2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0 aW9uQ2FsbGJhY2spCisgICAgOiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgIldlYiBjb250ZW50IHZp c2liaWxpdHkiX3MsIGFzc2VydGlvblN0YXRlLCBXVEZNb3ZlKGludmFsaWRhdGlvbkNhbGxiYWNr KSkKK3sKK30KKworUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQs IGNvbnN0IFN0cmluZyYgbmFtZSwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIEZ1bmN0 aW9uPHZvaWQoKT4mJiBpbnZhbGlkYXRpb25DYWxsYmFjaykKICAgICA6IG1faW52YWxpZGF0aW9u Q2FsbGJhY2soV1RGTW92ZShpbnZhbGlkYXRpb25DYWxsYmFjaykpCiAgICAgLCBtX2Fzc2VydGlv blN0YXRlKGFzc2VydGlvblN0YXRlKQogewogICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cigqdGhpcyk7CiAgICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5k bGVyID0gXihCT09MIGFjcXVpcmVkKSB7CiAgICAgICAgIGlmICghYWNxdWlyZWQpIHsKLSAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiICVwIC0gUHJvY2Vz c0Fzc2VydGlvbigpIFVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRo IFBJRCAlZCIsIHRoaXMsIHBpZCk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9j ZXNzU3VzcGVuc2lvbiwgIiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQSUQgJWQgVW5hYmxlIHRv IGFjcXVpcmUgYXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlk KCksIHBpZCk7CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAg ICAgICAgaWYgKHdlYWtUaGlzKQpAQCAtMTc0LDggKzE5Miw5IEBAIFByb2Nlc3NBc3NlcnRpb246 OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0 ZSwgRnVuCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogICAgIH07Ci0gICAgUkVMRUFTRV9M T0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBBY3F1aXJpbmcg YXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgcGlkKTsKLSAgICBtX2Fz c2VydGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aFBJ RDpwaWQgZmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgcmVhc29uOkJLU1Byb2Nl c3NBc3NlcnRpb25SZWFzb25FeHRlbnNpb24gbmFtZTpAIldlYiBjb250ZW50IHZpc2liaWxpdHki IHdpdGhIYW5kbGVyOmhhbmRsZXJdKTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lv biwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigpIFBJRCAlZCBhY3F1aXJpbmcgYXNzZXJ0aW9uIGZv ciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlkKCksIHBpZCk7CisgICAgCisgICAg bV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdp dGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIHJlYXNvbjpyZWFz b25Gb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgbmFtZTooTlNTdHJpbmcgKiluYW1lIHdpdGhIYW5k bGVyOmhhbmRsZXJdKTsKICAgICBtX2Fzc2VydGlvbi5nZXQoKS5pbnZhbGlkYXRpb25IYW5kbGVy ID0gXigpIHsKICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUo KSwgXnsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQ cm9jZXNzQXNzZXJ0aW9uKCkgUHJvY2VzcyBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQg JWQgd2FzIGludmFsaWRhdGVkIiwgdGhpcywgcGlkKTsK 361113 2019-02-04 15:42:15 -0800 2019-02-04 17:27:28 -0800 Patch bug-194239-20190204154214.patch text/plain 10464 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyZDIxOGEwZDZjMDUxNWUy N2JkN2ExMTJkN2YxMWQ3ZjRlNzhhZmUuLmNmMTg1YzhlODk2OGRiMDhiNzBkMTMxOTI0NDQ4OWM2 ZDU2Nzc2Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMDQgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFRha2UgYWRkaXRpb25hbCBwcm9j ZXNzIGFzc2VydGlvbiB3aGlsZSBkb3dubG9hZGluZy4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ3NzQxMzU2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFdoZW4g dGhlIGZpcnN0IGRvd25sb2FkIHN0YXJ0cywgZ3JhYiB0aGlzIG5ldyBhc3NlcnRpb24uCisgICAg ICAgIFdoZW4gdGhlIGxhc3QgZG93bmxvYWQgZW5kcywgcmVsZWFzZSBpdC4KKworICAgICAgICAq IENvbmZpZ3VyYXRpb25zL05ldHdvcmstaU9TLmVudGl0bGVtZW50czoKKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpEb3dubG9hZE1hbmFnZXI6OmRhdGFUYXNrQmVjYW1lRG93bmxvYWRUYXNrKToKKyAgICAg ICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjpkb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmg6CisKKyAgICAgICAg KiBQbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmg6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NB c3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNz QXNzZXJ0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NB c3NlcnRpb24pOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkU2V0QXNzZXJ0aW9uU3RhdGUpOgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAg ICAoV2ViS2l0OjpmbGFnc0ZvclN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6cmVhc29uRm9yU3Rh dGUpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKwogMjAxOS0wMi0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBQYWdlT3ZlcmxheUNvbnRyb2xsZXIncyBsYXllcnMgc2hvdWxkIGJlIGNyZWF0 ZWQgbGF6aWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NvbmZpZ3VyYXRpb25zL05ldHdv cmstaU9TLmVudGl0bGVtZW50cyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29y ay1pT1MuZW50aXRsZW1lbnRzCmluZGV4IGNjOTZjODJjNWNjYWFiNjUwODVhMTkwYmJjN2UwZmU2 YWM0NzA5YWEuLjVmNzQ5MDM0MDQwNjliNWI3ZGE4YTc1ZmVhYWRiZjAyZjJiZWQyYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRsZW1l bnRzCisrKyBiL1NvdXJjZS9XZWJLaXQvQ29uZmlndXJhdGlvbnMvTmV0d29yay1pT1MuZW50aXRs ZW1lbnRzCkBAIC0xNiw2ICsxNiw4IEBACiAJPGFycmF5PgogCQk8c3RyaW5nPmNvbS5hcHBsZS5X ZWJLaXQuTmV0d29ya2luZzwvc3RyaW5nPgogCTwvYXJyYXk+CisJPGtleT5jb20uYXBwbGUubXVs dGl0YXNraW5nLnN5c3RlbWFwcGFzc2VydGlvbnM8L2tleT4KKwk8dHJ1ZS8+CiAJPGtleT5jb20u YXBwbGUucHJpdmF0ZS5tZW1vcnlzdGF0dXM8L2tleT4KIAk8dHJ1ZS8+CiA8L2RpY3Q+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxv YWRNYW5hZ2VyLmNwcAppbmRleCA0MWNlYzM3MDZkZWRhMmJjYWM5Yzc0ODczOTAyNmFkMmQzMmEx YjMyLi5kYTM3N2I4OTQ2OTk2MzMwNzIwNWZmZDAxZjZiMmI2MWY3YjczOTY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk TWFuYWdlci5jcHAKQEAgLTcxLDYgKzcxLDEzIEBAIHZvaWQgRG93bmxvYWRNYW5hZ2VyOjpkYXRh VGFza0JlY2FtZURvd25sb2FkVGFzayhEb3dubG9hZElEIGRvd25sb2FkSUQsIHN0ZDo6dW5pCiAg ICAgQVNTRVJUKCFtX2Rvd25sb2Fkcy5jb250YWlucyhkb3dubG9hZElEKSk7CiAgICAgbV9kb3du bG9hZHNBZnRlckRlc3RpbmF0aW9uRGVjaWRlZC5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAgbV9k b3dubG9hZHMuYWRkKGRvd25sb2FkSUQsIFdURk1vdmUoZG93bmxvYWQpKTsKKworI2lmIEVOQUJM RShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBpZiAobV9kb3dubG9hZHMuc2l6ZSgpID09 IDEpIHsKKyAgICAgICAgQVNTRVJUKCFtX2Rvd25sb2FkQXNzZXJ0aW9uKTsKKyAgICAgICAgbV9k b3dubG9hZEFzc2VydGlvbiA9IHN0ZDo6bWFrZV91bmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4oZ2V0 cGlkKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6RG93bmxvYWQpOwor ICAgIH0KKyNlbmRpZgogfQogCiB2b2lkIERvd25sb2FkTWFuYWdlcjo6Y29udGludWVXaWxsU2Vu ZFJlcXVlc3QoRG93bmxvYWRJRCBkb3dubG9hZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm JiByZXF1ZXN0KQpAQCAtMTcyLDYgKzE3OSwxMyBAQCB2b2lkIERvd25sb2FkTWFuYWdlcjo6ZG93 bmxvYWRGaW5pc2hlZChEb3dubG9hZCogZG93bmxvYWQpCiB7CiAgICAgQVNTRVJUKG1fZG93bmxv YWRzLmNvbnRhaW5zKGRvd25sb2FkLT5kb3dubG9hZElEKCkpKTsKICAgICBtX2Rvd25sb2Fkcy5y ZW1vdmUoZG93bmxvYWQtPmRvd25sb2FkSUQoKSk7CisgICAgCisjaWYgRU5BQkxFKFRBS0VfRE9X TkxPQURfQVNTRVJUSU9OKQorICAgIGlmIChtX2Rvd25sb2Fkcy5pc0VtcHR5KCkpIHsKKyAgICAg ICAgQVNTRVJUKG1fZG93bmxvYWRBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0 aW9uID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFnZXI6 OmRpZENyZWF0ZURvd25sb2FkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKaW5kZXggOGEwZWQ0OTk2ODc3NTdk ODIwMTVjM2U4Yjc0Nzc0YWQ3NWM1YTFhOS4uZmZlMWFkMDQ1YTk1ZjI0NmNlZmZjNjBhMzUzNTQ5 Yjc1YjkyNmZlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRl ICJEb3dubG9hZElELmgiCiAjaW5jbHVkZSAiTmV0d29ya0RhdGFUYXNrLmgiCiAjaW5jbHVkZSAi UGVuZGluZ0Rvd25sb2FkLmgiCisjaW5jbHVkZSAiUHJvY2Vzc0Fzc2VydGlvbi5oIgogI2luY2x1 ZGUgIlNhbmRib3hFeHRlbnNpb24uaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVk Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTExMyw2ICsxMTQsMTAgQEAgcHJpdmF0 ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIHN0ZDo6cGFpcjxSZWZQdHI8TmV0d29ya0RhdGFU YXNrPiwgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlcj4+IG1fZG93bmxvYWRzV2FpdGluZ0ZvckRl c3RpbmF0aW9uOwogICAgIEhhc2hNYXA8RG93bmxvYWRJRCwgUmVmUHRyPE5ldHdvcmtEYXRhVGFz az4+IG1fZG93bmxvYWRzQWZ0ZXJEZXN0aW5hdGlvbkRlY2lkZWQ7CiAgICAgSGFzaE1hcDxEb3du bG9hZElELCBzdGQ6OnVuaXF1ZV9wdHI8RG93bmxvYWQ+PiBtX2Rvd25sb2FkczsKKworI2lmIEVO QUJMRShUQUtFX0RPV05MT0FEX0FTU0VSVElPTikKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vz c0Fzc2VydGlvbj4gbV9kb3dubG9hZEFzc2VydGlvbjsKKyNlbmRpZgogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3Mv QXNzZXJ0aW9uU2VydmljZXNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9B c3NlcnRpb25TZXJ2aWNlc1NQSS5oCmluZGV4IGUyZmNlYTBmNDYzMjJkOWQ2ZmJkNzZmYWJkMzQ5 NTYzOWNlNzYyYTQuLmZhZTJhMTEyOTI4OGIzMzQ5OGZlNjVmN2MwNTJlM2YxMjNhMmVjNDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNl c1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oCkBAIC02OSw2ICs2OSw3IEBAIHR5cGVkZWYgdWludDMyX3QgQktTUHJvY2Vzc0Fz c2VydGlvbkZsYWdzOwogCiBlbnVtIHsKICAgICBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0 ZW5zaW9uID0gMTMsCisgICAgQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbkZpbmlzaFRhc2tVbmJv dW5kZWQgPSAxMDAwNCwKIH07CiB0eXBlZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRpb25S ZWFzb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3Nl cnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAK aW5kZXggNTRjMTJkZGVmZjNlZjkxODQyMDU1ZjM5ZGZlZTRkM2VmMzI0MTA0NC4uYTI1ZGYyYjc0 NjI2ZjgyMGYyZTc2ZDM0NDVmZWVhMjE5YjkxMGM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTM1LDYgKzM1LDExIEBAIFByb2Nlc3NBc3Nl cnRpb246OlByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSwgRnVuCiB7CiB9CiAKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24o UHJvY2Vzc0lELCBjb25zdCBTdHJpbmcmLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwg RnVuY3Rpb248dm9pZCgpPiYmKQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0 ZSkKK3sKK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IGI5YjFlMTYz YTc2ZDQ4YWY3OWM2NzVmYTNkZDdmOTJiMzliYWMxN2UuLmU5YjEzYzQzOGU4YmQwZWNlMmIxZTc0 MjQ0NzNlYjlkZjA4YTUxYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b2Nlc3NBc3NlcnRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNz ZXJ0aW9uLmgKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgPHd0Zi9GdW5jdGlvbi5oPgog I2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KIAogI2lmICFPUyhXSU5ET1dTKQogI2luY2x1ZGUgPHVuaXN0ZC5oPgpAQCAtNDQsNiArNDUs NyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGVudW0gY2xhc3MgQXNzZXJ0aW9uU3RhdGUgewogICAg IFN1c3BlbmRlZCwKICAgICBCYWNrZ3JvdW5kLAorICAgIERvd25sb2FkLAogICAgIEZvcmVncm91 bmQKIH07CiAKQEAgLTYwLDYgKzYyLDcgQEAgY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbgogewogcHVi bGljOgogICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBBc3NlcnRpb25TdGF0ZSwgRnVu Y3Rpb248dm9pZCgpPiYmIGludmFsaWRhdGlvbkNhbGxiYWNrID0geyB9KTsKKyAgICBQcm9jZXNz QXNzZXJ0aW9uKFByb2Nlc3NJRCwgY29uc3QgU3RyaW5nJiByZWFzb24sIEFzc2VydGlvblN0YXRl LCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7IH0pOwogICAgIHZp cnR1YWwgflByb2Nlc3NBc3NlcnRpb24oKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDbGllbnQo UHJvY2Vzc0Fzc2VydGlvbkNsaWVudCYgY2xpZW50KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggODZkNTZi NDZkMzcwZDU5YjE5MGJmNzFmZGRkMDE3ZWQ1NGQ1NDZiNS4uYjJkYTNiYjg3NjVlMTY2Zjk3MmU1 OTZkZTFlMzdlZjZiZWQzOWY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCkBAIC0xMDc3LDYgKzEwNzcsOSBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6 ZGlkU2V0QXNzZXJ0aW9uU3RhdGUoQXNzZXJ0aW9uU3RhdGUgc3RhdGUpCiAgICAgICAgIGZvciAo YXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKICAgICAgICAgICAgIHBhZ2UtPnByb2Nl c3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpOwogICAgICAgICBicmVhazsKKyAgICAKKyAgICBjYXNl IEFzc2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiAgICAgfQogCiAgICAgQVNTRVJUKCFtX2JhY2tncm91bmRUb2tlbiB8fCAhbV9mb3JlZ3JvdW5k VG9rZW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2Vy dGlvbklPUy5tbQppbmRleCA3MGQ3NDI5YzgzYzM3YTQ1N2M0NjFlZGUwMzZhODQxMDY4NDBiZmVl Li40MDg5OTVkOTRjNTQ5M2M0NzRjMzliN2UyM2UxNmE2NTVlMTQzYjc3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtMTUz LDIwICsxNTMsMzggQEAgc3RhdGljIEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBmbGFnc0ZvclN0 YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQogICAgIGNhc2UgQXNzZXJ0aW9uU3Rh dGU6OlN1c3BlbmRlZDoKICAgICAgICAgcmV0dXJuIHN1c3BlbmRlZFRhYkZsYWdzOwogICAgIGNh c2UgQXNzZXJ0aW9uU3RhdGU6OkJhY2tncm91bmQ6CisgICAgY2FzZSBBc3NlcnRpb25TdGF0ZTo6 RG93bmxvYWQ6CiAgICAgICAgIHJldHVybiBiYWNrZ3JvdW5kVGFiRmxhZ3M7CiAgICAgY2FzZSBB c3NlcnRpb25TdGF0ZTo6Rm9yZWdyb3VuZDoKICAgICAgICAgcmV0dXJuIGZvcmVncm91bmRUYWJG bGFnczsKICAgICB9CiB9CiAKK3N0YXRpYyBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uIHJlYXNv bkZvclN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQoreworICAgIHN3aXRjaCAo YXNzZXJ0aW9uU3RhdGUpIHsKKyAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpEb3dubG9hZDoKKyAg ICAgICAgcmV0dXJuIEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb25GaW5pc2hUYXNrVW5ib3VuZGVk OworICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZDoKKyAgICBjYXNlIEFzc2VydGlv blN0YXRlOjpCYWNrZ3JvdW5kOgorICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OkZvcmVncm91bmQ6 CisgICAgICAgIHJldHVybiBCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uOworICAg IH0KK30KKwogUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFz c2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBGdW5jdGlvbjx2b2lkKCk+JiYgaW52YWxpZGF0 aW9uQ2FsbGJhY2spCisgICAgOiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgIldlYiBjb250ZW50IHZp c2liaWxpdHkiX3MsIGFzc2VydGlvblN0YXRlLCBXVEZNb3ZlKGludmFsaWRhdGlvbkNhbGxiYWNr KSkKK3sKK30KKworUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQs IGNvbnN0IFN0cmluZyYgbmFtZSwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIEZ1bmN0 aW9uPHZvaWQoKT4mJiBpbnZhbGlkYXRpb25DYWxsYmFjaykKICAgICA6IG1faW52YWxpZGF0aW9u Q2FsbGJhY2soV1RGTW92ZShpbnZhbGlkYXRpb25DYWxsYmFjaykpCiAgICAgLCBtX2Fzc2VydGlv blN0YXRlKGFzc2VydGlvblN0YXRlKQogewogICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0 cigqdGhpcyk7CiAgICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5k bGVyID0gXihCT09MIGFjcXVpcmVkKSB7CiAgICAgICAgIGlmICghYWNxdWlyZWQpIHsKLSAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiICVwIC0gUHJvY2Vz c0Fzc2VydGlvbigpIFVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRo IFBJRCAlZCIsIHRoaXMsIHBpZCk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9j ZXNzU3VzcGVuc2lvbiwgIiAlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQSUQgJWQgVW5hYmxlIHRv IGFjcXVpcmUgYXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlk KCksIHBpZCk7CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAg ICAgICAgaWYgKHdlYWtUaGlzKQpAQCAtMTc0LDggKzE5Miw5IEBAIFByb2Nlc3NBc3NlcnRpb246 OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0 ZSwgRnVuCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogICAgIH07Ci0gICAgUkVMRUFTRV9M T0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBBY3F1aXJpbmcg YXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgcGlkKTsKLSAgICBtX2Fz c2VydGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aFBJ RDpwaWQgZmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgcmVhc29uOkJLU1Byb2Nl c3NBc3NlcnRpb25SZWFzb25FeHRlbnNpb24gbmFtZTpAIldlYiBjb250ZW50IHZpc2liaWxpdHki IHdpdGhIYW5kbGVyOmhhbmRsZXJdKTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lv biwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigpIFBJRCAlZCBhY3F1aXJpbmcgYXNzZXJ0aW9uIGZv ciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhpcywgZ2V0cGlkKCksIHBpZCk7CisgICAgCisgICAg bV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdp dGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIHJlYXNvbjpyZWFz b25Gb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgbmFtZTooTlNTdHJpbmcgKiluYW1lIHdpdGhIYW5k bGVyOmhhbmRsZXJdKTsKICAgICBtX2Fzc2VydGlvbi5nZXQoKS5pbnZhbGlkYXRpb25IYW5kbGVy ID0gXigpIHsKICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUo KSwgXnsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQ cm9jZXNzQXNzZXJ0aW9uKCkgUHJvY2VzcyBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQg JWQgd2FzIGludmFsaWRhdGVkIiwgdGhpcywgcGlkKTsK