195195 2019-02-28 17:07:22 -0800 Make sure to correctly notify of end of a ServiceWorkerJob when the context is stopped 2019-03-04 12:40:47 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez commit-queue webkit-bug-importer oldest_to_newest 1511214 0 youennf 2019-02-28 17:07:22 -0800 Make sure to correctly notify of end of job when the context is stopped 1511221 1 363279 youennf 2019-02-28 17:18:16 -0800 Created attachment 363279 Patch 1511493 2 363279 achristensen 2019-03-01 11:39:20 -0800 Comment on attachment 363279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363279&action=review > Source/WebCore/ChangeLog:3 > + Make sure to correctly notify of end of job when the context is stopped This title should mention ServiceWorkerJob. Otherwise it's way too vague. > Source/WebCore/ChangeLog:14 > + Covered by existing tests not crashing anymore, in particular imported/w3c/web-platform-tests/service-workers/service-worker/skip-waiting.https.html. Should we unskip this test? > Source/WebCore/workers/service/ServiceWorkerJob.cpp:-172 > - if (!m_scriptLoader) Why can this no longer be null? 1511495 3 youennf 2019-03-01 11:41:13 -0800 (In reply to Alex Christensen from comment #2) > Comment on attachment 363279 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=363279&action=review > > > Source/WebCore/ChangeLog:3 > > + Make sure to correctly notify of end of job when the context is stopped > > This title should mention ServiceWorkerJob. Otherwise it's way too vague. > > > Source/WebCore/ChangeLog:14 > > + Covered by existing tests not crashing anymore, in particular imported/w3c/web-platform-tests/service-workers/service-worker/skip-waiting.https.html. > > Should we unskip this test? > > > Source/WebCore/workers/service/ServiceWorkerJob.cpp:-172 > > - if (!m_scriptLoader) > > Why can this no longer be null? 1511497 4 youennf 2019-03-01 11:42:10 -0800 > > > Source/WebCore/ChangeLog:3 > > > + Make sure to correctly notify of end of job when the context is stopped > > > > This title should mention ServiceWorkerJob. Otherwise it's way too vague. OK > > > Source/WebCore/ChangeLog:14 > > > + Covered by existing tests not crashing anymore, in particular imported/w3c/web-platform-tests/service-workers/service-worker/skip-waiting.https.html. > > > > Should we unskip this test? It is unskilled but crashes in debug sometimes. > > > Source/WebCore/workers/service/ServiceWorkerJob.cpp:-172 > > > - if (!m_scriptLoader) > > > > Why can this no longer be null? It is called in one place and we check for this before calling this method. 1511498 5 363279 cdumez 2019-03-01 11:46:13 -0800 Comment on attachment 363279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363279&action=review > Source/WebCore/workers/service/ServiceWorkerContainer.h:151 > + uint64_t m_ongoingSettledRegistrationCount { 0 }; Bad name, when I saw it I was wondering why you needed this member and did not rely on m_ongoingSettledRegistrations.size() instead. We probably want to call it m_lastOngoingSettledRegistrationIdentifier, like the data member above. 1511515 6 363352 youennf 2019-03-01 12:06:51 -0800 Created attachment 363352 Patch 1512305 7 363352 commit-queue 2019-03-04 12:31:03 -0800 Comment on attachment 363352 Patch Clearing flags on attachment: 363352 Committed r242372: <https://trac.webkit.org/changeset/242372> 1512306 8 commit-queue 2019-03-04 12:31:05 -0800 All reviewed patches have been landed. Closing bug. 1512316 9 webkit-bug-importer 2019-03-04 12:40:47 -0800 <rdar://problem/48572995> 363279 2019-02-28 17:18:16 -0800 2019-03-01 12:06:49 -0800 Patch bug-195195-20190228171816.patch text/plain 9178 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGRhZjZjMzE1YTE1MDI5 YjdjMTM1NjRjYjdkODhjNTUxM2UwOWNjYy4uM2MxZTQ5MzQ4YTk1NGMwZjFhY2Q3MGRiNTdiNzQ3 MThjM2U2NTg2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTAyLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUgdG8gY29y cmVjdGx5IG5vdGlmeSBvZiBlbmQgb2Ygam9iIHdoZW4gdGhlIGNvbnRleHQgaXMgc3RvcHBlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MTk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlIHRo ZSBwYXRjaCwgd2Ugd2VyZSBub3RpZnlpbmcgdGhhdCBzb21lIGpvYnMgd2VyZSBmaW5pc2hlZCB0 b28gYWdncmVzc2l2ZWx5IGF0IGNvbnRleHQgc3RvcCB0aW1lLgorICAgICAgICBUaGlzIHdhcyBj b25mdXNpbmcgdGhlIE5ldHdvcmsgUHJvY2Vzcy4KKyAgICAgICAgT25seSBub3RpZnkgc3VjaCBq b2JzIHRoYXQgaGF2ZSBwZW5kaW5nIGxvYWRzLgorICAgICAgICBJbXByb3ZlIHRoZSB0cmFja2lu ZyBvZiBqb2JzIGRvaW5nIHJlZ2lzdHJhdGlvbiByZXNvbHV0aW9uIHRvIGVuc3VyZSB0aGUgTmV0 d29yayBQcm9jZXNzIGdldHMgbm90aWZpZWQKKyAgICAgICAgaW4gY2FzZSBvZiBhIHJlZ2lzdHJh dGlvbiBwcm9taXNlIGJlaW5nIHJlc29sdmVkIGJ1dCB0aGUgc2V0dGxpbmcgY2FsbGJhY2sgYmVp bmcgbm90IHlldCBjYWxsZWQgd2hpbGUgdGhlIGNvbnRleHQgaXMgc3RvcHBlZC4KKworICAgICAg ICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIG5vdCBjcmFzaGluZyBhbnltb3JlLCBpbiBwYXJ0 aWN1bGFyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2VydmljZS13b3JrZXJzL3Nl cnZpY2Utd29ya2VyL3NraXAtd2FpdGluZy5odHRwcy5odG1sLgorCisgICAgICAgICogd29ya2Vy cy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6Om5vdGlmeVJlZ2lzdHJhdGlv bklzU2V0dGxlZCk6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpz dG9wKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5o OgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJKb2I6OmNhbmNlbFBlbmRpbmdMb2FkKToKKyAgICAg ICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpvYi5oOgorICAgICAgICAoV2ViQ29y ZTo6U2VydmljZVdvcmtlckpvYjo6aXNMb2FkaW5nIGNvbnN0KToKKwogMjAxOS0wMi0yNyAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIExlZXRDb2Rl IEZldGNoUmVxdWVzdCBxdWlyawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwCmluZGV4IDY0NGMwNWEyMDgxNDY2 ZjVhMDEzZGJmOTU2ZTczNjE0Y2JjNmNiNDcuLmRlZjQxYzE1ZDdhNTY4NjU2M2I1MWRhZTM5YzU5 OWQ5ZTg4YWM4NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9T ZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3Nl cnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5jcHAKQEAgLTQyMywxMCArNDIzLDYgQEAgdm9p ZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpqb2JSZXNvbHZlZFdpdGhSZWdpc3RyYXRpb24oU2Vy dmljZVdvcmtlckpvYiYgam9iLAogI2VuZGlmCiAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShqb2Iu aGFzUHJvbWlzZSgpIHx8IGpvYi5kYXRhKCkudHlwZSA9PSBTZXJ2aWNlV29ya2VySm9iVHlwZTo6 VXBkYXRlLCAiT25seSBzb2Z0IHVwZGF0ZXMgaGF2ZSBubyBwcm9taXNlIik7CiAKLSAgICBhdXRv IGd1YXJkID0gV1RGOjptYWtlU2NvcGVFeGl0KFt0aGlzLCAmam9iXSB7Ci0gICAgICAgIGRlc3Ry b3lKb2Ioam9iKTsKLSAgICB9KTsKLQogICAgIGlmIChqb2IuZGF0YSgpLnR5cGUgPT0gU2Vydmlj ZVdvcmtlckpvYlR5cGU6OlJlZ2lzdGVyKQogICAgICAgICBDT05UQUlORVJfUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgiam9iUmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uOiBSZWdpc3RyYXRpb24gam9i ICUiIFBSSXU2NCAiIHN1Y2NlZWRlZCIsIGpvYi5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAg ICAgZWxzZSB7CkBAIC00MzQsMzIgKzQzMCwyOCBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWlu ZXI6OmpvYlJlc29sdmVkV2l0aFJlZ2lzdHJhdGlvbihTZXJ2aWNlV29ya2VySm9iJiBqb2IsCiAg ICAgICAgIENPTlRBSU5FUl9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJqb2JSZXNvbHZlZFdpdGhS ZWdpc3RyYXRpb246IFVwZGF0ZSBqb2IgJSIgUFJJdTY0ICIgc3VjY2VlZGVkIiwgam9iLmlkZW50 aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICB9CiAKLSAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4g bm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQ7Ci0gICAgaWYgKHNob3VsZE5vdGlmeVdoZW5SZXNv bHZlZCA9PSBTaG91bGROb3RpZnlXaGVuUmVzb2x2ZWQ6OlllcykgewotICAgICAgICBub3RpZnlX aGVuUmVzb2x2ZWRJZk5lZWRlZCA9IFtjb25uZWN0aW9uID0gbV9zd0Nvbm5lY3Rpb24sIHJlZ2lz dHJhdGlvbktleSA9IGRhdGEua2V5XSgpIG11dGFibGUgewotICAgICAgICAgICAgY2FsbE9uTWFp blRocmVhZChbY29ubmVjdGlvbiA9IFdURk1vdmUoY29ubmVjdGlvbiksIHJlZ2lzdHJhdGlvbktl eSA9IHJlZ2lzdHJhdGlvbktleS5pc29sYXRlZENvcHkoKV0gewotICAgICAgICAgICAgICAgIGNv bm5lY3Rpb24tPmRpZFJlc29sdmVSZWdpc3RyYXRpb25Qcm9taXNlKHJlZ2lzdHJhdGlvbktleSk7 Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgfTsKLSAgICB9CisgICAgYXV0byBndWFyZCA9IFdU Rjo6bWFrZVNjb3BlRXhpdChbdGhpcywgJmpvYl0geworICAgICAgICBkZXN0cm95Sm9iKGpvYik7 CisgICAgfSk7CisKKyAgICBhdXRvIG5vdGlmeUlmRXhpdEVhcmx5ID0gV1RGOjptYWtlU2NvcGVF eGl0KFt0aGlzLCAmZGF0YSwgJnNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZF0geworICAgICAgICBp ZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZDo6 WWVzKQorICAgICAgICAgICAgbm90aWZ5UmVnaXN0cmF0aW9uSXNTZXR0bGVkKGRhdGEua2V5KTsK KyAgICB9KTsKIAotICAgIGlmIChpc1N0b3BwZWQoKSkgewotICAgICAgICBpZiAobm90aWZ5V2hl blJlc29sdmVkSWZOZWVkZWQpCi0gICAgICAgICAgICBub3RpZnlXaGVuUmVzb2x2ZWRJZk5lZWRl ZCgpOworICAgIGlmIChpc1N0b3BwZWQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAg IGF1dG8gcHJvbWlzZSA9IGpvYi50YWtlUHJvbWlzZSgpOwotICAgIGlmICghcHJvbWlzZSkgewot ICAgICAgICBpZiAobm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQpCi0gICAgICAgICAgICBub3Rp ZnlXaGVuUmVzb2x2ZWRJZk5lZWRlZCgpOworICAgIGlmICghcHJvbWlzZSkKICAgICAgICAgcmV0 dXJuOwotICAgIH0KIAotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+cG9zdFRhc2soW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJv bWlzZSksIGpvYklkZW50aWZpZXIgPSBqb2IuaWRlbnRpZmllcigpLCBkYXRhID0gV1RGTW92ZShk YXRhKSwgbm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQgPSBXVEZNb3ZlKG5vdGlmeVdoZW5SZXNv bHZlZElmTmVlZGVkKV0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCkgbXV0YWJsZSB7 CisgICAgbm90aWZ5SWZFeGl0RWFybHkucmVsZWFzZSgpOworCisgICAgc2NyaXB0RXhlY3V0aW9u Q29udGV4dCgpLT5wb3N0VGFzayhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZlB0cjxTZXJ2aWNl V29ya2VyQ29udGFpbmVyPih0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGpvYklk ZW50aWZpZXIgPSBqb2IuaWRlbnRpZmllcigpLCBkYXRhID0gV1RGTW92ZShkYXRhKSwgc2hvdWxk Tm90aWZ5V2hlblJlc29sdmVkXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSBtdXRh YmxlIHsKICAgICAgICAgaWYgKGlzU3RvcHBlZCgpIHx8ICFjb250ZXh0LnNlc3Npb25JRCgpLmlz VmFsaWQoKSkgewotICAgICAgICAgICAgaWYgKG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKQot ICAgICAgICAgICAgICAgIG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKCk7CisgICAgICAgICAg ICBpZiAoc2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3VsZE5vdGlmeVdoZW5SZXNvbHZl ZDo6WWVzKQorICAgICAgICAgICAgICAgIG5vdGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxlZChkYXRh LmtleSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtNDY3LDkgKzQ1OSwx MCBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmpvYlJlc29sdmVkV2l0aFJlZ2lzdHJh dGlvbihTZXJ2aWNlV29ya2VySm9iJiBqb2IsCiAKICAgICAgICAgQ09OVEFJTkVSX1JFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoImpvYlJlc29sdmVkV2l0aFJlZ2lzdHJhdGlvbjogUmVzb2x2aW5nIHBy b21pc2UgZm9yIGpvYiAlIiBQUkl1NjQgIi4gUmVnaXN0cmF0aW9uIElEOiAlIiBQUkl1NjQsIGpv YklkZW50aWZpZXIudG9VSW50NjQoKSwgcmVnaXN0cmF0aW9uLT5pZGVudGlmaWVyKCkudG9VSW50 NjQoKSk7CiAKLSAgICAgICAgaWYgKG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKSB7Ci0gICAg ICAgICAgICBwcm9taXNlLT53aGVuU2V0dGxlZChbbm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQg PSBXVEZNb3ZlKG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKV0gewotICAgICAgICAgICAgICAg IG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKCk7CisgICAgICAgIGlmIChzaG91bGROb3RpZnlX aGVuUmVzb2x2ZWQgPT0gU2hvdWxkTm90aWZ5V2hlblJlc29sdmVkOjpZZXMpIHsKKyAgICAgICAg ICAgIG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25zLmFkZCgrK21fb25nb2luZ1NldHRsZWRS ZWdpc3RyYXRpb25Db3VudCwgcmVnaXN0cmF0aW9uLT5kYXRhKCkua2V5KTsKKyAgICAgICAgICAg IHByb21pc2UtPndoZW5TZXR0bGVkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90 ZWN0ZWRUaGlzKSwgaWRlbnRpZmllciA9IG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25Db3Vu dF0geworICAgICAgICAgICAgICAgIG5vdGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxlZChtX29uZ29p bmdTZXR0bGVkUmVnaXN0cmF0aW9ucy50YWtlKGlkZW50aWZpZXIpKTsKICAgICAgICAgICAgIH0p OwogICAgICAgICB9CiAKQEAgLTQ3Nyw2ICs0NzAsMTMgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29u dGFpbmVyOjpqb2JSZXNvbHZlZFdpdGhSZWdpc3RyYXRpb24oU2VydmljZVdvcmtlckpvYiYgam9i LAogICAgIH0pOwogfQogCit2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6Om5vdGlmeVJlZ2lz dHJhdGlvbklzU2V0dGxlZChjb25zdCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5JiByZWdp c3RyYXRpb25LZXkpCit7CisgICAgY2FsbE9uTWFpblRocmVhZChbY29ubmVjdGlvbiA9IG1fc3dD b25uZWN0aW9uLCByZWdpc3RyYXRpb25LZXkgPSByZWdpc3RyYXRpb25LZXkuaXNvbGF0ZWRDb3B5 KCldIHsKKyAgICAgICAgY29ubmVjdGlvbi0+ZGlkUmVzb2x2ZVJlZ2lzdHJhdGlvblByb21pc2Uo cmVnaXN0cmF0aW9uS2V5KTsKKyAgICB9KTsKK30KKwogdm9pZCBTZXJ2aWNlV29ya2VyQ29udGFp bmVyOjpqb2JSZXNvbHZlZFdpdGhVbnJlZ2lzdHJhdGlvblJlc3VsdChTZXJ2aWNlV29ya2VySm9i JiBqb2IsIGJvb2wgdW5yZWdpc3RyYXRpb25SZXN1bHQpCiB7CiAjaWZuZGVmIE5ERUJVRwpAQCAt NjQxLDkgKzY0MSwxNSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OnN0b3AoKQogICAg IG1fcmVhZHlQcm9taXNlID0gbnVsbHB0cjsKICAgICBhdXRvIGpvYk1hcCA9IFdURk1vdmUobV9q b2JNYXApOwogICAgIGZvciAoYXV0byYgb25nb2luZ0pvYiA6IGpvYk1hcC52YWx1ZXMoKSkgewor ICAgICAgICBpZiAoIW9uZ29pbmdKb2Iuam9iLT5pc0xvYWRpbmcoKSkKKyAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICBub3RpZnlGYWlsZWRGZXRjaGluZ1NjcmlwdCgqb25nb2luZ0pvYi5q b2IuZ2V0KCksIFJlc291cmNlRXJyb3IgeyBlcnJvckRvbWFpbldlYktpdEludGVybmFsLCAwLCBv bmdvaW5nSm9iLmpvYi0+ZGF0YSgpLnNjcmlwdFVSTCwgIkpvYiBjYW5jZWxsZWQiX3MsIFJlc291 cmNlRXJyb3I6OlR5cGU6OkNhbmNlbGxhdGlvbiB9KTsKICAgICAgICAgb25nb2luZ0pvYi5qb2It PmNhbmNlbFBlbmRpbmdMb2FkKCk7CiAgICAgfQorCisgICAgYXV0byByZWdpc3RyYXRpb25NYXAg PSBXVEZNb3ZlKG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25zKTsKKyAgICBmb3IgKGF1dG8m IHJlZ2lzdHJhdGlvbiA6IHJlZ2lzdHJhdGlvbk1hcC52YWx1ZXMoKSkKKyAgICAgICAgbm90aWZ5 UmVnaXN0cmF0aW9uSXNTZXR0bGVkKHJlZ2lzdHJhdGlvbik7CiB9CiAKIERvY3VtZW50T3JXb3Jr ZXJJZGVudGlmaWVyIFNlcnZpY2VXb3JrZXJDb250YWluZXI6OmNvbnRleHRJZGVudGlmaWVyKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2Vy Q29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtl ckNvbnRhaW5lci5oCmluZGV4IDYwODE4ZGQwNzVlYTVjNTExOThlMjFmYTBmOWUxMDk1M2FjYzhm ZGEuLjIxYWUwODdhMGM1YTJjZmE3MGNhZGVjZTg4ZGVhOGM5MDY2MDUzNWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWlu ZXIuaApAQCAtMTE0LDYgKzExNCw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkZXJlZkV2ZW50VGFy Z2V0KCkgZmluYWw7CiAgICAgdm9pZCBzdG9wKCkgZmluYWw7CiAKKyAgICB2b2lkIG5vdGlmeVJl Z2lzdHJhdGlvbklzU2V0dGxlZChjb25zdCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5Jik7 CisKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVhZHlQcm9taXNlPiBtX3JlYWR5UHJvbWlzZTsKIAog ICAgIE5hdmlnYXRvckJhc2UmIG1fbmF2aWdhdG9yOwpAQCAtMTQ1LDYgKzE0NywxMCBAQCBwcml2 YXRlOgogCiAgICAgdWludDY0X3QgbV9sYXN0UGVuZGluZ1Byb21pc2VJZGVudGlmaWVyIHsgMCB9 OwogICAgIEhhc2hNYXA8dWludDY0X3QsIHN0ZDo6dW5pcXVlX3B0cjxQZW5kaW5nUHJvbWlzZT4+ IG1fcGVuZGluZ1Byb21pc2VzOworCisgICAgdWludDY0X3QgbV9vbmdvaW5nU2V0dGxlZFJlZ2lz dHJhdGlvbkNvdW50IHsgMCB9OworICAgIEhhc2hNYXA8dWludDY0X3QsIFNlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25LZXk+IG1fb25nb2luZ1NldHRsZWRSZWdpc3RyYXRpb25zOworCiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L3NlcnZpY2UvU2VydmljZVdvcmtlckpvYi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3Nl cnZpY2UvU2VydmljZVdvcmtlckpvYi5jcHAKaW5kZXggZmJkNTJjZWRlMjg5OThhMTI4MmU1OTBl MjZjNTI5YjY5ZTVhNmJiMS4uMzNiMTA0YWRiNmU4Njg5ODNkYWUzMWFlMGRkNWQyYjI2NmJiYTg4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3Jr ZXJKb2IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29y a2VySm9iLmNwcApAQCAtMTY5LDggKzE2OSw2IEBAIHZvaWQgU2VydmljZVdvcmtlckpvYjo6bm90 aWZ5RmluaXNoZWQoKQogCiB2b2lkIFNlcnZpY2VXb3JrZXJKb2I6OmNhbmNlbFBlbmRpbmdMb2Fk KCkKIHsKLSAgICBpZiAoIW1fc2NyaXB0TG9hZGVyKQotICAgICAgICByZXR1cm47CiAgICAgbV9z Y3JpcHRMb2FkZXItPmNhbmNlbCgpOwogICAgIG1fc2NyaXB0TG9hZGVyID0gbnVsbHB0cjsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2Vy Sm9iLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpvYi5o CmluZGV4IDM5MTVmODVlNDY0NTY5YWM3NGI3M2Y3YzQ2NWQ2Njk0OTE3YjE2MmQuLjVjYWM0OTU5 YThlYmYyNmU3OTU5YTQwMzM0M2I4YzZhYjRlYzY5ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmgKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2IuaApAQCAtNzEsNiArNzEsOCBAQCBw dWJsaWM6CiAKICAgICB2b2lkIGNhbmNlbFBlbmRpbmdMb2FkKCk7CiAKKyAgICBib29sIGlzTG9h ZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fc2NyaXB0TG9hZGVyOyB9CisKIHByaXZhdGU6CiAgICAg Ly8gV29ya2VyU2NyaXB0TG9hZGVyQ2xpZW50CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2Uo dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJikgZmluYWw7 Cg== 363352 2019-03-01 12:06:51 -0800 2019-03-04 12:31:03 -0800 Patch bug-195195-20190301120650.patch text/plain 9700 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMjY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTI1MmMxMzcyMDkwZDM1 N2U4NjIzMTk0ZTFiNmI1MTgwZGY4ZTFmNC4uMjgzMjc3MzBlMzM0MjU3ZjBiY2RiYjg3YzkzM2U2 NTFkYWQ2YmJmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTAzLTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUgdG8gY29y cmVjdGx5IG5vdGlmeSBvZiBlbmQgb2YgYSBTZXJ2aWNlV29ya2VySm9iIHdoZW4gdGhlIGNvbnRl eHQgaXMgc3RvcHBlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk1MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQmVmb3JlIHRoZSBwYXRjaCwgd2Ugd2VyZSBub3RpZnlpbmcgdGhhdCBzb21lIGpvYnMg d2VyZSBmaW5pc2hlZCB0b28gYWdncmVzc2l2ZWx5IGF0IGNvbnRleHQgc3RvcCB0aW1lLgorICAg ICAgICBUaGlzIHdhcyBjb25mdXNpbmcgdGhlIE5ldHdvcmsgUHJvY2Vzcy4KKyAgICAgICAgT25s eSBub3RpZnkgc3VjaCBqb2JzIHRoYXQgaGF2ZSBwZW5kaW5nIGxvYWRzLgorICAgICAgICBJbXBy b3ZlIHRoZSB0cmFja2luZyBvZiBqb2JzIGRvaW5nIHJlZ2lzdHJhdGlvbiByZXNvbHV0aW9uIHRv IGVuc3VyZSB0aGUgTmV0d29yayBQcm9jZXNzIGdldHMgbm90aWZpZWQKKyAgICAgICAgaW4gY2Fz ZSBvZiBhIHJlZ2lzdHJhdGlvbiBwcm9taXNlIGJlaW5nIHJlc29sdmVkIGJ1dCB0aGUgc2V0dGxp bmcgY2FsbGJhY2sgYmVpbmcgbm90IHlldCBjYWxsZWQgd2hpbGUgdGhlIGNvbnRleHQgaXMgc3Rv cHBlZC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIG5vdCBjcmFzaGluZyBh bnltb3JlLCBpbiBwYXJ0aWN1bGFyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2Vy dmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3NraXAtd2FpdGluZy5odHRwcy5odG1sLgorCisg ICAgICAgICogd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVn aXN0cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6Om5v dGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxlZCk6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29y a2VyQ29udGFpbmVyOjpzdG9wKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdv cmtlckNvbnRhaW5lci5oOgorICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2Vy Sm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJKb2I6OmNhbmNlbFBlbmRp bmdMb2FkKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpvYi5oOgor ICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckpvYjo6aXNMb2FkaW5nIGNvbnN0KToKKwog MjAxOS0wMy0wMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg VXBkYXRlIG9yaWdpbnNNYXRjaCB0byBoYW5kbGUgdGhlIGNhc2Ugb2YgZmlsZSBvcmlnaW5zIHdo aWNoIGVuZm9yY2UgZmlsZSBwYXRoIHNlcGFyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcAppbmRleCBi MzdkYTQ3NWUyODYzNzM3Y2M3YjYyNzE1NmE5MWMzM2NlMDYxZWYxLi5lODY2ZmIyYjcyNWU2YjEx OTM1ODNmNmFmODdlOWU3OTk1ZGZhNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwCkBAIC00MjEsMTAg KzQyMSw2IEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVn aXN0cmF0aW9uKFNlcnZpY2VXb3JrZXJKb2ImIGpvYiwKICNlbmRpZgogICAgIEFTU0VSVF9XSVRI X01FU1NBR0Uoam9iLmhhc1Byb21pc2UoKSB8fCBqb2IuZGF0YSgpLnR5cGUgPT0gU2VydmljZVdv cmtlckpvYlR5cGU6OlVwZGF0ZSwgIk9ubHkgc29mdCB1cGRhdGVzIGhhdmUgbm8gcHJvbWlzZSIp OwogCi0gICAgYXV0byBndWFyZCA9IFdURjo6bWFrZVNjb3BlRXhpdChbdGhpcywgJmpvYl0gewot ICAgICAgICBkZXN0cm95Sm9iKGpvYik7Ci0gICAgfSk7Ci0KICAgICBpZiAoam9iLmRhdGEoKS50 eXBlID09IFNlcnZpY2VXb3JrZXJKb2JUeXBlOjpSZWdpc3RlcikKICAgICAgICAgQ09OVEFJTkVS X1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImpvYlJlc29sdmVkV2l0aFJlZ2lzdHJhdGlvbjogUmVn aXN0cmF0aW9uIGpvYiAlIiBQUkl1NjQgIiBzdWNjZWVkZWQiLCBqb2IuaWRlbnRpZmllcigpLnRv VUludDY0KCkpOwogICAgIGVsc2UgewpAQCAtNDMyLDMyICs0MjgsMjggQEAgdm9pZCBTZXJ2aWNl V29ya2VyQ29udGFpbmVyOjpqb2JSZXNvbHZlZFdpdGhSZWdpc3RyYXRpb24oU2VydmljZVdvcmtl ckpvYiYgam9iLAogICAgICAgICBDT05UQUlORVJfUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiam9i UmVzb2x2ZWRXaXRoUmVnaXN0cmF0aW9uOiBVcGRhdGUgam9iICUiIFBSSXU2NCAiIHN1Y2NlZWRl ZCIsIGpvYi5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAgfQogCi0gICAgc3RkOjpmdW5j dGlvbjx2b2lkKCk+IG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkOwotICAgIGlmIChzaG91bGRO b3RpZnlXaGVuUmVzb2x2ZWQgPT0gU2hvdWxkTm90aWZ5V2hlblJlc29sdmVkOjpZZXMpIHsKLSAg ICAgICAgbm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQgPSBbY29ubmVjdGlvbiA9IG1fc3dDb25u ZWN0aW9uLCByZWdpc3RyYXRpb25LZXkgPSBkYXRhLmtleV0oKSBtdXRhYmxlIHsKLSAgICAgICAg ICAgIGNhbGxPbk1haW5UaHJlYWQoW2Nvbm5lY3Rpb24gPSBXVEZNb3ZlKGNvbm5lY3Rpb24pLCBy ZWdpc3RyYXRpb25LZXkgPSByZWdpc3RyYXRpb25LZXkuaXNvbGF0ZWRDb3B5KCldIHsKLSAgICAg ICAgICAgICAgICBjb25uZWN0aW9uLT5kaWRSZXNvbHZlUmVnaXN0cmF0aW9uUHJvbWlzZShyZWdp c3RyYXRpb25LZXkpOwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH07Ci0gICAgfQorICAgIGF1 dG8gZ3VhcmQgPSBXVEY6Om1ha2VTY29wZUV4aXQoW3RoaXMsICZqb2JdIHsKKyAgICAgICAgZGVz dHJveUpvYihqb2IpOworICAgIH0pOworCisgICAgYXV0byBub3RpZnlJZkV4aXRFYXJseSA9IFdU Rjo6bWFrZVNjb3BlRXhpdChbdGhpcywgJmRhdGEsICZzaG91bGROb3RpZnlXaGVuUmVzb2x2ZWRd IHsKKyAgICAgICAgaWYgKHNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZCA9PSBTaG91bGROb3RpZnlX aGVuUmVzb2x2ZWQ6OlllcykKKyAgICAgICAgICAgIG5vdGlmeVJlZ2lzdHJhdGlvbklzU2V0dGxl ZChkYXRhLmtleSk7CisgICAgfSk7CiAKLSAgICBpZiAoaXNTdG9wcGVkKCkpIHsKLSAgICAgICAg aWYgKG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKQotICAgICAgICAgICAgbm90aWZ5V2hlblJl c29sdmVkSWZOZWVkZWQoKTsKKyAgICBpZiAoaXNTdG9wcGVkKCkpCiAgICAgICAgIHJldHVybjsK LSAgICB9CiAKICAgICBhdXRvIHByb21pc2UgPSBqb2IudGFrZVByb21pc2UoKTsKLSAgICBpZiAo IXByb21pc2UpIHsKLSAgICAgICAgaWYgKG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkKQotICAg ICAgICAgICAgbm90aWZ5V2hlblJlc29sdmVkSWZOZWVkZWQoKTsKKyAgICBpZiAoIXByb21pc2Up CiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKLSAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkt PnBvc3RUYXNrKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByb21pc2Ug PSBXVEZNb3ZlKHByb21pc2UpLCBqb2JJZGVudGlmaWVyID0gam9iLmlkZW50aWZpZXIoKSwgZGF0 YSA9IFdURk1vdmUoZGF0YSksIG5vdGlmeVdoZW5SZXNvbHZlZElmTmVlZGVkID0gV1RGTW92ZShu b3RpZnlXaGVuUmVzb2x2ZWRJZk5lZWRlZCldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRl eHQpIG11dGFibGUgeworICAgIG5vdGlmeUlmRXhpdEVhcmx5LnJlbGVhc2UoKTsKKworICAgIHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+cG9zdFRhc2soW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBS ZWZQdHI8U2VydmljZVdvcmtlckNvbnRhaW5lcj4odGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHBy b21pc2UpLCBqb2JJZGVudGlmaWVyID0gam9iLmlkZW50aWZpZXIoKSwgZGF0YSA9IFdURk1vdmUo ZGF0YSksIHNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZF0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg Y29udGV4dCkgbXV0YWJsZSB7CiAgICAgICAgIGlmIChpc1N0b3BwZWQoKSB8fCAhY29udGV4dC5z ZXNzaW9uSUQoKS5pc1ZhbGlkKCkpIHsKLSAgICAgICAgICAgIGlmIChub3RpZnlXaGVuUmVzb2x2 ZWRJZk5lZWRlZCkKLSAgICAgICAgICAgICAgICBub3RpZnlXaGVuUmVzb2x2ZWRJZk5lZWRlZCgp OworICAgICAgICAgICAgaWYgKHNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZCA9PSBTaG91bGROb3Rp ZnlXaGVuUmVzb2x2ZWQ6OlllcykKKyAgICAgICAgICAgICAgICBub3RpZnlSZWdpc3RyYXRpb25J c1NldHRsZWQoZGF0YS5rZXkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAg LTQ2NSw5ICs0NTcsMTAgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29udGFpbmVyOjpqb2JSZXNvbHZl ZFdpdGhSZWdpc3RyYXRpb24oU2VydmljZVdvcmtlckpvYiYgam9iLAogCiAgICAgICAgIENPTlRB SU5FUl9SRUxFQVNFX0xPR19JRl9BTExPV0VEKCJqb2JSZXNvbHZlZFdpdGhSZWdpc3RyYXRpb246 IFJlc29sdmluZyBwcm9taXNlIGZvciBqb2IgJSIgUFJJdTY0ICIuIFJlZ2lzdHJhdGlvbiBJRDog JSIgUFJJdTY0LCBqb2JJZGVudGlmaWVyLnRvVUludDY0KCksIHJlZ2lzdHJhdGlvbi0+aWRlbnRp ZmllcigpLnRvVUludDY0KCkpOwogCi0gICAgICAgIGlmIChub3RpZnlXaGVuUmVzb2x2ZWRJZk5l ZWRlZCkgewotICAgICAgICAgICAgcHJvbWlzZS0+d2hlblNldHRsZWQoW25vdGlmeVdoZW5SZXNv bHZlZElmTmVlZGVkID0gV1RGTW92ZShub3RpZnlXaGVuUmVzb2x2ZWRJZk5lZWRlZCldIHsKLSAg ICAgICAgICAgICAgICBub3RpZnlXaGVuUmVzb2x2ZWRJZk5lZWRlZCgpOworICAgICAgICBpZiAo c2hvdWxkTm90aWZ5V2hlblJlc29sdmVkID09IFNob3VsZE5vdGlmeVdoZW5SZXNvbHZlZDo6WWVz KSB7CisgICAgICAgICAgICBtX29uZ29pbmdTZXR0bGVkUmVnaXN0cmF0aW9ucy5hZGQoKyttX2xh c3RPbmdvaW5nU2V0dGxlZFJlZ2lzdHJhdGlvbklkZW50aWZpZXIsIHJlZ2lzdHJhdGlvbi0+ZGF0 YSgpLmtleSk7CisgICAgICAgICAgICBwcm9taXNlLT53aGVuU2V0dGxlZChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGlkZW50aWZpZXIgPSBtX2xhc3RPbmdv aW5nU2V0dGxlZFJlZ2lzdHJhdGlvbklkZW50aWZpZXJdIHsKKyAgICAgICAgICAgICAgICBub3Rp ZnlSZWdpc3RyYXRpb25Jc1NldHRsZWQobV9vbmdvaW5nU2V0dGxlZFJlZ2lzdHJhdGlvbnMudGFr ZShpZGVudGlmaWVyKSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCkBAIC00NzUsNiAr NDY4LDEzIEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoUmVn aXN0cmF0aW9uKFNlcnZpY2VXb3JrZXJKb2ImIGpvYiwKICAgICB9KTsKIH0KIAordm9pZCBTZXJ2 aWNlV29ya2VyQ29udGFpbmVyOjpub3RpZnlSZWdpc3RyYXRpb25Jc1NldHRsZWQoY29uc3QgU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbktleSYgcmVnaXN0cmF0aW9uS2V5KQoreworICAgIGNhbGxP bk1haW5UaHJlYWQoW2Nvbm5lY3Rpb24gPSBtX3N3Q29ubmVjdGlvbiwgcmVnaXN0cmF0aW9uS2V5 ID0gcmVnaXN0cmF0aW9uS2V5Lmlzb2xhdGVkQ29weSgpXSB7CisgICAgICAgIGNvbm5lY3Rpb24t PmRpZFJlc29sdmVSZWdpc3RyYXRpb25Qcm9taXNlKHJlZ2lzdHJhdGlvbktleSk7CisgICAgfSk7 Cit9CisKIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6am9iUmVzb2x2ZWRXaXRoVW5yZWdp c3RyYXRpb25SZXN1bHQoU2VydmljZVdvcmtlckpvYiYgam9iLCBib29sIHVucmVnaXN0cmF0aW9u UmVzdWx0KQogewogI2lmbmRlZiBOREVCVUcKQEAgLTYzOSw5ICs2MzksMTMgQEAgdm9pZCBTZXJ2 aWNlV29ya2VyQ29udGFpbmVyOjpzdG9wKCkKICAgICBtX3JlYWR5UHJvbWlzZSA9IG51bGxwdHI7 CiAgICAgYXV0byBqb2JNYXAgPSBXVEZNb3ZlKG1fam9iTWFwKTsKICAgICBmb3IgKGF1dG8mIG9u Z29pbmdKb2IgOiBqb2JNYXAudmFsdWVzKCkpIHsKLSAgICAgICAgbm90aWZ5RmFpbGVkRmV0Y2hp bmdTY3JpcHQoKm9uZ29pbmdKb2Iuam9iLmdldCgpLCBSZXNvdXJjZUVycm9yIHsgZXJyb3JEb21h aW5XZWJLaXRJbnRlcm5hbCwgMCwgb25nb2luZ0pvYi5qb2ItPmRhdGEoKS5zY3JpcHRVUkwsICJK b2IgY2FuY2VsbGVkIl9zLCBSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24gfSk7Ci0g ICAgICAgIG9uZ29pbmdKb2Iuam9iLT5jYW5jZWxQZW5kaW5nTG9hZCgpOworICAgICAgICBpZiAo b25nb2luZ0pvYi5qb2ItPmNhbmNlbFBlbmRpbmdMb2FkKCkpCisgICAgICAgICAgICBub3RpZnlG YWlsZWRGZXRjaGluZ1NjcmlwdCgqb25nb2luZ0pvYi5qb2IuZ2V0KCksIFJlc291cmNlRXJyb3Ig eyBlcnJvckRvbWFpbldlYktpdEludGVybmFsLCAwLCBvbmdvaW5nSm9iLmpvYi0+ZGF0YSgpLnNj cmlwdFVSTCwgIkpvYiBjYW5jZWxsZWQiX3MsIFJlc291cmNlRXJyb3I6OlR5cGU6OkNhbmNlbGxh dGlvbiB9KTsKICAgICB9CisKKyAgICBhdXRvIHJlZ2lzdHJhdGlvbk1hcCA9IFdURk1vdmUobV9v bmdvaW5nU2V0dGxlZFJlZ2lzdHJhdGlvbnMpOworICAgIGZvciAoYXV0byYgcmVnaXN0cmF0aW9u IDogcmVnaXN0cmF0aW9uTWFwLnZhbHVlcygpKQorICAgICAgICBub3RpZnlSZWdpc3RyYXRpb25J c1NldHRsZWQocmVnaXN0cmF0aW9uKTsKIH0KIAogRG9jdW1lbnRPcldvcmtlcklkZW50aWZpZXIg U2VydmljZVdvcmtlckNvbnRhaW5lcjo6Y29udGV4dElkZW50aWZpZXIoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaCBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmgK aW5kZXggNjA4MThkZDA3NWVhNWM1MTE5OGUyMWZhMGY5ZTEwOTUzYWNjOGZkYS4uOWY0Y2U5YjQ2 NTM0MDI0MDZmN2ExZWNkMDc4ZjVlZWM2OTU4MDVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5oCkBAIC0xMTQs NiArMTE0LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlcmVmRXZlbnRUYXJnZXQoKSBmaW5hbDsK ICAgICB2b2lkIHN0b3AoKSBmaW5hbDsKIAorICAgIHZvaWQgbm90aWZ5UmVnaXN0cmF0aW9uSXNT ZXR0bGVkKGNvbnN0IFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXkmKTsKKwogICAgIHN0ZDo6 dW5pcXVlX3B0cjxSZWFkeVByb21pc2U+IG1fcmVhZHlQcm9taXNlOwogCiAgICAgTmF2aWdhdG9y QmFzZSYgbV9uYXZpZ2F0b3I7CkBAIC0xNDUsNiArMTQ3LDEwIEBAIHByaXZhdGU6CiAKICAgICB1 aW50NjRfdCBtX2xhc3RQZW5kaW5nUHJvbWlzZUlkZW50aWZpZXIgeyAwIH07CiAgICAgSGFzaE1h cDx1aW50NjRfdCwgc3RkOjp1bmlxdWVfcHRyPFBlbmRpbmdQcm9taXNlPj4gbV9wZW5kaW5nUHJv bWlzZXM7CisKKyAgICB1aW50NjRfdCBtX2xhc3RPbmdvaW5nU2V0dGxlZFJlZ2lzdHJhdGlvbklk ZW50aWZpZXIgeyAwIH07CisgICAgSGFzaE1hcDx1aW50NjRfdCwgU2VydmljZVdvcmtlclJlZ2lz dHJhdGlvbktleT4gbV9vbmdvaW5nU2V0dGxlZFJlZ2lzdHJhdGlvbnM7CisKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9TZXJ2aWNlV29ya2VySm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vydmlj ZS9TZXJ2aWNlV29ya2VySm9iLmNwcAppbmRleCAwMDliOTg3N2I2NjMwNWE0ZGEzMTA0YTA1YjE0 YzYyYjc3ZTBlZWY1Li5mMGIxNDZhNTI2MjdhMDg3OWVmZjRlOWRlZjAwNGQ4NGVlZjA5NDM1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpv Yi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJK b2IuY3BwCkBAIC0xNjYsMTIgKzE2NiwxNCBAQCB2b2lkIFNlcnZpY2VXb3JrZXJKb2I6Om5vdGlm eUZpbmlzaGVkKCkKICAgICBtX2NsaWVudC5qb2JGYWlsZWRMb2FkaW5nU2NyaXB0KCp0aGlzLCBl cnJvciwgRXhjZXB0aW9uIHsgZXJyb3IuaXNBY2Nlc3NDb250cm9sKCkgPyBTZWN1cml0eUVycm9y IDogVHlwZUVycm9yLCAiU2NyaXB0IGxvYWQgZmFpbGVkIl9zIH0pOwogfQogCi12b2lkIFNlcnZp Y2VXb3JrZXJKb2I6OmNhbmNlbFBlbmRpbmdMb2FkKCkKK2Jvb2wgU2VydmljZVdvcmtlckpvYjo6 Y2FuY2VsUGVuZGluZ0xvYWQoKQogewogICAgIGlmICghbV9zY3JpcHRMb2FkZXIpCi0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgbV9zY3JpcHRMb2FkZXItPmNh bmNlbCgpOwogICAgIG1fc2NyaXB0TG9hZGVyID0gbnVsbHB0cjsKKyAgICByZXR1cm4gdHJ1ZTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2IuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtl cnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iLmgKaW5kZXggMzkxNWY4NWU0NjQ1NjlhYzc0Yjcz ZjdjNDY1ZDY2OTQ5MTdiMTYyZC4uYjU1YWI5NThlODlkYTY0NjhjY2RhODA5MWI4Nzk0ZmFmODFi NjkxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VX b3JrZXJKb2IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdv cmtlckpvYi5oCkBAIC02OSw3ICs2OSw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IERvY3VtZW50 T3JXb3JrZXJJZGVudGlmaWVyJiBjb250ZXh0SWRlbnRpZmllcigpIHsgcmV0dXJuIG1fY29udGV4 dElkZW50aWZpZXI7IH0KIAotICAgIHZvaWQgY2FuY2VsUGVuZGluZ0xvYWQoKTsKKyAgICBib29s IGNhbmNlbFBlbmRpbmdMb2FkKCk7CiAKIHByaXZhdGU6CiAgICAgLy8gV29ya2VyU2NyaXB0TG9h ZGVyQ2xpZW50Cg==