206570 2020-01-21 21:12:56 -0800 [LFC] Do not create a FormattingContext unless there's content to layout. 2020-01-22 09:07:33 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1609447 0 zalan 2020-01-21 21:12:56 -0800 ssia 1609448 1 webkit-bug-importer 2020-01-21 21:13:21 -0800 <rdar://problem/58785735> 1609449 2 388396 zalan 2020-01-21 21:15:54 -0800 Created attachment 388396 Patch 1609524 3 388396 koivisto 2020-01-22 07:02:54 -0800 Comment on attachment 388396 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388396&action=review > Source/WebCore/layout/FormattingContext.cpp:171 > auto formattingContext = LayoutContext::createFormattingContext(outOfFlowRootContainer, layoutState()); > - formattingContext->layoutInFlowContent(invalidationState, Geometry::horizontalConstraintsForInFlow(outOfFlowRootDisplayBox), Geometry::verticalConstraintsForInFlow(outOfFlowRootDisplayBox)); > + if (outOfFlowRootContainer.hasInFlowOrFloatingChild()) > + formattingContext->layoutInFlowContent(invalidationState, Geometry::horizontalConstraintsForInFlow(outOfFlowRootDisplayBox), Geometry::verticalConstraintsForInFlow(outOfFlowRootDisplayBox)); You are still creating the formatting context. 1609528 4 388396 zalan 2020-01-22 07:26:31 -0800 Comment on attachment 388396 Patch Oops 1609541 5 388421 zalan 2020-01-22 07:59:51 -0800 Created attachment 388421 Patch 1609542 6 388421 koivisto 2020-01-22 08:02:32 -0800 Comment on attachment 388421 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388421&action=review > Source/WebCore/ChangeLog:9 > + We still construct "no-op" FormattingContexts through the computeIntrinsicWidth* codepath. But why? 1609544 7 388422 zalan 2020-01-22 08:09:19 -0800 Created attachment 388422 Patch 1609545 8 zalan 2020-01-22 08:10:00 -0800 (In reply to Antti Koivisto from comment #6) > Comment on attachment 388421 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388421&action=review > > > Source/WebCore/ChangeLog:9 > > + We still construct "no-op" FormattingContexts through the computeIntrinsicWidth* codepath. > > But why? bug 206581. -and updated the changelog. 1609573 9 commit-queue 2020-01-22 09:06:59 -0800 The commit-queue encountered the following flaky tests while processing attachment 388422: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1609574 10 388422 commit-queue 2020-01-22 09:07:32 -0800 Comment on attachment 388422 Patch Clearing flags on attachment: 388422 Committed r254927: <https://trac.webkit.org/changeset/254927> 1609575 11 commit-queue 2020-01-22 09:07:33 -0800 All reviewed patches have been landed. Closing bug. 388396 2020-01-21 21:15:54 -0800 2020-01-22 07:26:31 -0800 Patch bug-206570-20200121211553.patch text/plain 9343 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYxMTY0ZGU5OTFlNzc0 ZmEyMDY4NDIwYjUzOTcxMmM3MDA5ZjM3Ny4uNDI0MWY3ZmY1MThjOWQ3ZDkzZDFiYWJkNDE2YWMw MDYyOTk4ZWIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAxLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGNyZWF0 ZSBhIEZvcm1hdHRpbmdDb250ZXh0IHVubGVzcyB0aGVyZSdzIGNvbnRlbnQgdG8gbGF5b3V0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NTcwCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODc4NTczNT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpGb3JtYXR0aW5n Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRPdXRPZkZsb3dDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCk6CisgICAgICAgICogbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVDZWxsQm94KToK KwogMjAyMC0wMS0yMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0JGQ10gTm8gbmVlZCB0byBzcGVjaWFsIGNhc2UgZm9ybWF0dGluZyBjb250ZXh0IHJv b3QgbGF5b3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApp bmRleCA4NjI2MjljMDVmODRlMjdlNGM2MmE0MGRjZTNjMDQ0NTQ5Mjc0MzA2Li42YzQxOGY4ZGMy M2E0NzUyZjFjZDQ2NmUzY2Y4YjRjMDBlODM5Y2EzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQ5LDYgKzQ5LDcgQEAgRm9ybWF0dGluZ0NvbnRl eHQ6OkZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ0NvbnRleHRS b290LCBGb3IKICAgICA6IG1fcm9vdChtYWtlV2Vha1B0cihmb3JtYXR0aW5nQ29udGV4dFJvb3Qp KQogICAgICwgbV9mb3JtYXR0aW5nU3RhdGUoZm9ybWF0dGluZ1N0YXRlKQogeworICAgIEFTU0VS VChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaGFzQ2hpbGQoKSk7CiAjaWZuZGVmIE5ERUJVRwogICAg IGxheW91dFN0YXRlKCkucmVnaXN0ZXJGb3JtYXR0aW5nQ29udGV4dCgqdGhpcyk7CiAjZW5kaWYK QEAgLTE2NiwxMCArMTY3LDEyIEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9m Rmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0CiAgICAgICAgIGlm IChpczxDb250YWluZXI+KCpvdXRPZkZsb3dCb3gpKSB7CiAgICAgICAgICAgICBhdXRvJiBvdXRP ZkZsb3dSb290Q29udGFpbmVyID0gZG93bmNhc3Q8Q29udGFpbmVyPigqb3V0T2ZGbG93Qm94KTsK ICAgICAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nQ29udGV4dChvdXRPZkZsb3dSb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgp KTsKLSAgICAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGlu dmFsaWRhdGlvblN0YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93 KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNG b3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpKTsKKyAgICAgICAgICAgIGlmIChvdXRP ZkZsb3dSb290Q29udGFpbmVyLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQorICAgICAgICAg ICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlv blN0YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxv d1Jvb3REaXNwbGF5Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3co b3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpKTsKICAgICAgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dW ZXJ0aWNhbEdlb21ldHJ5KG91dE9mRmxvd1Jvb3RDb250YWluZXIsIGhvcml6b250YWxDb25zdHJh aW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAKLSAgICAgICAgICAgIGZvcm1hdHRpbmdDb250 ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBHZW9tZXRyeTo6 aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSwg R2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3Bs YXlCb3gpKTsKKyAgICAgICAgICAgIGlmIChvdXRPZkZsb3dSb290Q29udGFpbmVyLmhhc0NoaWxk KCkpCisgICAgICAgICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0Nv bnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNG b3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpLCBHZW9tZXRyeTo6dmVydGljYWxDb25z dHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJveCkpOwogICAgICAgICB9IGVs c2UKICAgICAgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KCpvdXRPZkZs b3dCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggOGJlY2JjMjkxMzYwMjMzMWI5 NzFiNzBkNTNkYTA2NjY5OTM3MDQ5OS4uYTU2MTYzMTQ4NjU0MTgzNWFkZDVjM2I5ZjdjMmQ3NDVl NmQyNTY2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC01OSw2ICs1OSw3 IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZh bGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAgICAgLy8gVmVydGljYWwgbWFyZ2lucyBiZXR3 ZWVuIGFkamFjZW50IGJsb2NrLWxldmVsIGJveGVzIGluIGEgYmxvY2sgZm9ybWF0dGluZyBjb250 ZXh0IGNvbGxhcHNlLgogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91 dCwgc3RyZWFtIDw8ICJbU3RhcnRdIC0+IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3Jt YXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8ICIpIik7CiAgICAgYXV0byYgZm9ybWF0dGluZ1Jv b3QgPSByb290KCk7CisgICAgQVNTRVJUKGZvcm1hdHRpbmdSb290Lmhhc0luRmxvd09yRmxvYXRp bmdDaGlsZCgpKTsKICAgICBhdXRvIGZsb2F0aW5nQ29udGV4dCA9IEZsb2F0aW5nQ29udGV4dCB7 IGZvcm1hdHRpbmdSb290LCAqdGhpcywgZm9ybWF0dGluZ1N0YXRlKCkuZmxvYXRpbmdTdGF0ZSgp IH07CiAKICAgICBMYXlvdXRRdWV1ZSBsYXlvdXRRdWV1ZTsKQEAgLTE0OCw3ICsxNDksNyBAQCB2 b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0 aW9uU3RhdGUmIGludmFsaWRhdGlvbgogCiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFi bGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIC8vIE5vdyB0aGF0 IHdlIGNvbXB1dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBjYW4gbGF5b3V0IHRoZSBvdXQtb2Yt ZmxvdyBkZXNjZW5kYW50cy4KLSAgICAgICAgICAgICAgICBpZiAoaXM8Q29udGFpbmVyPihsYXlv dXRCb3gpKSB7CisgICAgICAgICAgICAgICAgaWYgKGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSAm JiBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzQ2hpbGQoKSkgewogICAgICAgICAg ICAgICAgICAgICBhdXRvJiByb290RGlzcGxheUJveCA9IGdlb21ldHJ5Rm9yQm94KGxheW91dEJv eCk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0 T2ZGbG93ID0gIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cocm9v dERpc3BsYXlCb3gpOwogICAgICAgICAgICAgICAgICAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWlu dHNGb3JPdXRPZkZsb3cgPSBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxv dyhyb290RGlzcGxheUJveCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5k ZXggY2I2NTYzN2ViMjJiMDIzMDBhODI2ZGEyMWI0NGVmMTZlNjFmOGY3Yi4uZTc4OTA2MjcxYTQ3 NDkyZGM2NzYyNWQ1NWM2NzQ5OTU3MDFhODUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtNjgsMTEgKzY4LDEwIEBAIHN0YXRpYyBpbmxpbmUgY29uc3QgQm94KiBu ZXh0SW5QcmVPcmRlcihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29udGFpbmVyJiBzCiAK IHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxp ZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0YXRlLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWlu dHMmIGhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgVmVydGljYWxDb25zdHJhaW50cyYgdmVy dGljYWxDb25zdHJhaW50cykKIHsKLSAgICBpZiAoIXJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5n Q2hpbGQoKSkKLSAgICAgICAgcmV0dXJuOworICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5n Q29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbU3RhcnRdIC0+IGlubGluZSBmb3JtYXR0aW5nIGNv bnRleHQgLT4gZm9ybWF0dGluZyByb290KCIgPDwgJnJvb3QoKSA8PCAiKSIpOworICAgIEFTU0VS VChyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpOwogCiAgICAgaW52YWxpZGF0ZUZv cm1hdHRpbmdTdGF0ZShpbnZhbGlkYXRpb25TdGF0ZSk7Ci0gICAgTE9HX1dJVEhfU1RSRUFNKEZv cm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltTdGFydF0gLT4gaW5saW5lIGZvcm1h dHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8ICIpIik7CiAg ICAgYXV0byogbGF5b3V0Qm94ID0gcm9vdCgpLmZpcnN0SW5GbG93T3JGbG9hdGluZ0NoaWxkKCk7 CiAgICAgLy8gMS4gVmlzaXQgZWFjaCBpbmxpbmUgYm94IGFuZCBwYXJ0aWFsbHkgY29tcHV0ZSB0 aGVpciBnZW9tZXRyeSAobWFyZ2lucywgcGFkZGluZ3MgYW5kIGJvcmRlcnMpLgogICAgIC8vIDIu IENvbGxlY3QgdGhlIGlubGluZSBpdGVtcyAoZmxhdHRlbiB0aGUgdGhlIGxheW91dCB0cmVlKSBh bmQgcGxhY2UgdGhlbSBvbiBsaW5lcyBpbiBiaWRpcmVjdGlvbmFsIG9yZGVyLiAKQEAgLTEzOSwx NCArMTM4LDE2IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRp bmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGZvcm1hdHRpbmdDCiAgICAgaWYgKGlzPENvbnRhaW5l cj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSkgewogICAgICAgICBhdXRvJiByb290Q29udGFpbmVy ID0gZG93bmNhc3Q8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3QpOwogICAgICAgICBh dXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0Nv bnRleHQocm9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7Ci0gICAgICAgIGZvcm1hdHRpbmdD b250ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFs Q29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOworICAgICAgICBpZiAocm9vdENvbnRh aW5lci5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKKyAgICAgICAgICAgIGZvcm1hdHRpbmdD b250ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFs Q29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwogICAgICAgICAvLyBDb21lIGJhY2sg YW5kIGZpbmFsaXplIHRoZSByb290J3MgaGVpZ2h0IGFuZCBtYXJnaW4uCiAgICAgICAgIGNvbXB1 dGVIZWlnaHRBbmRNYXJnaW4ocm9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsK ICAgICAgICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNh biBnbyBiYWNrIGFuZCBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCiAgICAgICAgIGF1 dG8mIHJvb3RDb250YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gocm9vdENvbnRhaW5l cik7CiAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gR2Vv bWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290Q29udGFpbmVyRGlz cGxheUJveCk7CiAgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyA9 IEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KHJvb3RDb250YWluZXJE aXNwbGF5Qm94KTsKLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0Nv bnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxv dywgdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyk7CisgICAgICAgIGlmIChyb290Q29u dGFpbmVyLmhhc0NoaWxkKCkpCisgICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0 T3V0T2ZGbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgaG9yaXpvbnRhbENvbnN0cmFpbnRz Rm9yT3V0T2ZGbG93LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KTsKICAgICB9IGVs c2UKICAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3Qs IGhvcml6b250YWxDb25zdHJhaW50cyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNw cAppbmRleCBkZTIxYTk5ZDlmY2Y3NWEwMGMzZGE2ZTM5ZmVjMTM4ZTJmODAwMzBmLi5kMmVjNjE5 OGNhZGU1NDc3ZjUyMTI5MGI5ZGFjOWUxZmFkZTJiYzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dFRhYmxlQ2VsbEJveChjb25zdCBCb3gmIGNlbGxMYXlvdXRCb3gsIGNvbnN0CiAg ICAgY2VsbERpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKGNvbHVtbi5sb2dpY2FsV2lkdGgo KSAtIGNlbGxEaXNwbGF5Qm94Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCkpOwog CiAgICAgQVNTRVJUKGNlbGxMYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0KCkpOwotICAgIGlmIChpczxDb250YWluZXI+KGNlbGxMYXlvdXRCb3gpKQorICAgIGlmIChp czxDb250YWluZXI+KGNlbGxMYXlvdXRCb3gpICYmIGRvd25jYXN0PENvbnRhaW5lcj4oY2VsbExh eW91dEJveCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCiAgICAgICAgIExheW91dENvbnRl eHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGRvd25jYXN0PENvbnRhaW5lcj4oY2VsbExheW91 dEJveCksIGxheW91dFN0YXRlKCkpLT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0 YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KGNlbGxEaXNwbGF5 Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3coY2VsbERpc3BsYXlC b3gpKTsKICAgICBjZWxsRGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0p OwogICAgIGNlbGxEaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQoZ2VvbWV0cnkoKS50YWJs ZUNlbGxIZWlnaHRBbmRNYXJnaW4oY2VsbExheW91dEJveCkuY29udGVudEhlaWdodCk7Cg== 388421 2020-01-22 07:59:51 -0800 2020-01-22 08:09:17 -0800 Patch bug-206570-20200122075950.patch text/plain 10641 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY2YjBlMGExM2U0MDgy YzAzZjlmNjFhZGJmNjAxMWM0MGVlYTM4Ny4uZTc4Njc3MDM2OGZmM2EwYjI2MTI1YzNkM2M0OGIy NWUyYjI0MzUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGNyZWF0 ZSBhIEZvcm1hdHRpbmdDb250ZXh0IHVubGVzcyB0aGVyZSdzIGNvbnRlbnQgdG8gbGF5b3V0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NTcwCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODc4NTczNT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBzdGlsbCBjb25zdHJ1Y3QgIm5vLW9wIiBGb3Jt YXR0aW5nQ29udGV4dHMgdGhyb3VnaCB0aGUgY29tcHV0ZUludHJpbnNpY1dpZHRoKiBjb2RlcGF0 aC4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpGb3JtYXR0aW5nQ29udGV4dCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZs b3dDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dEZvcm1hdHRpbmdDb250ZXh0Um9vdCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGlu Zy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVDZWxsQm94KToKKwogMjAyMC0wMS0y MiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ10g Tm8gbmVlZCB0byBzcGVjaWFsIGNhc2UgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QgbGF5b3V0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4NjI2Mjlj MDVmODRlMjdlNGM2MmE0MGRjZTNjMDQ0NTQ5Mjc0MzA2Li4yZjM4NTRjMzVkMjFkMjE2NTA5NjU4 MjUyNTMzNjgxZjdhYjA3NjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTE2MywxNSArMTYzLDE3IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dE91dE9mRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0 CiAgICAgICAgIGF1dG8mIG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3go Km91dE9mRmxvd0JveCk7CiAgICAgICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKCpvdXRPZkZs b3dCb3gsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cob3V0T2ZGbG93 Um9vdERpc3BsYXlCb3gpKTsKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9t ZXRyeSgqb3V0T2ZGbG93Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwotICAgICAgICBpZiAo aXM8Q29udGFpbmVyPigqb3V0T2ZGbG93Qm94KSkgewotICAgICAgICAgICAgYXV0byYgb3V0T2ZG bG93Um9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCk7Ci0g ICAgICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQob3V0T2ZGbG93Um9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7 Ci0gICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZh bGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhv dXRPZkZsb3dSb290RGlzcGxheUJveCksIEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9y SW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSk7Ci0gICAgICAgICAgICBjb21wdXRlT3V0 T2ZGbG93VmVydGljYWxHZW9tZXRyeShvdXRPZkZsb3dSb290Q29udGFpbmVyLCBob3Jpem9udGFs Q29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwotCi0gICAgICAgICAgICBmb3JtYXR0 aW5nQ29udGV4dC0+bGF5b3V0T3V0T2ZGbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2Vv bWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxh eUJveCksIEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jv b3REaXNwbGF5Qm94KSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICBpZiAoIWlzPENvbnRhaW5l cj4oKm91dE9mRmxvd0JveCkgfHwgIWRvd25jYXN0PENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCku aGFzQ2hpbGQoKSkgewogICAgICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0 cnkoKm91dE9mRmxvd0JveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFp bnRzKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgYXV0byYg b3V0T2ZGbG93Um9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4oKm91dE9mRmxvd0Jv eCk7CisgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nQ29udGV4dChvdXRPZkZsb3dSb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgp KTsKKyAgICAgICAgaWYgKG91dE9mRmxvd1Jvb3RDb250YWluZXIuaGFzSW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpCisgICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29u dGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zv ckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJveCksIEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0 cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSk7CisgICAgICAgIGNvbXB1 dGVPdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KG91dE9mRmxvd1Jvb3RDb250YWluZXIsIGhvcml6 b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CisgICAgICAgIGZvcm1hdHRp bmdDb250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBHZW9t ZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5 Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3cob3V0T2ZGbG93Um9v dERpc3BsYXlCb3gpKTsKICAgICB9CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250 ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIkVuZDogbGF5b3V0IG91dC1vZi1mbG93IGNvbnRlbnQgLT4g Y29udGV4dDogIiA8PCAmbGF5b3V0U3RhdGUoKSA8PCAiIHJvb3Q6ICIgPDwgJnJvb3QoKSk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4YmVjYmMyOTEzNjAyMzMxYjk3 MWI3MGQ1M2RhMDY2Njk5MzcwNDk5Li5hNTYxNjMxNDg2NTQxODM1YWRkNWMzYjlmN2MyZDc0NWU2 ZDI1NjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU5LDYgKzU5LDcg QEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFs aWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAgICAvLyBWZXJ0aWNhbCBtYXJnaW5zIGJldHdl ZW4gYWRqYWNlbnQgYmxvY2stbGV2ZWwgYm94ZXMgaW4gYSBibG9jayBmb3JtYXR0aW5nIGNvbnRl eHQgY29sbGFwc2UuCiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0 LCBzdHJlYW0gPDwgIltTdGFydF0gLT4gYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IC0+IGZvcm1h dHRpbmcgcm9vdCgiIDw8ICZyb290KCkgPDwgIikiKTsKICAgICBhdXRvJiBmb3JtYXR0aW5nUm9v dCA9IHJvb3QoKTsKKyAgICBBU1NFUlQoZm9ybWF0dGluZ1Jvb3QuaGFzSW5GbG93T3JGbG9hdGlu Z0NoaWxkKCkpOwogICAgIGF1dG8gZmxvYXRpbmdDb250ZXh0ID0gRmxvYXRpbmdDb250ZXh0IHsg Zm9ybWF0dGluZ1Jvb3QsICp0aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkg fTsKIAogICAgIExheW91dFF1ZXVlIGxheW91dFF1ZXVlOwpAQCAtMTQ4LDcgKzE0OSw3IEBAIHZv aWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRp b25TdGF0ZSYgaW52YWxpZGF0aW9uCiAKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJs aXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gTm93IHRoYXQg d2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNhbiBsYXlvdXQgdGhlIG91dC1vZi1m bG93IGRlc2NlbmRhbnRzLgotICAgICAgICAgICAgICAgIGlmIChpczxDb250YWluZXI+KGxheW91 dEJveCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoaXM8Q29udGFpbmVyPihsYXlvdXRCb3gpICYm IGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5oYXNDaGlsZCgpKSB7CiAgICAgICAgICAg ICAgICAgICAgIGF1dG8mIHJvb3REaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94 KTsKICAgICAgICAgICAgICAgICAgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRP ZkZsb3cgPSAgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290 RGlzcGxheUJveCk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50 c0Zvck91dE9mRmxvdyA9IEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93 KHJvb3REaXNwbGF5Qm94KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRl eCBjYjY1NjM3ZWIyMmIwMjMwMGE4MjZkYTIxYjQ0ZWYxNmU2MWY4ZjdiLi4zNzJjZjRhOWY2ZmUy MDcwY2Q3NzcyNDU2MGRiZGNkN2Q0Y2M0NWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwCkBAIC02OCwxMSArNjgsMTAgQEAgc3RhdGljIGlubGluZSBjb25zdCBCb3gqIG5l eHRJblByZU9yZGVyKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBDb250YWluZXImIHMKIAog dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlk YXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50 cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBWZXJ0aWNhbENvbnN0cmFpbnRzJiB2ZXJ0 aWNhbENvbnN0cmFpbnRzKQogewotICAgIGlmICghcm9vdCgpLmhhc0luRmxvd09yRmxvYXRpbmdD aGlsZCgpKQotICAgICAgICByZXR1cm47CisgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdD b250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltTdGFydF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29u dGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8ICIpIik7CisgICAgQVNTRVJU KHJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSk7CiAKICAgICBpbnZhbGlkYXRlRm9y bWF0dGluZ1N0YXRlKGludmFsaWRhdGlvblN0YXRlKTsKLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9y bWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW1N0YXJ0XSAtPiBpbmxpbmUgZm9ybWF0 dGluZyBjb250ZXh0IC0+IGZvcm1hdHRpbmcgcm9vdCgiIDw8ICZyb290KCkgPDwgIikiKTsKICAg ICBhdXRvKiBsYXlvdXRCb3ggPSByb290KCkuZmlyc3RJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKTsK ICAgICAvLyAxLiBWaXNpdCBlYWNoIGlubGluZSBib3ggYW5kIHBhcnRpYWxseSBjb21wdXRlIHRo ZWlyIGdlb21ldHJ5IChtYXJnaW5zLCBwYWRkaW5ncyBhbmQgYm9yZGVycykuCiAgICAgLy8gMi4g Q29sbGVjdCB0aGUgaW5saW5lIGl0ZW1zIChmbGF0dGVuIHRoZSB0aGUgbGF5b3V0IHRyZWUpIGFu ZCBwbGFjZSB0aGVtIG9uIGxpbmVzIGluIGJpZGlyZWN0aW9uYWwgb3JkZXIuIApAQCAtMTM1LDIw ICsxMzQsMjQgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRSb290KGNvbnN0IEJveCYgZm9ybWF0dGluZ0MKIAogICAgIGNvbXB1dGVCb3JkZXJB bmRQYWRkaW5nKGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsK ICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4oZm9ybWF0dGluZ0NvbnRleHRSb290LCBob3Jpem9u dGFsQ29uc3RyYWludHMpOworICAgIGlmICghaXM8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4 dFJvb3QpIHx8ICFkb3duY2FzdDxDb250YWluZXI+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCkuaGFz Q2hpbGQoKSkgeworICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGZvcm1hdHRpbmdDb250 ZXh0Um9vdCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K ICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25l IHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgaWYgKGlzPENvbnRhaW5lcj4oZm9ybWF0dGlu Z0NvbnRleHRSb290KSkgewotICAgICAgICBhdXRvJiByb290Q29udGFpbmVyID0gZG93bmNhc3Q8 Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3QpOwotICAgICAgICBhdXRvIGZvcm1hdHRp bmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQocm9vdENv bnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7CisgICAgYXV0byYgcm9vdENvbnRhaW5lciA9IGRvd25j YXN0PENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KTsKKyAgICBhdXRvIGZvcm1hdHRp bmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQocm9vdENv bnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7CisgICAgaWYgKHJvb3RDb250YWluZXIuaGFzSW5GbG93 T3JGbG9hdGluZ0NoaWxkKCkpCiAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRJbkZs b3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRp Y2FsQ29uc3RyYWludHMpOwotICAgICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXplIHRoZSBy b290J3MgaGVpZ2h0IGFuZCBtYXJnaW4uCi0gICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4o cm9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAgICAgICAgLy8gTm93IHRo YXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNhbiBnbyBiYWNrIGFuZCBsYXlv dXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCisgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6 ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFyZ2luLgorICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJn aW4ocm9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAvLyBOb3cgdGhh dCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGdvIGJhY2sgYW5kIGxheW91 dCB0aGUgb3V0LW9mLWZsb3cgY29udGVudC4KKyAgICBpZiAocm9vdENvbnRhaW5lci5oYXNDaGls ZCgpKSB7CiAgICAgICAgIGF1dG8mIHJvb3RDb250YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlG b3JCb3gocm9vdENvbnRhaW5lcik7CiAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRz Rm9yT3V0T2ZGbG93ID0gR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxv dyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7CiAgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJh aW50c0Zvck91dE9mRmxvdyA9IEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZG bG93KHJvb3RDb250YWluZXJEaXNwbGF5Qm94KTsKICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQt PmxheW91dE91dE9mRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25z dHJhaW50c0Zvck91dE9mRmxvdywgdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyk7Ci0g ICAgfSBlbHNlCi0gICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oZm9ybWF0dGluZ0NvbnRl eHRSb290LCBob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgIH0KIH0KIAogdm9pZCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhvcml6b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5KGNv bnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmIGhvcml6b250 YWxDb25zdHJhaW50cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGRlMjFh OTlkOWZjZjc1YTAwYzNkYTZlMzlmZWMxMzhlMmY4MDAzMGYuLmQyZWM2MTk4Y2FkZTU0NzdmNTIx MjkwYjlkYWM5ZTFmYWRlMmJjNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90 YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApA QCAtMTExLDcgKzExMSw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFi bGVDZWxsQm94KGNvbnN0IEJveCYgY2VsbExheW91dEJveCwgY29uc3QKICAgICBjZWxsRGlzcGxh eUJveC5zZXRDb250ZW50Qm94V2lkdGgoY29sdW1uLmxvZ2ljYWxXaWR0aCgpIC0gY2VsbERpc3Bs YXlCb3guaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSk7CiAKICAgICBBU1NFUlQo Y2VsbExheW91dEJveC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAg aWYgKGlzPENvbnRhaW5lcj4oY2VsbExheW91dEJveCkpCisgICAgaWYgKGlzPENvbnRhaW5lcj4o Y2VsbExheW91dEJveCkgJiYgZG93bmNhc3Q8Q29udGFpbmVyPihjZWxsTGF5b3V0Qm94KS5oYXNJ bkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKICAgICAgICAgTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9y bWF0dGluZ0NvbnRleHQoZG93bmNhc3Q8Q29udGFpbmVyPihjZWxsTGF5b3V0Qm94KSwgbGF5b3V0 U3RhdGUoKSktPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5 Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3coY2VsbERpc3BsYXlCb3gpLCBHZW9tZXRy eTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxvdyhjZWxsRGlzcGxheUJveCkpOwogICAgIGNl bGxEaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsgeyB9LCB7IH0gfSk7CiAgICAgY2VsbERp c3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChnZW9tZXRyeSgpLnRhYmxlQ2VsbEhlaWdodEFu ZE1hcmdpbihjZWxsTGF5b3V0Qm94KS5jb250ZW50SGVpZ2h0KTsK 388422 2020-01-22 08:09:19 -0800 2020-01-22 09:07:32 -0800 Patch bug-206570-20200122080918.patch text/plain 10668 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWEwMGQwZWRmYzEwMDVj MzgzMDIyMzlmYzdkNzQzZTI4Y2U0MTkyYi4uNDQ5ZDcxZDkzNTM5YzNmZWU2NGY3NWEyZWM2MThk NzZiYmQ0ZmVkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGNyZWF0 ZSBhIEZvcm1hdHRpbmdDb250ZXh0IHVubGVzcyB0aGVyZSdzIGNvbnRlbnQgdG8gbGF5b3V0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NTcwCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODc4NTczNT4KKworICAgICAgICBSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KKworICAgICAgICBXZSBzdGlsbCBjb25zdHJ1Y3QgIm5vLW9wIiBGb3Jt YXR0aW5nQ29udGV4dHMgdGhyb3VnaCB0aGUgY29tcHV0ZUludHJpbnNpY1dpZHRoKiBjb2RlcGF0 aCAoc2VlIHdlYmtpdC5vcmcvYi8yMDY1ODEpLgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRl eHQ6OkZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0NvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQp OgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dEluRmxvd0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KToKKyAgICAg ICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRU YWJsZUNlbGxCb3gpOgorCiAyMDIwLTAxLTIyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gRGlzYWJsZSBpbnRlZ3JhdGlvbiB0 byBzZWUgcGVyZm9ybWFuY2UgaW1wYWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmNwcAppbmRleCA4NjI2MjljMDVmODRlMjdlNGM2MmE0MGRjZTNjMDQ0NTQ5Mjc0 MzA2Li4yZjM4NTRjMzVkMjFkMjE2NTA5NjU4MjUyNTMzNjgxZjdhYjA3NjZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTE2MywxNSArMTYzLDE3 IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0NvbnRlbnQoSW52YWxp ZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0CiAgICAgICAgIGF1dG8mIG91dE9mRmxvd1Jvb3RE aXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3goKm91dE9mRmxvd0JveCk7CiAgICAgICAgIGNvbXB1 dGVCb3JkZXJBbmRQYWRkaW5nKCpvdXRPZkZsb3dCb3gsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29u c3RyYWludHNGb3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpKTsKICAgICAgICAgY29t cHV0ZU91dE9mRmxvd0hvcml6b250YWxHZW9tZXRyeSgqb3V0T2ZGbG93Qm94LCBob3Jpem9udGFs Q29uc3RyYWludHMpOwotICAgICAgICBpZiAoaXM8Q29udGFpbmVyPigqb3V0T2ZGbG93Qm94KSkg ewotICAgICAgICAgICAgYXV0byYgb3V0T2ZGbG93Um9vdENvbnRhaW5lciA9IGRvd25jYXN0PENv bnRhaW5lcj4oKm91dE9mRmxvd0JveCk7Ci0gICAgICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250 ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQob3V0T2ZGbG93Um9v dENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7Ci0gICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4 dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6 b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJveCksIEdlb21l dHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94 KSk7Ci0gICAgICAgICAgICBjb21wdXRlT3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShvdXRPZkZs b3dSb290Q29udGFpbmVyLCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWlu dHMpOwotCi0gICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0T3V0T2ZGbG93Q29u dGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zv ckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJveCksIEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0 cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSk7Ci0gICAgICAgIH0gZWxz ZQorICAgICAgICBpZiAoIWlzPENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCkgfHwgIWRvd25jYXN0 PENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCkuaGFzQ2hpbGQoKSkgewogICAgICAgICAgICAgY29t cHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoKm91dE9mRmxvd0JveCwgaG9yaXpvbnRhbENv bnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICB9CisKKyAgICAgICAgYXV0byYgb3V0T2ZGbG93Um9vdENvbnRhaW5lciA9IGRvd25j YXN0PENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCk7CisgICAgICAgIGF1dG8gZm9ybWF0dGluZ0Nv bnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChvdXRPZkZsb3dS b290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKKyAgICAgICAgaWYgKG91dE9mRmxvd1Jvb3RD b250YWluZXIuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCisgICAgICAgICAgICBmb3JtYXR0 aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0 cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJv eCksIEdlb21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93KG91dE9mRmxvd1Jvb3RE aXNwbGF5Qm94KSk7CisgICAgICAgIGNvbXB1dGVPdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KG91 dE9mRmxvd1Jvb3RDb250YWluZXIsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25z dHJhaW50cyk7CisgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250 ZW50KGludmFsaWRhdGlvblN0YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9y SW5GbG93KG91dE9mRmxvd1Jvb3REaXNwbGF5Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3Ry YWludHNGb3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpKTsKICAgICB9CiAgICAgTE9H X1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIkVuZDogbGF5 b3V0IG91dC1vZi1mbG93IGNvbnRlbnQgLT4gY29udGV4dDogIiA8PCAmbGF5b3V0U3RhdGUoKSA8 PCAiIHJvb3Q6ICIgPDwgJnJvb3QoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cAppbmRleCA4YmVjYmMyOTEzNjAyMzMxYjk3MWI3MGQ1M2RhMDY2Njk5MzcwNDk5Li5hNTYxNjMx NDg2NTQxODM1YWRkNWMzYjlmN2MyZDc0NWU2ZDI1NjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTU5LDYgKzU5LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAg ICAvLyBWZXJ0aWNhbCBtYXJnaW5zIGJldHdlZW4gYWRqYWNlbnQgYmxvY2stbGV2ZWwgYm94ZXMg aW4gYSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgY29sbGFwc2UuCiAgICAgTE9HX1dJVEhfU1RS RUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltTdGFydF0gLT4gYmxvY2sg Zm9ybWF0dGluZyBjb250ZXh0IC0+IGZvcm1hdHRpbmcgcm9vdCgiIDw8ICZyb290KCkgPDwgIiki KTsKICAgICBhdXRvJiBmb3JtYXR0aW5nUm9vdCA9IHJvb3QoKTsKKyAgICBBU1NFUlQoZm9ybWF0 dGluZ1Jvb3QuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpOwogICAgIGF1dG8gZmxvYXRpbmdD b250ZXh0ID0gRmxvYXRpbmdDb250ZXh0IHsgZm9ybWF0dGluZ1Jvb3QsICp0aGlzLCBmb3JtYXR0 aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkgfTsKIAogICAgIExheW91dFF1ZXVlIGxheW91dFF1 ZXVlOwpAQCAtMTQ4LDcgKzE0OSw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAKICAgICAg ICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAg ICAgICAgICAgICAgICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQs IHdlIGNhbiBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGRlc2NlbmRhbnRzLgotICAgICAgICAgICAg ICAgIGlmIChpczxDb250YWluZXI+KGxheW91dEJveCkpIHsKKyAgICAgICAgICAgICAgICBpZiAo aXM8Q29udGFpbmVyPihsYXlvdXRCb3gpICYmIGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94 KS5oYXNDaGlsZCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8mIHJvb3REaXNwbGF5Qm94 ID0gZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICAgICAgYXV0byBo b3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSAgR2VvbWV0cnk6Omhvcml6b250YWxD b25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290RGlzcGxheUJveCk7CiAgICAgICAgICAgICAgICAg ICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyA9IEdlb21ldHJ5Ojp2ZXJ0 aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KHJvb3REaXNwbGF5Qm94KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBjYjY1NjM3ZWIyMmIwMjMwMGE4MjZkYTIxYjQ0 ZWYxNmU2MWY4ZjdiLi4zNzJjZjRhOWY2ZmUyMDcwY2Q3NzcyNDU2MGRiZGNkN2Q0Y2M0NWUzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02OCwxMSArNjgsMTAgQEAg c3RhdGljIGlubGluZSBjb25zdCBCb3gqIG5leHRJblByZU9yZGVyKGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBjb25zdCBDb250YWluZXImIHMKIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUs IGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25z dCBWZXJ0aWNhbENvbnN0cmFpbnRzJiB2ZXJ0aWNhbENvbnN0cmFpbnRzKQogewotICAgIGlmICgh cm9vdCgpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQotICAgICAgICByZXR1cm47CisgICAg TE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltTdGFy dF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAm cm9vdCgpIDw8ICIpIik7CisgICAgQVNTRVJUKHJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hp bGQoKSk7CiAKICAgICBpbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKGludmFsaWRhdGlvblN0YXRl KTsKLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8 PCAiW1N0YXJ0XSAtPiBpbmxpbmUgZm9ybWF0dGluZyBjb250ZXh0IC0+IGZvcm1hdHRpbmcgcm9v dCgiIDw8ICZyb290KCkgPDwgIikiKTsKICAgICBhdXRvKiBsYXlvdXRCb3ggPSByb290KCkuZmly c3RJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKTsKICAgICAvLyAxLiBWaXNpdCBlYWNoIGlubGluZSBi b3ggYW5kIHBhcnRpYWxseSBjb21wdXRlIHRoZWlyIGdlb21ldHJ5IChtYXJnaW5zLCBwYWRkaW5n cyBhbmQgYm9yZGVycykuCiAgICAgLy8gMi4gQ29sbGVjdCB0aGUgaW5saW5lIGl0ZW1zIChmbGF0 dGVuIHRoZSB0aGUgbGF5b3V0IHRyZWUpIGFuZCBwbGFjZSB0aGVtIG9uIGxpbmVzIGluIGJpZGly ZWN0aW9uYWwgb3JkZXIuIApAQCAtMTM1LDIwICsxMzQsMjQgQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgZm9ybWF0 dGluZ0MKIAogICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5nKGZvcm1hdHRpbmdDb250ZXh0Um9v dCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4oZm9y bWF0dGluZ0NvbnRleHRSb290LCBob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgIGlmICghaXM8 Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3QpIHx8ICFkb3duY2FzdDxDb250YWluZXI+ KGZvcm1hdHRpbmdDb250ZXh0Um9vdCkuaGFzQ2hpbGQoKSkgeworICAgICAgICBjb21wdXRlSGVp Z2h0QW5kTWFyZ2luKGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgaG9yaXpvbnRhbENvbnN0cmFpbnRz KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcg Zm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAg aWYgKGlzPENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSkgewotICAgICAgICBhdXRv JiByb290Q29udGFpbmVyID0gZG93bmNhc3Q8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJv b3QpOwotICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3Jl YXRlRm9ybWF0dGluZ0NvbnRleHQocm9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7CisgICAg YXV0byYgcm9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRl eHRSb290KTsKKyAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3Jl YXRlRm9ybWF0dGluZ0NvbnRleHQocm9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7CisgICAg aWYgKHJvb3RDb250YWluZXIuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCiAgICAgICAgIGZv cm1hdHRpbmdDb250ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBo b3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwotICAgICAgICAvLyBD b21lIGJhY2sgYW5kIGZpbmFsaXplIHRoZSByb290J3MgaGVpZ2h0IGFuZCBtYXJnaW4uCi0gICAg ICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0 cmFpbnRzKTsKLSAgICAgICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWln aHQsIHdlIGNhbiBnbyBiYWNrIGFuZCBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCisg ICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0aGUgcm9vdCdzIGhlaWdodCBhbmQgbWFyZ2lu LgorICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENv bnN0cmFpbnRzKTsKKyAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdo dCwgd2UgY2FuIGdvIGJhY2sgYW5kIGxheW91dCB0aGUgb3V0LW9mLWZsb3cgY29udGVudC4KKyAg ICBpZiAocm9vdENvbnRhaW5lci5oYXNDaGlsZCgpKSB7CiAgICAgICAgIGF1dG8mIHJvb3RDb250 YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gocm9vdENvbnRhaW5lcik7CiAgICAgICAg IGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gR2VvbWV0cnk6Omhvcml6 b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7CiAg ICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyA9IEdlb21ldHJ5Ojp2 ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KHJvb3RDb250YWluZXJEaXNwbGF5Qm94KTsK ICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0NvbnRlbnQoaW52YWxp ZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdywgdmVydGljYWxD b25zdHJhaW50c0Zvck91dE9mRmxvdyk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGNvbXB1dGVIZWln aHRBbmRNYXJnaW4oZm9ybWF0dGluZ0NvbnRleHRSb290LCBob3Jpem9udGFsQ29uc3RyYWludHMp OworICAgIH0KIH0KIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhvcml6 b250YWxBbmRWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBIb3Jp em9udGFsQ29uc3RyYWludHMmIGhvcml6b250YWxDb25zdHJhaW50cykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0 dGluZ0NvbnRleHQuY3BwCmluZGV4IGRlMjFhOTlkOWZjZjc1YTAwYzNkYTZlMzlmZWMxMzhlMmY4 MDAzMGYuLmQyZWM2MTk4Y2FkZTU0NzdmNTIxMjkwYjlkYWM5ZTFmYWRlMmJjNGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZvaWQgVGFibGVG b3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0VGFibGVDZWxsQm94KGNvbnN0IEJveCYgY2VsbExheW91 dEJveCwgY29uc3QKICAgICBjZWxsRGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgoY29sdW1u LmxvZ2ljYWxXaWR0aCgpIC0gY2VsbERpc3BsYXlCb3guaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFu ZFBhZGRpbmcoKSk7CiAKICAgICBBU1NFUlQoY2VsbExheW91dEJveC5lc3RhYmxpc2hlc0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgaWYgKGlzPENvbnRhaW5lcj4oY2VsbExheW91dEJv eCkpCisgICAgaWYgKGlzPENvbnRhaW5lcj4oY2VsbExheW91dEJveCkgJiYgZG93bmNhc3Q8Q29u dGFpbmVyPihjZWxsTGF5b3V0Qm94KS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKICAgICAg ICAgTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZG93bmNhc3Q8Q29udGFp bmVyPihjZWxsTGF5b3V0Qm94KSwgbGF5b3V0U3RhdGUoKSktPmxheW91dEluRmxvd0NvbnRlbnQo aW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZs b3coY2VsbERpc3BsYXlCb3gpLCBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxv dyhjZWxsRGlzcGxheUJveCkpOwogICAgIGNlbGxEaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2lu KHsgeyB9LCB7IH0gfSk7CiAgICAgY2VsbERpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChn ZW9tZXRyeSgpLnRhYmxlQ2VsbEhlaWdodEFuZE1hcmdpbihjZWxsTGF5b3V0Qm94KS5jb250ZW50 SGVpZ2h0KTsK