220228 2021-01-02 20:19:42 -0800 [LFC][IFC] No need to maintain the "is considered empty" bit anymore 2021-01-17 06:44:43 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1717029 0 zalan 2021-01-02 20:19:42 -0800 see LayoutTests/fast/inline/inline-with-empty-inline-continuations.html 1717030 1 416905 zalan 2021-01-02 20:27:12 -0800 Created attachment 416905 Patch 1717222 2 416972 zalan 2021-01-04 20:14:39 -0800 Created attachment 416972 Patch 1718584 3 webkit-bug-importer 2021-01-09 20:20:13 -0800 <rdar://problem/72970238> 1718612 4 417355 zalan 2021-01-10 12:41:32 -0800 Created attachment 417355 Patch 1718618 5 417361 zalan 2021-01-10 20:33:48 -0800 Created attachment 417361 Patch 1720140 6 417767 zalan 2021-01-16 12:31:40 -0800 Created attachment 417767 Patch 1720156 7 417772 zalan 2021-01-16 21:22:07 -0800 Created attachment 417772 Patch 1720177 8 ews-feeder 2021-01-17 06:44:41 -0800 Committed r271562: <https://trac.webkit.org/changeset/271562> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417772. 416905 2021-01-02 20:27:12 -0800 2021-01-04 20:14:37 -0800 Patch bug-220228-20210102202711.patch text/plain 9568 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI1NmYyZWEzNTRkYjE5 NGM1YTY3MDJkMjJmM2U4MGM2YTIzNmFiMi4uYmJiN2VjOTRmMDVkZTk4ZjZhYWY5NDQ2NWMzNDM2 MjIzZTU1MThlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTAxLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94J3MgaG9yaXpvbnRhbCBtYXJnaW4gbWFrZXMgdGhlIGxpbmUgbm9uLWVtcHR5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgdGhlIHJ1bnMg aW5kaXZpZHVhbGx5IG1heSBhbGwgYmUgZW1wdHksIHRoZSBtYXJnaW4gZ2FwIGJldHdlZW4gdGhl bSBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCisgICAgICAgIGUuZy4KKyAgICAgICAgPCFET0NU WVBFIGh0bWw+CisgICAgICAgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IGdyZWVuOyI+ PHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiAxMHB4Ij48L3NwYW4+PC9kaXY+CisgICAgICAgIHBh aW50cyBhIGdyZWVuIGJsYW5rIGxpbmUgYXMgdGFsbCBhcyB0aGUgZGVmYXVsdCBmb250IGlzLiAg IAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmluaXRpYWxpemUpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmQpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lOjphcHBlbmRUZXh0Q29udGVudCk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Ojppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQnVpbGRlcjo6aXNMaW5lQ29uc2lkZXJlZEVtcHR5IGNvbnN0KToKKwogMjAy MC0xMi0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNd W0lGQ10gSG9yaXpvbnRhbCBwYWRkaW5nL2JvcmRlciBtYWtlcyB0aGUgaW5saW5lIGJveCBub24t ZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZS5jcHAKaW5kZXggMzZmOGRjNDVlOGU1YjQ5ZDc2ZDA0ZTU0ZTA3OGI5NDkxMGM4 OTliYi4uZmM4ZDY3NjYzZTA3NWI2ZmQ3MGVlYmQyNWRkNTJkMTBmNWJkOWZjYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5j cHAKQEAgLTU2LDggKzU2LDYgQEAgdm9pZCBMaW5lOjppbml0aWFsaXplKCkKICAgICBtX3J1bnMu Y2xlYXIoKTsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwogICAgIG1fdHJp bW1hYmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7Ci0gICAgbV9pc0NvbnNpZGVyZWRFbXB0eSA9 IHRydWU7Ci0gICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29u dGVudCA9IHsgfTsKIH0KIAogdm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5s aW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxTcGFjZSkKQEAgLTEzMiwxOSArMTMwLDYgQEAg dm9pZCBMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQogICAgIH0KIAogICAg IG1fY29udGVudExvZ2ljYWxXaWR0aCAtPSBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZW1v dmUoKTsKLSAgICAvLyBJZiB3ZSByZW1vdmVkIHRoZSBmaXJzdCB2aXNpYmxlIHJ1biBvbiB0aGUg bGluZSwgd2UgbmVlZCB0byByZS1jaGVjayB0aGUgdmlzaWJpbGl0eSBzdGF0dXMuCi0gICAgaWYg KG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQpIHsKLSAg ICAgICAgLy8gSnVzdCBiZWNhdXNlIHRoZSBsaW5lIHdhcyBjb25zaWRlcmVkIGVtcHR5IGJlZm9y ZSB0aGUgcmVtb3ZlZCBjb250ZW50LCBpdCBkb2VzIG5vdCBuZWNlc3NhcmlseSBtZWFuIGl0IGlz IHN0aWxsIGVtcHR5LgotICAgICAgICAvLyA8c3Bhbj4gIDwvc3Bhbj48c3BhbiBzdHlsZT0icGFk ZGluZy1sZWZ0OiAxMHB4Ij48L3NwYW4+ICA8LSBub24tZW1wdHkKLSAgICAgICAgbV9pc0NvbnNp ZGVyZWRFbXB0eSA9IFsmXSB7Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IG1fcnVucykg ewotICAgICAgICAgICAgICAgIGlmICghaXNSdW5Db25zaWRlcmVkRW1wdHkocnVuKSkKLSAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgICAgIH0oKTsKLSAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJl Zm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IHsgfTsKLSAgICB9CiB9CiAKIHZvaWQgTGlu ZTo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQoSW5saW5lTGF5b3V0VW5p dCBleHRyYUhvcml6b250YWxTcGFjZSkKQEAgLTIwNCwxMCArMTg5LDYgQEAgdm9pZCBMaW5lOjph cHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsV2lkdGgpCiAgICAgICAgIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0s IGxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LQotICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3bHkgYXBwZW5kZWQgY29udGVudCBtYWtlcyB0aGUg bGluZSBub24tZW1wdHkuCi0gICAgaWYgKG1faXNDb25zaWRlcmVkRW1wdHkgJiYgIW1fcnVucy5p c0VtcHR5KCkgJiYgIWlzUnVuQ29uc2lkZXJlZEVtcHR5KG1fcnVucy5sYXN0KCkpKQotICAgICAg ICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0gZmFsc2U7CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kTm9u QnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCkBAIC0yOTMs MTMgKzI3NCw4IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4 dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVCiAgICAgICAgIG1fY29udGVudExv Z2ljYWxXaWR0aCArPSBsb2dpY2FsV2lkdGg7CiAgICAgfQogICAgIC8vIFNldCB0aGUgdHJhaWxp bmcgdHJpbW1hYmxlIGNvbnRlbnQuCi0gICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFj ZSgpICYmICFJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGlu ZVRleHRJdGVtKSkgewotICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRGdWxs eVRyaW1tYWJsZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGNvbnRlbnRMb2dpY2FsV2lkdGgo KSAtIG9sZENvbnRlbnRMb2dpY2FsV2lkdGgpOwotICAgICAgICAvLyBJZiB3ZSBldmVyIHRyaW0g dGhpcyBjb250ZW50LCB3ZSBuZWVkIHRvIGtub3cgaWYgdGhlIGxpbmUgdmlzaWJpbGl0eSBzdGF0 ZSBuZWVkcyB0byBiZSByZWNvbXB1dGVkLgotICAgICAgICBpZiAobV90cmltbWFibGVUcmFpbGlu Z0NvbnRlbnQuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9y ZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IGlzQ29uc2lkZXJlZEVtcHR5KCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9CisgICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpICYm ICFJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJ dGVtKSkKKyAgICAgICAgcmV0dXJuIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmFkZEZ1bGx5 VHJpbW1hYmxlQ29udGVudChtX3J1bnMuc2l6ZSgpIC0gMSwgY29udGVudExvZ2ljYWxXaWR0aCgp IC0gb2xkQ29udGVudExvZ2ljYWxXaWR0aCk7CiAgICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBu by10cmltbWFibGUgY29udGVudCByZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KICAgICBt X3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOwogICAgIGlmICghZm9ybWF0dGluZ0Nv bnRleHQoKS5sYXlvdXRTdGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZygp ICYmICFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBzdHlsZS5sZXR0ZXJTcGFjaW5n KCkgPiAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZS5oCmluZGV4IDYwNDdjY2I5NTk2NThjNjQ0ZjE1OTRhM2JkM2Y3YzEzYTBmYjM5 YzUuLmY5ZDA4NTE0YWYwOGFiM2YzNGUyODNjNDI0NWYwYjYyY2RjZGUyMjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAg LTQ2LDEyICs0Niw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYXBwZW5kKGNvbnN0IElubGluZUl0 ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAKLSAgICAvLyA8c3Bhbj48L3Nw YW4+IGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8gPHNwYW4+PGJyPjwvc3Bhbj4gaXMgY29uc2lk ZXJlZCBlbXB0eS4KLSAgICAvLyA8c3Bhbj50ZXh0PC9zcGFuPiBpcyBub3QgY29uc2lkZXJlZCBl bXB0eS4KLSAgICAvLyA8c3BhbiBzdHlsZT0icGFkZGluZzogMTBweCI+PC9zcGFuPiBpcyBub3Qg Y29uc2lkZXJlZCBlbXB0eS4gCi0gICAgYm9vbCBpc0NvbnNpZGVyZWRFbXB0eSgpIGNvbnN0IHsg cmV0dXJuIG1faXNDb25zaWRlcmVkRW1wdHk7IH0KLQogICAgIElubGluZUxheW91dFVuaXQgY29u dGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsg fQogICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0 dXJuIG1fcnVucy5pc0VtcHR5KCkgPyAwLjBmIDogbV9ydW5zLmxhc3QoKS5sb2dpY2FsUmlnaHQo KTsgfQogCkBAIC0xNzgsOCArMTcyLDYgQEAgcHJpdmF0ZToKICAgICBUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CiAgICAgSW5saW5lTGF5b3V0VW5p dCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0 VW5pdD4gbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCB7IDAgfTsKLSAgICBib29sIG1faXNDb25z aWRlcmVkRW1wdHkgeyB0cnVlIH07Ci0gICAgT3B0aW9uYWw8Ym9vbD4gbV9pc0NvbnNpZGVyZWRF bXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKIH07CiAKIGlubGluZSB2b2lkIExp bmU6OlRyaW1tYWJsZVRyYWlsaW5nQ29udGVudDo6cmVzZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCmluZGV4IGE4YThmOTE4OTdkMzQxOTQ0YWMzMzU3OWUzYTAxNTIyNTJmYmNlYWYuLjY1M2Ji ZGYzMjNlMTE3ZmIxZTg0Njk0NjVkNzEzMzlhNjZhNmViNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKQEAgLTI2NCw3ICsyNjQsNyBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1 aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJgogICAgICAg ICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAgICAgICAsIG1fbGluZUxvZ2ljYWxS ZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpCi0gICAg ICAgICwgbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkKKyAgICAgICAgLCBpc0xpbmVDb25zaWRl cmVkRW1wdHkoKQogICAgICAgICAsIGlzTGFzdExpbmUKICAgICAgICAgLCBtX2xpbmUucnVucygp fTsKIH0KQEAgLTM1Niw3ICszNTYsNyBAQCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIExp bmVCdWlsZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5bwogICAgIGlm IChydW5zRXhwYW5kSG9yaXpvbnRhbGx5KQogICAgICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNp b24obV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0 KCkpOwogICAgIGF1dG8gbGluZUVuZHNXaXRoSHlwaGVuID0gZmFsc2U7Ci0gICAgaWYgKCFtX2xp bmUuaXNDb25zaWRlcmVkRW1wdHkoKSkgeworICAgIGlmICghaXNMaW5lQ29uc2lkZXJlZEVtcHR5 KCkpIHsKICAgICAgICAgQVNTRVJUKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSk7CiAgICAgICAg IGF1dG8mIGxhc3RUZXh0Q29udGVudCA9IG1fbGluZS5ydW5zKCkubGFzdCgpLnRleHRDb250ZW50 KCk7CiAgICAgICAgIGxpbmVFbmRzV2l0aEh5cGhlbiA9IGxhc3RUZXh0Q29udGVudCAmJiBsYXN0 VGV4dENvbnRlbnQtPm5lZWRzSHlwaGVuKCk7CkBAIC02MjQsOCArNjI0LDggQEAgTGluZUJ1aWxk ZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50 QnJlYWtlciYgaW5saW4KICAgICB9KCk7CiAgICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IGxpbmVM b2dpY2FsUmVjdEZvckNhbmRpZGF0ZUNvbnRlbnQud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9n aWNhbFJpZ2h0KCk7CiAgICAgLy8gQ2hlY2sgaWYgdGhpcyBuZXcgY29udGVudCBmaXRzLgotICAg IGF1dG8gaXNMaW5lQ29uc2lkZXJlZEVtcHR5ID0gbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkg JiYgIW1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OwotICAgIGF1dG8gbGluZVN0YXR1cyA9 IElubGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsgbV9saW5lLmNvbnRlbnRMb2dpY2Fs UmlnaHQoKSwgYXZhaWxhYmxlV2lkdGgsIG1fbGluZS50cmltbWFibGVUcmFpbGluZ1dpZHRoKCks IG1fbGluZS50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCgpLCBtX2xpbmUuaXNUcmFpbGluZ1J1bkZ1 bGx5VHJpbW1hYmxlKCksIGlzTGluZUNvbnNpZGVyZWRFbXB0eSB9OworICAgIGF1dG8gaXNMaW5l Q29uc2lkZXJlZEVtcHR5Rm9yQ29udGVudEJyZWFrID0gdGhpcy0+aXNMaW5lQ29uc2lkZXJlZEVt cHR5KCkgJiYgIW1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OworICAgIGF1dG8gbGluZVN0 YXR1cyA9IElubGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsgbV9saW5lLmNvbnRlbnRM b2dpY2FsUmlnaHQoKSwgYXZhaWxhYmxlV2lkdGgsIG1fbGluZS50cmltbWFibGVUcmFpbGluZ1dp ZHRoKCksIG1fbGluZS50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCgpLCBtX2xpbmUuaXNUcmFpbGlu Z1J1bkZ1bGx5VHJpbW1hYmxlKCksIGlzTGluZUNvbnNpZGVyZWRFbXB0eUZvckNvbnRlbnRCcmVh ayB9OwogICAgIGF1dG8gcmVzdWx0ID0gaW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGlu ZUNvbnRlbnQoY29udGludW91c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0dXMpOwogICAgIGlmIChy ZXN1bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pCiAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5 TGlzdC5hcHBlbmQocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5oCmluZGV4IGU2ZjRlN2UxOWUwZTZjYTlhNzczMTljYTY3MGIxNDcyYzUxYjY2M2QuLjc4 NjdiMGQ4YmRkOTRhZmI4ZTZlZjkwYjg0NGU1MjA5MzcwODBiZjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuaApAQCAtMTAyLDYgKzEwMiw3IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICBDb21taXR0ZWRD b250ZW50IHBsYWNlSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmLCBzaXplX3Qg cGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoKTsKICAgICBJbmxpbmVJdGVtUmFuZ2UgY2xvc2Uo Y29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBDb21taXR0ZWRD b250ZW50Jik7CisgICAgYm9vbCBpc0xpbmVDb25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVy biAhbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsgfQogCiAgICAgSW5saW5lTGF5b3V0VW5p dCBpbmxpbmVJdGVtV2lkdGgoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgY29u dGVudExvZ2ljYWxMZWZ0KSBjb25zdDsKICAgICBib29sIGlzTGFzdExpbmVXaXRoSW5saW5lQ29u dGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxpbmVSYW5nZSwgc2l6ZV90IGxhc3RJbmxpbmVJ dGVtSW5kZXgsIGJvb2wgaGFzUGFydGlhbFRyYWlsaW5nQ29udGVudCkgY29uc3Q7Cg== 416972 2021-01-04 20:14:39 -0800 2021-01-10 12:41:30 -0800 Patch bug-220228-20210104201438.patch text/plain 11256 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRjNTYxN2I2NTIxYWVi YjQwMzRjNTNhMGEzZjc4Y2VmNmUwNWRlZS4uMDM4ZjIwM2Q2NGNmNDRkMWRmODZmOTQ3ZDliMTJm ZTBjMWViMTgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94J3MgaG9yaXpvbnRhbCBtYXJnaW4gbWFrZXMgdGhlIGxpbmUgbm9uLWVtcHR5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgdGhlIHJ1bnMg aW5kaXZpZHVhbGx5IG1heSBhbGwgYmUgZW1wdHksIHRoZSBtYXJnaW4gZ2FwIGJldHdlZW4gdGhl bSBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCisgICAgICAgIGUuZy4KKyAgICAgICAgPCFET0NU WVBFIGh0bWw+PGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Ij48c3BhbiBzdHls ZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjwvc3Bhbj48L2Rpdj4KKyAgICAgICAgcGFpbnRzIGEgZ3Jl ZW4gYmxhbmsgbGluZSBhcyB0YWxsIGFzIHRoZSBkZWZhdWx0IGZvbnQgaXMuCisgICAgICAgIE5v dyB0aGF0IGlzQ29uc2lkZXJlZEVtcHR5KCkgaXMgb25seSB1c2VkIGZvciBsaW5lIGJyZWFraW5n LCB3ZSBjYW4gaGF2ZSBhIG1vcmUgZm9jdXNlZCBjaGVjay4KKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NJbmxpbmVDb250ZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NP dmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Omlu aXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpyZW1vdmVUcmFpbGlu Z1RyaW1tYWJsZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBl bmQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRUZXh0Q29udGVudCk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6 CisKIDIwMjEtMDEtMDQgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIFByZSBhbmQgcG9zdCBhbm9ueW1vdXMgYmxvY2tzIGluIGNvbnRpbnVhdGlv biBkbyBub3QgaGF2ZSBpbWFnaW5hcnkgc3RydXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5j cHAKaW5kZXggZDIwZmUzOTg2ZjM4MTY0NTFhYWNlODdkOWFkNDQwOGRiNjlkZjY2YS4uOTM0ODM0 ZTUyZDYwMzQ5YjY4ZGFjNDQ3OTAyNzgyZDg2MmU5MTAwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRC cmVha2VyLmNwcApAQCAtMTM1LDcgKzEzNSw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1 bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnN0IENvCiAg ICAgICAgIGlmIChhdXRvIGxhc3RMaW5lV3JhcE9wcG9ydHVuaXR5SW5kZXggPSBsYXN0V3JhcE9w cG9ydHVuaXR5SW5kZXgoY2FuZGlkYXRlQ29udGVudC5ydW5zKCkpKSB7CiAgICAgICAgICAgICBh dXRvIGlzRWxpZ2libGVMaW5lV3JhcE9wcG9ydHVuaXR5ID0gWyZdIChhdXRvJiBjYW5kaWRhdGVJ dGVtKSB7CiAgICAgICAgICAgICAgICAgLy8gSnVzdCBjaGVjayBmb3IgbGVhZGluZyBwcmVzZXJ2 ZWQgd2hpdGVzcGFjZSBmb3Igbm93LgotICAgICAgICAgICAgICAgIGlmICghbGluZVN0YXR1cy5p c0VtcHR5IHx8ICFpczxJbmxpbmVUZXh0SXRlbT4oY2FuZGlkYXRlSXRlbSkpCisgICAgICAgICAg ICAgICAgaWYgKGxpbmVTdGF0dXMuaGFzQ29udGVudCB8fCAhaXM8SW5saW5lVGV4dEl0ZW0+KGNh bmRpZGF0ZUl0ZW0pKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAg ICAgICAgICBhdXRvIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGNh bmRpZGF0ZUl0ZW0pOwogICAgICAgICAgICAgICAgIHJldHVybiAhaW5saW5lVGV4dEl0ZW0uaXNX aGl0ZXNwYWNlKCkgfHwgSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFi cyhpbmxpbmVUZXh0SXRlbSk7CkBAIC0xOTgsNyArMTk4LDcgQEAgSW5saW5lQ29udGVudEJyZWFr ZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVu dChjb24KICAgICAgICAgICAgICAgICAvLyBXZSB0cmllZCB0byBicmVhayB0aGUgY29udGVudCBi dXQgdGhlIGF2YWlsYWJsZSBzcGFjZSBjYW4ndCBldmVuIGFjY29tbW9kYXRlIHRoZSBmaXJzdCBj aGFyYWN0ZXIuCiAgICAgICAgICAgICAgICAgLy8gMS4gV3JhcCB0aGUgY29udGVudCBvdmVyIHRv IHRoZSBuZXh0IGxpbmUgd2hlbiB3ZSd2ZSBnb3QgY29udGVudCBvbiB0aGUgbGluZSBhbHJlYWR5 LgogICAgICAgICAgICAgICAgIC8vIDIuIEtlZXAgdGhlIGZpcnN0IGNoYXJhY3RlciBvbiB0aGUg ZW1wdHkgbGluZSAob3Iga2VlcCB0aGUgd2hvbGUgcnVuIGlmIGl0IGhhcyBvbmx5IG9uZSBjaGFy YWN0ZXIvY29tcGxldGVseSBlbXB0eSkuCi0gICAgICAgICAgICAgICAgaWYgKCFsaW5lU3RhdHVz LmlzRW1wdHkpCisgICAgICAgICAgICAgICAgaWYgKGxpbmVTdGF0dXMuaGFzQ29udGVudCkKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZM aW5lOjpZZXMgfTsKICAgICAgICAgICAgICAgICBhdXRvIGxlYWRpbmdUZXh0UnVuSW5kZXggPSAq Zmlyc3RUZXh0UnVuSW5kZXgoY29udGludW91c0NvbnRlbnQpOwogICAgICAgICAgICAgICAgIGF1 dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGNvbnRpbnVvdXND b250ZW50LnJ1bnMoKVtsZWFkaW5nVGV4dFJ1bkluZGV4XS5pbmxpbmVJdGVtKTsKQEAgLTIxMyw3 ICsyMTMsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVh a2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogICAgICAgICB9CiAgICAgfQogICAg IC8vIElmIHdlIGFyZSBub3QgYWxsb3dlZCB0byBicmVhayB0aGlzIG92ZXJmbG93aW5nIGNvbnRl bnQsIHdlIHN0aWxsIG5lZWQgdG8gZGVjaWRlIHdoZXRoZXIga2VlcCBpdCBvciB3cmFwIGl0IHRv IHRoZSBuZXh0IGxpbmUuCi0gICAgaWYgKGxpbmVTdGF0dXMuaXNFbXB0eSkgeworICAgIGlmICgh bGluZVN0YXR1cy5oYXNDb250ZW50KSB7CiAgICAgICAgIEFTU0VSVCghbV9oYXNXcmFwT3Bwb3J0 dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pOwogICAgICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlv bjo6S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2Vy LmgKaW5kZXggZDg3YjU4ZmZiZTcwNTk1OWEzMjA5ODFkNjM2NWFjOWMwMzMxMzg0ZC4uNjdhNDI0 ZTgxZGVmZTVhNzM3NTIxMDRhNDQ0YTViNTc2ODhhZTY3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJl YWtlci5oCkBAIC0xMTAsNyArMTEwLDcgQEAgcHVibGljOgogICAgICAgICBJbmxpbmVMYXlvdXRV bml0IGNvbGxhcHNpYmxlV2lkdGggeyAwIH07CiAgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91 dFVuaXQ+IHRyYWlsaW5nU29mdEh5cGhlbldpZHRoOwogICAgICAgICBib29sIGhhc0Z1bGx5Q29s bGFwc2libGVUcmFpbGluZ1J1biB7IGZhbHNlIH07Ci0gICAgICAgIGJvb2wgaXNFbXB0eSB7IHRy dWUgfTsKKyAgICAgICAgYm9vbCBoYXNDb250ZW50IHsgZmFsc2UgfTsKICAgICB9OwogICAgIFJl c3VsdCBwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDb250aW51b3VzQ29udGVudCYsIGNvbnN0 IExpbmVTdGF0dXMmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCAzNmY4ZGM0NWU4ZTViNDlkNzZkMDRlNTRl MDc4Yjk0OTEwYzg5OWJiLi4wMGMzMTE3NTgwMjcxNzU1MWIxNGNlNzM1NWRjZDExMDNkMmQ5MDVi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcApAQCAtNTYsOCArNTYsNiBAQCB2b2lkIExpbmU6OmluaXRpYWxpemUoKQog ICAgIG1fcnVucy5jbGVhcigpOwogICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07 CiAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKLSAgICBtX2lzQ29uc2lk ZXJlZEVtcHR5ID0gdHJ1ZTsKLSAgICBtX2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxl VHJhaWxpbmdDb250ZW50ID0geyB9OwogfQogCiB2b2lkIExpbmU6OnJlbW92ZUNvbGxhcHNpYmxl Q29udGVudChJbmxpbmVMYXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQpAQCAtMTMyLDE5 ICsxMzAsNiBAQCB2b2lkIExpbmU6OnJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpCiAg ICAgfQogCiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1fdHJpbW1hYmxlVHJhaWxpbmdD b250ZW50LnJlbW92ZSgpOwotICAgIC8vIElmIHdlIHJlbW92ZWQgdGhlIGZpcnN0IHZpc2libGUg cnVuIG9uIHRoZSBsaW5lLCB3ZSBuZWVkIHRvIHJlLWNoZWNrIHRoZSB2aXNpYmlsaXR5IHN0YXR1 cy4KLSAgICBpZiAobV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29u dGVudCkgewotICAgICAgICAvLyBKdXN0IGJlY2F1c2UgdGhlIGxpbmUgd2FzIGNvbnNpZGVyZWQg ZW1wdHkgYmVmb3JlIHRoZSByZW1vdmVkIGNvbnRlbnQsIGl0IGRvZXMgbm90IG5lY2Vzc2FyaWx5 IG1lYW4gaXQgaXMgc3RpbGwgZW1wdHkuCi0gICAgICAgIC8vIDxzcGFuPiAgPC9zcGFuPjxzcGFu IHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDEwcHgiPjwvc3Bhbj4gIDwtIG5vbi1lbXB0eQotICAgICAg ICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0gWyZdIHsKLSAgICAgICAgICAgIGZvciAoYXV0byYgcnVu IDogbV9ydW5zKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFpc1J1bkNvbnNpZGVyZWRFbXB0eShy dW4pKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfSgpOwotICAgICAgICBtX2lzQ29uc2lk ZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50ID0geyB9OwotICAgIH0KIH0K IAogdm9pZCBMaW5lOjp2aXN1YWxseUNvbGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudChJbmxp bmVMYXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQpAQCAtMjA0LDEwICsxODksNiBAQCB2 b2lkIExpbmU6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCkKICAgICAgICAgYXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3go aW5saW5lSXRlbSwgbG9naWNhbFdpZHRoKTsKICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwotCi0gICAgLy8gQ2hlY2sgaWYgdGhpcyBuZXdseSBhcHBlbmRlZCBjb250ZW50 IG1ha2VzIHRoZSBsaW5lIG5vbi1lbXB0eS4KLSAgICBpZiAobV9pc0NvbnNpZGVyZWRFbXB0eSAm JiAhbV9ydW5zLmlzRW1wdHkoKSAmJiAhaXNSdW5Db25zaWRlcmVkRW1wdHkobV9ydW5zLmxhc3Qo KSkpCi0gICAgICAgIG1faXNDb25zaWRlcmVkRW1wdHkgPSBmYWxzZTsKIH0KIAogdm9pZCBMaW5l OjphcHBlbmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCkKQEAgLTI5NSw5ICsyNzYsNiBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0 IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VQogICAgIC8vIFNl dCB0aGUgdHJhaWxpbmcgdHJpbW1hYmxlIGNvbnRlbnQuCiAgICAgaWYgKGlubGluZVRleHRJdGVt LmlzV2hpdGVzcGFjZSgpICYmICFJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNB bmRUYWJzKGlubGluZVRleHRJdGVtKSkgewogICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29u dGVudC5hZGRGdWxseVRyaW1tYWJsZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGNvbnRlbnRM b2dpY2FsV2lkdGgoKSAtIG9sZENvbnRlbnRMb2dpY2FsV2lkdGgpOwotICAgICAgICAvLyBJZiB3 ZSBldmVyIHRyaW0gdGhpcyBjb250ZW50LCB3ZSBuZWVkIHRvIGtub3cgaWYgdGhlIGxpbmUgdmlz aWJpbGl0eSBzdGF0ZSBuZWVkcyB0byBiZSByZWNvbXB1dGVkLgotICAgICAgICBpZiAobV90cmlt bWFibGVUcmFpbGluZ0NvbnRlbnQuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9pc0NvbnNpZGVy ZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IGlzQ29uc2lkZXJlZEVtcHR5 KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBu by10cmltbWFibGUgY29udGVudCByZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApp bmRleCA2MDQ3Y2NiOTU5NjU4YzY0NGYxNTk0YTNiZDNmN2MxM2EwZmIzOWM1Li5mOWQwODUxNGFm MDhhYjNmMzRlMjgzYzQyNDVmMGI2MmNkY2RlMjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC00NiwxMiArNDYsNiBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5 b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogCi0gICAgLy8gPHNwYW4+PC9zcGFuPiBjb25zaWRlcmVk IGVtcHR5LgotICAgIC8vIDxzcGFuPjxicj48L3NwYW4+IGlzIGNvbnNpZGVyZWQgZW1wdHkuCi0g ICAgLy8gPHNwYW4+dGV4dDwvc3Bhbj4gaXMgbm90IGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8g PHNwYW4gc3R5bGU9InBhZGRpbmc6IDEwcHgiPjwvc3Bhbj4gaXMgbm90IGNvbnNpZGVyZWQgZW1w dHkuIAotICAgIGJvb2wgaXNDb25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29u c2lkZXJlZEVtcHR5OyB9Ci0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lk dGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KICAgICBJbmxpbmVM YXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtX3J1bnMuaXNF bXB0eSgpID8gMC4wZiA6IG1fcnVucy5sYXN0KCkubG9naWNhbFJpZ2h0KCk7IH0KIApAQCAtMTc4 LDggKzE3Miw2IEBAIHByaXZhdGU6CiAgICAgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50IG1fdHJp bW1hYmxlVHJhaWxpbmdDb250ZW50OwogICAgIElubGluZUxheW91dFVuaXQgbV9jb250ZW50TG9n aWNhbFdpZHRoIHsgMCB9OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGggeyAwIH07Ci0gICAgYm9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsg dHJ1ZSB9OwotICAgIE9wdGlvbmFsPGJvb2w+IG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmlt bWFibGVUcmFpbGluZ0NvbnRlbnQ7CiB9OwogCiBpbmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVU cmFpbGluZ0NvbnRlbnQ6OnJlc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBkMWYy ZDk4OTU2YmVlZDczMzhlNTZjOTkxODJkYjZjOGQzNDNjNTg0Li4xNDI3NzA2YjczNmQ3YmRiYThm N2U4ZWUyNTRjOTA4NmIzNjZlNWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNTUs OCArMzU1LDcgQEAgTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRlcjo6Y2xv c2UoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW8KICAgICBpZiAocnVuc0V4cGFuZEhv cml6b250YWxseSkKICAgICAgICAgbV9saW5lLmFwcGx5UnVuRXhwYW5zaW9uKG1fbGluZUxvZ2lj YWxSZWN0LndpZHRoKCkgLSBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKTsKICAgICBhdXRv IGxpbmVFbmRzV2l0aEh5cGhlbiA9IGZhbHNlOwotICAgIGlmICghbV9saW5lLmlzQ29uc2lkZXJl ZEVtcHR5KCkpIHsKLSAgICAgICAgQVNTRVJUKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSk7Cisg ICAgaWYgKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICBhdXRvJiBsYXN0VGV4 dENvbnRlbnQgPSBtX2xpbmUucnVucygpLmxhc3QoKS50ZXh0Q29udGVudCgpOwogICAgICAgICBs aW5lRW5kc1dpdGhIeXBoZW4gPSBsYXN0VGV4dENvbnRlbnQgJiYgbGFzdFRleHRDb250ZW50LT5u ZWVkc0h5cGhlbigpOwogICAgIH0KQEAgLTYyMiw5ICs2MjEsOSBAQCBMaW5lQnVpbGRlcjo6UmVz dWx0IExpbmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2Vy JiBpbmxpbgogICAgICAgICByZXR1cm4gYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3Q7CiAgICAgfSgp OwogICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBsaW5lTG9naWNhbFJlY3RGb3JDYW5kaWRhdGVD b250ZW50LndpZHRoKCkgLSBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpOwotICAgIC8vIENo ZWNrIGlmIHRoaXMgbmV3IGNvbnRlbnQgZml0cy4KLSAgICBhdXRvIGlzTGluZUNvbnNpZGVyZWRF bXB0eSA9IG1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpICYmICFtX2NvbnRlbnRJc0NvbnN0cmFp bmVkQnlGbG9hdDsKLSAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6 TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRo LCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBpc0xpbmVD b25zaWRlcmVkRW1wdHkgfTsKKyAgICAvLyBXaGlsZSB0aGUgZmxvYXRzIGFyZSBub3QgY29uc2lk ZXJlZCB0byBiZSBvbiB0aGUgbGluZSwgdGhleSBtYWtlIHRoZSBsaW5lIGNvbnRlbnRmdWwgZm9y IGxpbmUgYnJlYWtpbmcuCisgICAgYXV0byBsaW5lSGFzQ29udGVudCA9ICFtX2xpbmUucnVucygp LmlzRW1wdHkoKSB8fCBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAgICBhdXRvIGxp bmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250 ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxp bmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJh aWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBsaW5lSGFzQ29udGVudCB9OwogICAgIGF1dG8gcmVz dWx0ID0gaW5saW5lQ29udGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQoY29udGludW91 c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0dXMpOwogICAgIGlmIChyZXN1bHQubGFzdFdyYXBPcHBv cnR1bml0eUl0ZW0pCiAgICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5hcHBlbmQocmVzdWx0 Lmxhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKTsK 417355 2021-01-10 12:41:32 -0800 2021-01-10 13:01:38 -0800 Patch bug-220228-20210110124131.patch text/plain 11251 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYyMWM2MzAxMWJkYjNh NmIwNzdhZWU5YWEyMzdiZGRiZDk0OTM4ZS4uZTQ3NDU5MjM0NzhhMTI1NjBkMTExYmEwZjBjODA0 NGFlOTRkOWQyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94J3MgaG9yaXpvbnRhbCBtYXJnaW4gbWFrZXMgdGhlIGxpbmUgbm9uLWVtcHR5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgdGhlIHJ1bnMg aW5kaXZpZHVhbGx5IG1heSBhbGwgYmUgZW1wdHksIHRoZSBtYXJnaW4gZ2FwIGJldHdlZW4gdGhl bSBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCisgICAgICAgIGUuZy4KKyAgICAgICAgPCFET0NU WVBFIGh0bWw+PGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Ij48c3BhbiBzdHls ZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjwvc3Bhbj48L2Rpdj4KKyAgICAgICAgcGFpbnRzIGEgZ3Jl ZW4gYmxhbmsgbGluZSBhcyB0YWxsIGFzIHRoZSBkZWZhdWx0IGZvbnQgaXMuCisgICAgICAgIE5v dyB0aGF0IGlzQ29uc2lkZXJlZEVtcHR5KCkgaXMgb25seSB1c2VkIGZvciBsaW5lIGJyZWFraW5n LCB3ZSBjYW4gaGF2ZSBhIG1vcmUgZm9jdXNlZCBjaGVjay4KKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NJbmxpbmVDb250ZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NP dmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Omlu aXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpyZW1vdmVUcmFpbGlu Z1RyaW1tYWJsZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBl bmQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjphcHBlbmRUZXh0Q29udGVudCk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc0NvbnNpZGVyZWRFbXB0eSBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6 CisKIDIwMjEtMDEtMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIE1ha2UgImlubGluZSBsZXZlbCBib3ggYWZmZWN0cyBsaW5lIGJveCBnZW9t ZXRyeSIgbG9naWMgbW9yZSBleHBsaWNpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmlu ZGV4IGQyMGZlMzk4NmYzODE2NDUxYWFjZTg3ZDlhZDQ0MDhkYjY5ZGY2NmEuLjkzNDgzNGU1MmQ2 MDM0OWI2OGRhYzQ0NzkwMjc4MmQ4NjJlOTEwMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtl ci5jcHAKQEAgLTEzNSw3ICsxMzUsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElu bGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgICAg ICBpZiAoYXV0byBsYXN0TGluZVdyYXBPcHBvcnR1bml0eUluZGV4ID0gbGFzdFdyYXBPcHBvcnR1 bml0eUluZGV4KGNhbmRpZGF0ZUNvbnRlbnQucnVucygpKSkgewogICAgICAgICAgICAgYXV0byBp c0VsaWdpYmxlTGluZVdyYXBPcHBvcnR1bml0eSA9IFsmXSAoYXV0byYgY2FuZGlkYXRlSXRlbSkg ewogICAgICAgICAgICAgICAgIC8vIEp1c3QgY2hlY2sgZm9yIGxlYWRpbmcgcHJlc2VydmVkIHdo aXRlc3BhY2UgZm9yIG5vdy4KLSAgICAgICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMuaXNFbXB0 eSB8fCAhaXM8SW5saW5lVGV4dEl0ZW0+KGNhbmRpZGF0ZUl0ZW0pKQorICAgICAgICAgICAgICAg IGlmIChsaW5lU3RhdHVzLmhhc0NvbnRlbnQgfHwgIWlzPElubGluZVRleHRJdGVtPihjYW5kaWRh dGVJdGVtKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICAg ICAgYXV0byBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjYW5kaWRh dGVJdGVtKTsKICAgICAgICAgICAgICAgICByZXR1cm4gIWlubGluZVRleHRJdGVtLmlzV2hpdGVz cGFjZSgpIHx8IElubGluZVRleHRJdGVtOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5s aW5lVGV4dEl0ZW0pOwpAQCAtMTk4LDcgKzE5OCw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpS ZXN1bHQgSW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29u CiAgICAgICAgICAgICAgICAgLy8gV2UgdHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYnV0IHRo ZSBhdmFpbGFibGUgc3BhY2UgY2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmlyc3QgY2hhcmFj dGVyLgogICAgICAgICAgICAgICAgIC8vIDEuIFdyYXAgdGhlIGNvbnRlbnQgb3ZlciB0byB0aGUg bmV4dCBsaW5lIHdoZW4gd2UndmUgZ290IGNvbnRlbnQgb24gdGhlIGxpbmUgYWxyZWFkeS4KICAg ICAgICAgICAgICAgICAvLyAyLiBLZWVwIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5 IGxpbmUgKG9yIGtlZXAgdGhlIHdob2xlIHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVy L2NvbXBsZXRlbHkgZW1wdHkpLgotICAgICAgICAgICAgICAgIGlmICghbGluZVN0YXR1cy5pc0Vt cHR5KQorICAgICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRlbnQpCiAgICAgICAg ICAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpXcmFwLCBJc0VuZE9mTGluZTo6 WWVzIH07CiAgICAgICAgICAgICAgICAgYXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4ID0gKmZpcnN0 VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXNDb250ZW50KTsKICAgICAgICAgICAgICAgICBhdXRvJiBp bmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjb250aW51b3VzQ29udGVu dC5ydW5zKClbbGVhZGluZ1RleHRSdW5JbmRleF0uaW5saW5lSXRlbSk7CkBAIC0yMTMsNyArMjEz LDcgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6 cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgfQogICAgIH0KICAgICAvLyBJ ZiB3ZSBhcmUgbm90IGFsbG93ZWQgdG8gYnJlYWsgdGhpcyBvdmVyZmxvd2luZyBjb250ZW50LCB3 ZSBzdGlsbCBuZWVkIHRvIGRlY2lkZSB3aGV0aGVyIGtlZXAgaXQgb3Igd3JhcCBpdCB0byB0aGUg bmV4dCBsaW5lLgotICAgIGlmIChsaW5lU3RhdHVzLmlzRW1wdHkpIHsKKyAgICBpZiAoIWxpbmVT dGF0dXMuaGFzQ29udGVudCkgewogICAgICAgICBBU1NFUlQoIW1faGFzV3JhcE9wcG9ydHVuaXR5 QXRQcmV2aW91c1Bvc2l0aW9uKTsKICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246Oktl ZXAsIElzRW5kT2ZMaW5lOjpObyB9OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oCmlu ZGV4IGQ4N2I1OGZmYmU3MDU5NTlhMzIwOTgxZDYzNjVhYzljMDMzMTM4NGQuLjY3YTQyNGU4MWRl ZmU1YTczNzUyMTA0YTQ0NGE1YjU3Njg4YWU2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIu aApAQCAtMTEwLDcgKzExMCw3IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBj b2xsYXBzaWJsZVdpZHRoIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0 PiB0cmFpbGluZ1NvZnRIeXBoZW5XaWR0aDsKICAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNp YmxlVHJhaWxpbmdSdW4geyBmYWxzZSB9OwotICAgICAgICBib29sIGlzRW1wdHkgeyB0cnVlIH07 CisgICAgICAgIGJvb2wgaGFzQ29udGVudCB7IGZhbHNlIH07CiAgICAgfTsKICAgICBSZXN1bHQg cHJvY2Vzc0lubGluZUNvbnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5l U3RhdHVzJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5jcHAKaW5kZXggMzZmOGRjNDVlOGU1YjQ5ZDc2ZDA0ZTU0ZTA3OGI5 NDkxMGM4OTliYi4uMDBjMzExNzU4MDI3MTc1NTFiMTRjZTczNTVkY2QxMTAzZDJkOTA1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5jcHAKQEAgLTU2LDggKzU2LDYgQEAgdm9pZCBMaW5lOjppbml0aWFsaXplKCkKICAgICBt X3J1bnMuY2xlYXIoKTsKICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwogICAg IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7Ci0gICAgbV9pc0NvbnNpZGVyZWRF bXB0eSA9IHRydWU7Ci0gICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWls aW5nQ29udGVudCA9IHsgfTsKIH0KIAogdm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRl bnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxTcGFjZSkKQEAgLTEzMiwxOSArMTMw LDYgQEAgdm9pZCBMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQogICAgIH0K IAogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCAtPSBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVu dC5yZW1vdmUoKTsKLSAgICAvLyBJZiB3ZSByZW1vdmVkIHRoZSBmaXJzdCB2aXNpYmxlIHJ1biBv biB0aGUgbGluZSwgd2UgbmVlZCB0byByZS1jaGVjayB0aGUgdmlzaWJpbGl0eSBzdGF0dXMuCi0g ICAgaWYgKG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQp IHsKLSAgICAgICAgLy8gSnVzdCBiZWNhdXNlIHRoZSBsaW5lIHdhcyBjb25zaWRlcmVkIGVtcHR5 IGJlZm9yZSB0aGUgcmVtb3ZlZCBjb250ZW50LCBpdCBkb2VzIG5vdCBuZWNlc3NhcmlseSBtZWFu IGl0IGlzIHN0aWxsIGVtcHR5LgotICAgICAgICAvLyA8c3Bhbj4gIDwvc3Bhbj48c3BhbiBzdHls ZT0icGFkZGluZy1sZWZ0OiAxMHB4Ij48L3NwYW4+ICA8LSBub24tZW1wdHkKLSAgICAgICAgbV9p c0NvbnNpZGVyZWRFbXB0eSA9IFsmXSB7Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IG1f cnVucykgewotICAgICAgICAgICAgICAgIGlmICghaXNSdW5Db25zaWRlcmVkRW1wdHkocnVuKSkK LSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0oKTsKLSAgICAgICAgbV9pc0NvbnNpZGVyZWRF bXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IHsgfTsKLSAgICB9CiB9CiAKIHZv aWQgTGluZTo6dmlzdWFsbHlDb2xsYXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQoSW5saW5lTGF5 b3V0VW5pdCBleHRyYUhvcml6b250YWxTcGFjZSkKQEAgLTIwNCwxMCArMTg5LDYgQEAgdm9pZCBM aW5lOjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgpCiAgICAgICAgIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGlu ZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLQotICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3bHkgYXBwZW5kZWQgY29udGVudCBtYWtl cyB0aGUgbGluZSBub24tZW1wdHkuCi0gICAgaWYgKG1faXNDb25zaWRlcmVkRW1wdHkgJiYgIW1f cnVucy5pc0VtcHR5KCkgJiYgIWlzUnVuQ29uc2lkZXJlZEVtcHR5KG1fcnVucy5sYXN0KCkpKQot ICAgICAgICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0gZmFsc2U7CiB9CiAKIHZvaWQgTGluZTo6YXBw ZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCkBA IC0yOTUsOSArMjc2LDYgQEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxp bmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFUKICAgICAvLyBTZXQgdGhl IHRyYWlsaW5nIHRyaW1tYWJsZSBjb250ZW50LgogICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1do aXRlc3BhY2UoKSAmJiAhSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFi cyhpbmxpbmVUZXh0SXRlbSkpIHsKICAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQu YWRkRnVsbHlUcmltbWFibGVDb250ZW50KG1fcnVucy5zaXplKCkgLSAxLCBjb250ZW50TG9naWNh bFdpZHRoKCkgLSBvbGRDb250ZW50TG9naWNhbFdpZHRoKTsKLSAgICAgICAgLy8gSWYgd2UgZXZl ciB0cmltIHRoaXMgY29udGVudCwgd2UgbmVlZCB0byBrbm93IGlmIHRoZSBsaW5lIHZpc2liaWxp dHkgc3RhdGUgbmVlZHMgdG8gYmUgcmVjb21wdXRlZC4KLSAgICAgICAgaWYgKG1fdHJpbW1hYmxl VHJhaWxpbmdDb250ZW50LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1faXNDb25zaWRlcmVkRW1w dHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgPSBpc0NvbnNpZGVyZWRFbXB0eSgpOwog ICAgICAgICByZXR1cm47CiAgICAgfQogICAgIC8vIEFueSBub24td2hpdGVzcGFjZSwgbm8tdHJp bW1hYmxlIGNvbnRlbnQgcmVzZXRzIHRoZSBleGlzdGluZyB0cmltbWFibGUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKaW5kZXgg NjA0N2NjYjk1OTY1OGM2NDRmMTU5NGEzYmQzZjdjMTNhMGZiMzljNS4uZjlkMDg1MTRhZjA4YWIz ZjM0ZTI4M2M0MjQ1ZjBiNjJjZGNkZTIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtNDYsMTIgKzQ2LDYgQEAgcHVi bGljOgogCiAgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKTsKIAotICAgIC8vIDxzcGFuPjwvc3Bhbj4gY29uc2lkZXJlZCBlbXB0 eS4KLSAgICAvLyA8c3Bhbj48YnI+PC9zcGFuPiBpcyBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8v IDxzcGFuPnRleHQ8L3NwYW4+IGlzIG5vdCBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8vIDxzcGFu IHN0eWxlPSJwYWRkaW5nOiAxMHB4Ij48L3NwYW4+IGlzIG5vdCBjb25zaWRlcmVkIGVtcHR5LiAK LSAgICBib29sIGlzQ29uc2lkZXJlZEVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbnNpZGVy ZWRFbXB0eTsgfQotCiAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkg Y29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9CiAgICAgSW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9ydW5zLmlzRW1wdHko KSA/IDAuMGYgOiBtX3J1bnMubGFzdCgpLmxvZ2ljYWxSaWdodCgpOyB9CiAKQEAgLTE3OCw4ICsx NzIsNiBAQCBwcml2YXRlOgogICAgIFRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCBtX3RyaW1tYWJs ZVRyYWlsaW5nQ29udGVudDsKICAgICBJbmxpbmVMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxX aWR0aCB7IDAgfTsKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX3RyYWlsaW5nU29m dEh5cGhlbldpZHRoIHsgMCB9OwotICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUg fTsKLSAgICBPcHRpb25hbDxib29sPiBtX2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxl VHJhaWxpbmdDb250ZW50OwogfTsKIAogaW5saW5lIHZvaWQgTGluZTo6VHJpbW1hYmxlVHJhaWxp bmdDb250ZW50OjpyZXNldCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggYThhOGY5MTg5 N2QzNDE5NDRhYzMzNTc5ZTNhMDE1MjI1MmZiY2VhZi4uZjRlMzEwZWVhYzM1MmQ1MTU5ZGRmYjIw MTA1ZmI3MDIwZjg5NDU2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMzU2LDggKzM1 Niw3IEBAIExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNsb3NlKGNv bnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgaWYgKHJ1bnNFeHBhbmRIb3Jpem9u dGFsbHkpCiAgICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbihtX2xpbmVMb2dpY2FsUmVj dC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSk7CiAgICAgYXV0byBsaW5l RW5kc1dpdGhIeXBoZW4gPSBmYWxzZTsKLSAgICBpZiAoIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0 eSgpKSB7Ci0gICAgICAgIEFTU0VSVCghbV9saW5lLnJ1bnMoKS5pc0VtcHR5KCkpOworICAgIGlm ICghbV9saW5lLnJ1bnMoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgYXV0byYgbGFzdFRleHRDb250 ZW50ID0gbV9saW5lLnJ1bnMoKS5sYXN0KCkudGV4dENvbnRlbnQoKTsKICAgICAgICAgbGluZUVu ZHNXaXRoSHlwaGVuID0gbGFzdFRleHRDb250ZW50ICYmIGxhc3RUZXh0Q29udGVudC0+bmVlZHNI eXBoZW4oKTsKICAgICB9CkBAIC02MjMsOSArNjIyLDkgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBM aW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYgaW5s aW4KICAgICAgICAgcmV0dXJuIGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0OwogICAgIH0oKTsKICAg ICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVu dC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKTsKLSAgICAvLyBDaGVjayBp ZiB0aGlzIG5ldyBjb250ZW50IGZpdHMuCi0gICAgYXV0byBpc0xpbmVDb25zaWRlcmVkRW1wdHkg PSBtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5 RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVT dGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFpbGFibGVXaWR0aCwgbV9s aW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldp ZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lk ZXJlZEVtcHR5IH07CisgICAgLy8gV2hpbGUgdGhlIGZsb2F0cyBhcmUgbm90IGNvbnNpZGVyZWQg dG8gYmUgb24gdGhlIGxpbmUsIHRoZXkgbWFrZSB0aGUgbGluZSBjb250ZW50ZnVsIGZvciBsaW5l IGJyZWFraW5nLgorICAgIGF1dG8gbGluZUhhc0NvbnRlbnQgPSAhbV9saW5lLnJ1bnMoKS5pc0Vt cHR5KCkgfHwgbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7CisgICAgYXV0byBsaW5lU3Rh dHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExv Z2ljYWxSaWdodCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lk dGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSwgbGluZUhhc0NvbnRlbnQgfTsKICAgICBhdXRvIHJlc3VsdCA9 IGlubGluZUNvbnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnRpbnVvdXNJbmxp bmVDb250ZW50LCBsaW5lU3RhdHVzKTsKICAgICBpZiAocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0dW5p dHlJdGVtKQogICAgICAgICBtX3dyYXBPcHBvcnR1bml0eUxpc3QuYXBwZW5kKHJlc3VsdC5sYXN0 V3JhcE9wcG9ydHVuaXR5SXRlbSk7Cg== 417361 2021-01-10 20:33:48 -0800 2021-01-16 12:31:38 -0800 Patch bug-220228-20210110203347.patch text/plain 11341 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRkNTg2YjI2OTFlY2Mx MmY2ZTlkMzkwNzRlMzRmNWM4NjJkNWJkYi4uZDRmMTgwMzhiOTJhYWM4ZjY0NGExMmY4ODRlZjZh NTM4MThlZjA0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAxLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94J3MgaG9yaXpvbnRhbCBtYXJnaW4gbWFrZXMgdGhlIGxpbmUgbm9uLWVtcHR5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgdGhlIHJ1bnMg aW5kaXZpZHVhbGx5IG1heSBhbGwgYmUgZW1wdHksIHRoZSBtYXJnaW4gZ2FwIGJldHdlZW4gdGhl bSBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCisgICAgICAgIGUuZy4KKyAgICAgICAgPCFET0NU WVBFIGh0bWw+PGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Ij48c3BhbiBzdHls ZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjwvc3Bhbj48L2Rpdj4KKyAgICAgICAgcGFpbnRzIGEgZ3Jl ZW4gYmxhbmsgbGluZSBhcyB0YWxsIGFzIHRoZSBkZWZhdWx0IGZvbnQgaXMuCisgICAgICAgIE5v dyB0aGF0IGlzQ29uc2lkZXJlZEVtcHR5KCkgYml0IGlzIG9ubHkgdXNlZCBhcyBpbnB1dCB0byBs aW5lIGJyZWFraW5nLCBsZXQncyBjaGFuZ2UgaXQgdG8gYSBtb3JlCisgICAgICAgIGZvY3VzZWQg Y2hlY2sgYW5kIHJlbW92ZSB0aGUgY29uY2VwdCBvZiBpcy1jb25zaWRlcmVkLWVtcHR5IGNvbXBs ZXRlbHkuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50 QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVh a2VyOjpwcm9jZXNzSW5saW5lQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50IGNvbnN0KToKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oOgor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZTo6cmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXND b25zaWRlcmVkRW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQpOgorCiAyMDIxLTAxLTEwICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBQcmUgYW5kIHBvc3QgYW5v bnltb3VzIGJsb2NrcyBpbiBjb250aW51YXRpb24gZG8gbm90IGhhdmUgaW1hZ2luYXJ5IHN0cnV0 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IGQyMGZlMzk4NmYzODE2NDUxYWFj ZTg3ZDlhZDQ0MDhkYjY5ZGY2NmEuLjkzNDgzNGU1MmQ2MDM0OWI2OGRhYzQ0NzkwMjc4MmQ4NjJl OTEwMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTEzNSw3ICsxMzUsNyBA QCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9j ZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgICAgICBpZiAoYXV0byBsYXN0TGluZVdyYXBP cHBvcnR1bml0eUluZGV4ID0gbGFzdFdyYXBPcHBvcnR1bml0eUluZGV4KGNhbmRpZGF0ZUNvbnRl bnQucnVucygpKSkgewogICAgICAgICAgICAgYXV0byBpc0VsaWdpYmxlTGluZVdyYXBPcHBvcnR1 bml0eSA9IFsmXSAoYXV0byYgY2FuZGlkYXRlSXRlbSkgewogICAgICAgICAgICAgICAgIC8vIEp1 c3QgY2hlY2sgZm9yIGxlYWRpbmcgcHJlc2VydmVkIHdoaXRlc3BhY2UgZm9yIG5vdy4KLSAgICAg ICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMuaXNFbXB0eSB8fCAhaXM8SW5saW5lVGV4dEl0ZW0+ KGNhbmRpZGF0ZUl0ZW0pKQorICAgICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRl bnQgfHwgIWlzPElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKSkKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVUZXh0SXRlbSA9 IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKTsKICAgICAgICAgICAgICAg ICByZXR1cm4gIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpIHx8IElubGluZVRleHRJdGVt OjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pOwpAQCAtMTk4LDcg KzE5OCw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVudEJyZWFr ZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgICAgICAgICAgLy8gV2Ug dHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYnV0IHRoZSBhdmFpbGFibGUgc3BhY2UgY2FuJ3Qg ZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmlyc3QgY2hhcmFjdGVyLgogICAgICAgICAgICAgICAgIC8v IDEuIFdyYXAgdGhlIGNvbnRlbnQgb3ZlciB0byB0aGUgbmV4dCBsaW5lIHdoZW4gd2UndmUgZ290 IGNvbnRlbnQgb24gdGhlIGxpbmUgYWxyZWFkeS4KICAgICAgICAgICAgICAgICAvLyAyLiBLZWVw IHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9yIGtlZXAgdGhlIHdob2xl IHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyL2NvbXBsZXRlbHkgZW1wdHkpLgotICAg ICAgICAgICAgICAgIGlmICghbGluZVN0YXR1cy5pc0VtcHR5KQorICAgICAgICAgICAgICAgIGlm IChsaW5lU3RhdHVzLmhhc0NvbnRlbnQpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7IFJl c3VsdDo6QWN0aW9uOjpXcmFwLCBJc0VuZE9mTGluZTo6WWVzIH07CiAgICAgICAgICAgICAgICAg YXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4ID0gKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXND b250ZW50KTsKICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0 PElubGluZVRleHRJdGVtPihjb250aW51b3VzQ29udGVudC5ydW5zKClbbGVhZGluZ1RleHRSdW5J bmRleF0uaW5saW5lSXRlbSk7CkBAIC0yMTMsNyArMjEzLDcgQEAgSW5saW5lQ29udGVudEJyZWFr ZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVu dChjb24KICAgICAgICAgfQogICAgIH0KICAgICAvLyBJZiB3ZSBhcmUgbm90IGFsbG93ZWQgdG8g YnJlYWsgdGhpcyBvdmVyZmxvd2luZyBjb250ZW50LCB3ZSBzdGlsbCBuZWVkIHRvIGRlY2lkZSB3 aGV0aGVyIGtlZXAgaXQgb3Igd3JhcCBpdCB0byB0aGUgbmV4dCBsaW5lLgotICAgIGlmIChsaW5l U3RhdHVzLmlzRW1wdHkpIHsKKyAgICBpZiAoIWxpbmVTdGF0dXMuaGFzQ29udGVudCkgewogICAg ICAgICBBU1NFUlQoIW1faGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9uKTsKICAg ICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpObyB9Owog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oCmluZGV4IGQ4N2I1OGZmYmU3MDU5NTlhMzIw OTgxZDYzNjVhYzljMDMzMTM4NGQuLjY3YTQyNGU4MWRlZmU1YTczNzUyMTA0YTQ0NGE1YjU3Njg4 YWU2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUNvbnRlbnRCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaApAQCAtMTEwLDcgKzExMCw3IEBAIHB1 YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb2xsYXBzaWJsZVdpZHRoIHsgMCB9Owog ICAgICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFpbGluZ1NvZnRIeXBoZW5XaWR0 aDsKICAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdSdW4geyBmYWxzZSB9 OwotICAgICAgICBib29sIGlzRW1wdHkgeyB0cnVlIH07CisgICAgICAgIGJvb2wgaGFzQ29udGVu dCB7IGZhbHNlIH07CiAgICAgfTsKICAgICBSZXN1bHQgcHJvY2Vzc0lubGluZUNvbnRlbnQoY29u c3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJik7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKaW5k ZXggMzZmOGRjNDVlOGU1YjQ5ZDc2ZDA0ZTU0ZTA3OGI5NDkxMGM4OTliYi4uMDBjMzExNzU4MDI3 MTc1NTFiMTRjZTczNTVkY2QxMTAzZDJkOTA1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKQEAgLTU2LDggKzU2LDYg QEAgdm9pZCBMaW5lOjppbml0aWFsaXplKCkKICAgICBtX3J1bnMuY2xlYXIoKTsKICAgICBtX3Ry YWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OwogICAgIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250 ZW50LnJlc2V0KCk7Ci0gICAgbV9pc0NvbnNpZGVyZWRFbXB0eSA9IHRydWU7Ci0gICAgbV9pc0Nv bnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IHsgfTsKIH0KIAog dm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRy YUhvcml6b250YWxTcGFjZSkKQEAgLTEzMiwxOSArMTMwLDYgQEAgdm9pZCBMaW5lOjpyZW1vdmVU cmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQogICAgIH0KIAogICAgIG1fY29udGVudExvZ2ljYWxX aWR0aCAtPSBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZW1vdmUoKTsKLSAgICAvLyBJZiB3 ZSByZW1vdmVkIHRoZSBmaXJzdCB2aXNpYmxlIHJ1biBvbiB0aGUgbGluZSwgd2UgbmVlZCB0byBy ZS1jaGVjayB0aGUgdmlzaWJpbGl0eSBzdGF0dXMuCi0gICAgaWYgKG1faXNDb25zaWRlcmVkRW1w dHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQpIHsKLSAgICAgICAgLy8gSnVzdCBiZWNh dXNlIHRoZSBsaW5lIHdhcyBjb25zaWRlcmVkIGVtcHR5IGJlZm9yZSB0aGUgcmVtb3ZlZCBjb250 ZW50LCBpdCBkb2VzIG5vdCBuZWNlc3NhcmlseSBtZWFuIGl0IGlzIHN0aWxsIGVtcHR5LgotICAg ICAgICAvLyA8c3Bhbj4gIDwvc3Bhbj48c3BhbiBzdHlsZT0icGFkZGluZy1sZWZ0OiAxMHB4Ij48 L3NwYW4+ICA8LSBub24tZW1wdHkKLSAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eSA9IFsmXSB7 Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IG1fcnVucykgewotICAgICAgICAgICAgICAg IGlmICghaXNSdW5Db25zaWRlcmVkRW1wdHkocnVuKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg ICAgIH0oKTsKLSAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWls aW5nQ29udGVudCA9IHsgfTsKLSAgICB9CiB9CiAKIHZvaWQgTGluZTo6dmlzdWFsbHlDb2xsYXBz ZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQoSW5saW5lTGF5b3V0VW5pdCBleHRyYUhvcml6b250YWxT cGFjZSkKQEAgLTIwNCwxMCArMTg5LDYgQEAgdm9pZCBMaW5lOjphcHBlbmQoY29uc3QgSW5saW5l SXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiAgICAgICAg IGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0aCk7CiAg ICAgZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLQotICAgIC8vIENoZWNrIGlm IHRoaXMgbmV3bHkgYXBwZW5kZWQgY29udGVudCBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCi0g ICAgaWYgKG1faXNDb25zaWRlcmVkRW1wdHkgJiYgIW1fcnVucy5pc0VtcHR5KCkgJiYgIWlzUnVu Q29uc2lkZXJlZEVtcHR5KG1fcnVucy5sYXN0KCkpKQotICAgICAgICBtX2lzQ29uc2lkZXJlZEVt cHR5ID0gZmFsc2U7CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29u c3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCkBAIC0yOTUsOSArMjc2LDYgQEAgdm9pZCBM aW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0 ZW0sIElubGluZUxheW91dFUKICAgICAvLyBTZXQgdGhlIHRyYWlsaW5nIHRyaW1tYWJsZSBjb250 ZW50LgogICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhSW5saW5lVGV4 dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpIHsKICAg ICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRkRnVsbHlUcmltbWFibGVDb250ZW50 KG1fcnVucy5zaXplKCkgLSAxLCBjb250ZW50TG9naWNhbFdpZHRoKCkgLSBvbGRDb250ZW50TG9n aWNhbFdpZHRoKTsKLSAgICAgICAgLy8gSWYgd2UgZXZlciB0cmltIHRoaXMgY29udGVudCwgd2Ug bmVlZCB0byBrbm93IGlmIHRoZSBsaW5lIHZpc2liaWxpdHkgc3RhdGUgbmVlZHMgdG8gYmUgcmVj b21wdXRlZC4KLSAgICAgICAgaWYgKG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzRW1wdHko KSkKLSAgICAgICAgICAgIG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQgPSBpc0NvbnNpZGVyZWRFbXB0eSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQog ICAgIC8vIEFueSBub24td2hpdGVzcGFjZSwgbm8tdHJpbW1hYmxlIGNvbnRlbnQgcmVzZXRzIHRo ZSBleGlzdGluZyB0cmltbWFibGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKaW5kZXggNjA0N2NjYjk1OTY1OGM2NDRmMTU5NGEz YmQzZjdjMTNhMGZiMzljNS4uZjlkMDg1MTRhZjA4YWIzZjM0ZTI4M2M0MjQ1ZjBiNjJjZGNkZTIy NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuaApAQCAtNDYsMTIgKzQ2LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBhcHBlbmQo Y29uc3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKIAotICAg IC8vIDxzcGFuPjwvc3Bhbj4gY29uc2lkZXJlZCBlbXB0eS4KLSAgICAvLyA8c3Bhbj48YnI+PC9z cGFuPiBpcyBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8vIDxzcGFuPnRleHQ8L3NwYW4+IGlzIG5v dCBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8vIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAxMHB4Ij48 L3NwYW4+IGlzIG5vdCBjb25zaWRlcmVkIGVtcHR5LiAKLSAgICBib29sIGlzQ29uc2lkZXJlZEVt cHR5KCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbnNpZGVyZWRFbXB0eTsgfQotCiAgICAgSW5saW5l TGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50 TG9naWNhbFdpZHRoOyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFJpZ2h0 KCkgY29uc3QgeyByZXR1cm4gbV9ydW5zLmlzRW1wdHkoKSA/IDAuMGYgOiBtX3J1bnMubGFzdCgp LmxvZ2ljYWxSaWdodCgpOyB9CiAKQEAgLTE3OCw4ICsxNzIsNiBAQCBwcml2YXRlOgogICAgIFRy aW1tYWJsZVRyYWlsaW5nQ29udGVudCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKICAgICBJ bmxpbmVMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICBPcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoIHsgMCB9OwotICAg IGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKLSAgICBPcHRpb25hbDxib29sPiBt X2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50OwogfTsKIAog aW5saW5lIHZvaWQgTGluZTo6VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50OjpyZXNldCgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnVpbGRlci5jcHAKaW5kZXggZDFmMmQ5ODk1NmJlZWQ3MzM4ZTU2Yzk5MTgyZGI2Yzhk MzQzYzU4NC4uMTQyNzcwNmI3MzZkN2JkYmE4ZjdlOGVlMjU0YzkwODZiMzY2ZTViMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMzU1LDggKzM1NSw3IEBAIExpbmVCdWlsZGVyOjpJbmxp bmVJdGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNsb3NlKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVl ZHNMYXlvCiAgICAgaWYgKHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkpCiAgICAgICAgIG1fbGluZS5h cHBseVJ1bkV4cGFuc2lvbihtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRl bnRMb2dpY2FsUmlnaHQoKSk7CiAgICAgYXV0byBsaW5lRW5kc1dpdGhIeXBoZW4gPSBmYWxzZTsK LSAgICBpZiAoIW1fbGluZS5pc0NvbnNpZGVyZWRFbXB0eSgpKSB7Ci0gICAgICAgIEFTU0VSVCgh bV9saW5lLnJ1bnMoKS5pc0VtcHR5KCkpOworICAgIGlmICghbV9saW5lLnJ1bnMoKS5pc0VtcHR5 KCkpIHsKICAgICAgICAgYXV0byYgbGFzdFRleHRDb250ZW50ID0gbV9saW5lLnJ1bnMoKS5sYXN0 KCkudGV4dENvbnRlbnQoKTsKICAgICAgICAgbGluZUVuZHNXaXRoSHlwaGVuID0gbGFzdFRleHRD b250ZW50ICYmIGxhc3RUZXh0Q29udGVudC0+bmVlZHNIeXBoZW4oKTsKICAgICB9CkBAIC02MjIs OSArNjIxLDkgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5l Q29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYgaW5saW4KICAgICAgICAgcmV0dXJuIGFkanVz dGVkTGluZUxvZ2ljYWxSZWN0OwogICAgIH0oKTsKICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0g bGluZUxvZ2ljYWxSZWN0Rm9yQ2FuZGlkYXRlQ29udGVudC53aWR0aCgpIC0gbV9saW5lLmNvbnRl bnRMb2dpY2FsUmlnaHQoKTsKLSAgICAvLyBDaGVjayBpZiB0aGlzIG5ldyBjb250ZW50IGZpdHMu Ci0gICAgYXV0byBpc0xpbmVDb25zaWRlcmVkRW1wdHkgPSBtX2xpbmUuaXNDb25zaWRlcmVkRW1w dHkoKSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7Ci0gICAgYXV0byBsaW5lU3Rh dHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExv Z2ljYWxSaWdodCgpLCBhdmFpbGFibGVXaWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lk dGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CisgICAgLy8gV2hp bGUgdGhlIGZsb2F0cyBhcmUgbm90IGNvbnNpZGVyZWQgdG8gYmUgb24gdGhlIGxpbmUsIHRoZXkg bWFrZSB0aGUgbGluZSBjb250ZW50ZnVsIGZvciBsaW5lIGJyZWFraW5nLgorICAgIGF1dG8gbGlu ZUhhc0NvbnRlbnQgPSAhbV9saW5lLnJ1bnMoKS5pc0VtcHR5KCkgfHwgbV9jb250ZW50SXNDb25z dHJhaW5lZEJ5RmxvYXQ7CisgICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFr ZXI6OkxpbmVTdGF0dXMgeyBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLCBhdmFpbGFibGVX aWR0aCwgbV9saW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5nU29m dEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgbGlu ZUhhc0NvbnRlbnQgfTsKICAgICBhdXRvIHJlc3VsdCA9IGlubGluZUNvbnRlbnRCcmVha2VyLnBy b2Nlc3NJbmxpbmVDb250ZW50KGNvbnRpbnVvdXNJbmxpbmVDb250ZW50LCBsaW5lU3RhdHVzKTsK ICAgICBpZiAocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKQogICAgICAgICBtX3dyYXBP cHBvcnR1bml0eUxpc3QuYXBwZW5kKHJlc3VsdC5sYXN0V3JhcE9wcG9ydHVuaXR5SXRlbSk7Cg== 417767 2021-01-16 12:31:40 -0800 2021-01-16 21:22:05 -0800 Patch bug-220228-20210116123139.patch text/plain 12552 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU3MzczODg2YjQ2ZDcy ZGE1OTM3M2Q0MmIxMjYxODgwMjhhYzhjNC4uNDc4ODdjOWFmN2QwOWQzNDE5YjE1NjQ5YTYxYmFh YjUwMjE0NzUzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAxLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94J3MgaG9yaXpvbnRhbCBtYXJnaW4gbWFrZXMgdGhlIGxpbmUgbm9uLWVtcHR5LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgV2hpbGUgdGhlIHJ1bnMg aW5kaXZpZHVhbGx5IG1heSBhbGwgYmUgZW1wdHksIHRoZSBtYXJnaW4gZ2FwIGJldHdlZW4gdGhl bSBtYWtlcyB0aGUgbGluZSBub24tZW1wdHkuCisgICAgICAgIGUuZy4KKyAgICAgICAgPCFET0NU WVBFIGh0bWw+PGRpdiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Ij48c3BhbiBzdHls ZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjwvc3Bhbj48L2Rpdj4KKyAgICAgICAgcGFpbnRzIGEgZ3Jl ZW4gYmxhbmsgbGluZSBhcyB0YWxsIGFzIHRoZSBkZWZhdWx0IGZvbnQgaXMuCisgICAgICAgIE5v dyB0aGF0IGlzQ29uc2lkZXJlZEVtcHR5KCkgYml0IGlzIG9ubHkgdXNlZCBhcyBpbnB1dCB0byBs aW5lIGJyZWFraW5nLCBsZXQncyBjaGFuZ2UgaXQgdG8gYSBtb3JlCisgICAgICAgIGZvY3VzZWQg Y2hlY2sgYW5kIHJlbW92ZSB0aGUgY29uY2VwdCBvZiBpcy1jb25zaWRlcmVkLWVtcHR5IGNvbXBs ZXRlbHkuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50 QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVh a2VyOjpwcm9jZXNzSW5saW5lQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUNvbnRlbnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50IGNvbnN0KToKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oOgor ICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZTo6cmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXND b25zaWRlcmVkRW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQpOgorCiAyMDIxLTAxLTE2ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEbyBub3QgdXNlIExpbmVC b3g6OmlzQ29uc2lkZXJlZEVtcHR5IHdoZW4gY2hlY2tpbmcgaWYgaW5saW5lIGJveCBzdHJldGNo ZXMgdGhlIGxpbmUgYm94LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IDhjZGZj MTY2ZTY2MDViMjEzYjU2MWQ5MzY2ZjFmOTQ1MmFkZmU1MWMuLmIxYTZkZmYwYzFlMTFkNjFkNTgy YjgwZDc4NTA4ZjBlZTEwN2M3Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAg LTEzNiw3ICsxMzYsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRl bnRCcmVha2VyOjpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgICAgICBpZiAoYXV0 byBsYXN0TGluZVdyYXBPcHBvcnR1bml0eUluZGV4ID0gbGFzdFdyYXBPcHBvcnR1bml0eUluZGV4 KGNhbmRpZGF0ZUNvbnRlbnQucnVucygpKSkgewogICAgICAgICAgICAgYXV0byBpc0VsaWdpYmxl TGluZVdyYXBPcHBvcnR1bml0eSA9IFsmXSAoYXV0byYgY2FuZGlkYXRlSXRlbSkgewogICAgICAg ICAgICAgICAgIC8vIEp1c3QgY2hlY2sgZm9yIGxlYWRpbmcgcHJlc2VydmVkIHdoaXRlc3BhY2Ug Zm9yIG5vdy4KLSAgICAgICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMuaXNFbXB0eSB8fCAhaXM8 SW5saW5lVGV4dEl0ZW0+KGNhbmRpZGF0ZUl0ZW0pKQorICAgICAgICAgICAgICAgIGlmIChsaW5l U3RhdHVzLmhhc0NvbnRlbnQgfHwgIWlzPElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKSkK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICAgICAgYXV0byBp bmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKTsK ICAgICAgICAgICAgICAgICByZXR1cm4gIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpIHx8 IElubGluZVRleHRJdGVtOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0 ZW0pOwpAQCAtMTk5LDcgKzE5OSw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5s aW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAg ICAgICAgICAgLy8gV2UgdHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYnV0IHRoZSBhdmFpbGFi bGUgc3BhY2UgY2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmlyc3QgY2hhcmFjdGVyLgogICAg ICAgICAgICAgICAgIC8vIDEuIFdyYXAgdGhlIGNvbnRlbnQgb3ZlciB0byB0aGUgbmV4dCBsaW5l IHdoZW4gd2UndmUgZ290IGNvbnRlbnQgb24gdGhlIGxpbmUgYWxyZWFkeS4KICAgICAgICAgICAg ICAgICAvLyAyLiBLZWVwIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9y IGtlZXAgdGhlIHdob2xlIHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyL2NvbXBsZXRl bHkgZW1wdHkpLgotICAgICAgICAgICAgICAgIGlmICghbGluZVN0YXR1cy5pc0VtcHR5KQorICAg ICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRlbnQpCiAgICAgICAgICAgICAgICAg ICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpXcmFwLCBJc0VuZE9mTGluZTo6WWVzIH07CiAg ICAgICAgICAgICAgICAgYXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4ID0gKmZpcnN0VGV4dFJ1bklu ZGV4KGNvbnRpbnVvdXNDb250ZW50KTsKICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0 SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjb250aW51b3VzQ29udGVudC5ydW5zKClb bGVhZGluZ1RleHRSdW5JbmRleF0uaW5saW5lSXRlbSk7CkBAIC0yMTQsNyArMjE0LDcgQEAgSW5s aW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092 ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgfQogICAgIH0KICAgICAvLyBJZiB3ZSBhcmUg bm90IGFsbG93ZWQgdG8gYnJlYWsgdGhpcyBvdmVyZmxvd2luZyBjb250ZW50LCB3ZSBzdGlsbCBu ZWVkIHRvIGRlY2lkZSB3aGV0aGVyIGtlZXAgaXQgb3Igd3JhcCBpdCB0byB0aGUgbmV4dCBsaW5l LgotICAgIGlmIChsaW5lU3RhdHVzLmlzRW1wdHkpIHsKKyAgICBpZiAoIWxpbmVTdGF0dXMuaGFz Q29udGVudCkgewogICAgICAgICBBU1NFUlQoIW1faGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91 c1Bvc2l0aW9uKTsKICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5k T2ZMaW5lOjpObyB9OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oCmluZGV4IGQ4N2I1 OGZmYmU3MDU5NTlhMzIwOTgxZDYzNjVhYzljMDMzMTM4NGQuLjY3YTQyNGU4MWRlZmU1YTczNzUy MTA0YTQ0NGE1YjU3Njg4YWU2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaApAQCAtMTEw LDcgKzExMCw3IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb2xsYXBzaWJs ZVdpZHRoIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFpbGlu Z1NvZnRIeXBoZW5XaWR0aDsKICAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxp bmdSdW4geyBmYWxzZSB9OwotICAgICAgICBib29sIGlzRW1wdHkgeyB0cnVlIH07CisgICAgICAg IGJvb2wgaGFzQ29udGVudCB7IGZhbHNlIH07CiAgICAgfTsKICAgICBSZXN1bHQgcHJvY2Vzc0lu bGluZUNvbnRlbnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJik7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBh YzMzMzAxMjQ0NzZjYmUzMzE1ZGNlMGU0MjBlYzkzYTk3YTYwYjFkLi4yMzIxODA5ZjM3NmY0YWEy MGMwNDM2MDgxOGM3NWZlOWI5MDE4ZWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHRRdWlya3MuY3BwCkBAIC02Nyw3ICs2Nyw3IEBAIGJvb2wgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5l Qm94CiAgICAgICAgIH0KICAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9 IGxheW91dFN0YXRlKCkuaW5TdGFuZGFyZHNNb2RlKCk7CiAgICAgICAgIC8vIElubGluZSBib3gg d2l0aCBzdHJ1dCBvbmx5IHN0ZXRjaGVzIHRoZSBsaW5lIGJveCB3aGVuIGl0IGhhcyBhZGRpdGlv bmFsIGlubGluZSBsZXZlbCBib3hlcyAobm90IGlubGluZSBib3hlcykgb3IgdGhlIHJvb3QgaW5s aW5lIGJveCBoYXMgY29udGVudC4KLSAgICAgICAgLy8gZS5nLiA8IURPQ1RZUEUgaHRtbD48ZGl2 Ij48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxMDBweDsiPjwvc3Bhbj48aW1nIHNyYz0iZm9vIiBz dHlsZT0id2lkdGg6IDBweDsgaGVpZ2h0OiAwcHg7Ij48L2Rpdj4KKyAgICAgICAgLy8gZS5nLiA8 IURPQ1RZUEUgaHRtbD48ZGl2PjxzcGFuIHN0eWxlPSJmb250LXNpemU6IDEwMHB4OyI+PC9zcGFu PjxpbWcgc3JjPSJmb28iIHN0eWxlPSJ3aWR0aDogMHB4OyBoZWlnaHQ6IDBweDsiPjwvZGl2Pgog ICAgICAgICByZXR1cm4gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgJiYgKGxpbmVCb3guaGFz Tm9uSW5saW5lQm94KCkgfHwgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpKTsK ICAgICB9CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcAppbmRleCAzNmY4ZGM0NWU4ZTViNDlkNzZkMDRlNTRlMDc4Yjk0OTEwYzg5OWJi Li4wMGMzMTE3NTgwMjcxNzU1MWIxNGNlNzM1NWRjZDExMDNkMmQ5MDViIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApA QCAtNTYsOCArNTYsNiBAQCB2b2lkIExpbmU6OmluaXRpYWxpemUoKQogICAgIG1fcnVucy5jbGVh cigpOwogICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiAgICAgbV90cmltbWFi bGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKLSAgICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0gdHJ1 ZTsKLSAgICBtX2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50 ID0geyB9OwogfQogCiB2b2lkIExpbmU6OnJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChJbmxpbmVM YXlvdXRVbml0IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQpAQCAtMTMyLDE5ICsxMzAsNiBAQCB2b2lk IExpbmU6OnJlbW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpCiAgICAgfQogCiAgICAgbV9j b250ZW50TG9naWNhbFdpZHRoIC09IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlbW92ZSgp OwotICAgIC8vIElmIHdlIHJlbW92ZWQgdGhlIGZpcnN0IHZpc2libGUgcnVuIG9uIHRoZSBsaW5l LCB3ZSBuZWVkIHRvIHJlLWNoZWNrIHRoZSB2aXNpYmlsaXR5IHN0YXR1cy4KLSAgICBpZiAobV9p c0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCkgewotICAgICAg ICAvLyBKdXN0IGJlY2F1c2UgdGhlIGxpbmUgd2FzIGNvbnNpZGVyZWQgZW1wdHkgYmVmb3JlIHRo ZSByZW1vdmVkIGNvbnRlbnQsIGl0IGRvZXMgbm90IG5lY2Vzc2FyaWx5IG1lYW4gaXQgaXMgc3Rp bGwgZW1wdHkuCi0gICAgICAgIC8vIDxzcGFuPiAgPC9zcGFuPjxzcGFuIHN0eWxlPSJwYWRkaW5n LWxlZnQ6IDEwcHgiPjwvc3Bhbj4gIDwtIG5vbi1lbXB0eQotICAgICAgICBtX2lzQ29uc2lkZXJl ZEVtcHR5ID0gWyZdIHsKLSAgICAgICAgICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5zKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKCFpc1J1bkNvbnNpZGVyZWRFbXB0eShydW4pKQotICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICAgICAgfSgpOwotICAgICAgICBtX2lzQ29uc2lkZXJlZEVtcHR5QmVmb3Jl VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50ID0geyB9OwotICAgIH0KIH0KIAogdm9pZCBMaW5lOjp2 aXN1YWxseUNvbGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudChJbmxpbmVMYXlvdXRVbml0IGV4 dHJhSG9yaXpvbnRhbFNwYWNlKQpAQCAtMjA0LDEwICsxODksNiBAQCB2b2lkIExpbmU6OmFwcGVu ZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCkKICAgICAgICAgYXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goaW5saW5lSXRlbSwgbG9n aWNhbFdpZHRoKTsKICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotCi0g ICAgLy8gQ2hlY2sgaWYgdGhpcyBuZXdseSBhcHBlbmRlZCBjb250ZW50IG1ha2VzIHRoZSBsaW5l IG5vbi1lbXB0eS4KLSAgICBpZiAobV9pc0NvbnNpZGVyZWRFbXB0eSAmJiAhbV9ydW5zLmlzRW1w dHkoKSAmJiAhaXNSdW5Db25zaWRlcmVkRW1wdHkobV9ydW5zLmxhc3QoKSkpCi0gICAgICAgIG1f aXNDb25zaWRlcmVkRW1wdHkgPSBmYWxzZTsKIH0KIAogdm9pZCBMaW5lOjphcHBlbmROb25CcmVh a2FibGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKQEAgLTI5NSw5ICsy NzYsNiBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVt JiBpbmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VQogICAgIC8vIFNldCB0aGUgdHJhaWxpbmcg dHJpbW1hYmxlIGNvbnRlbnQuCiAgICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgp ICYmICFJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRl eHRJdGVtKSkgewogICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRGdWxseVRy aW1tYWJsZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSAt IG9sZENvbnRlbnRMb2dpY2FsV2lkdGgpOwotICAgICAgICAvLyBJZiB3ZSBldmVyIHRyaW0gdGhp cyBjb250ZW50LCB3ZSBuZWVkIHRvIGtub3cgaWYgdGhlIGxpbmUgdmlzaWJpbGl0eSBzdGF0ZSBu ZWVkcyB0byBiZSByZWNvbXB1dGVkLgotICAgICAgICBpZiAobV90cmltbWFibGVUcmFpbGluZ0Nv bnRlbnQuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRy aW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IGlzQ29uc2lkZXJlZEVtcHR5KCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAgICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBuby10cmltbWFibGUgY29u dGVudCByZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAppbmRleCA2MDQ3Y2NiOTU5 NjU4YzY0NGYxNTk0YTNiZDNmN2MxM2EwZmIzOWM1Li5mOWQwODUxNGFmMDhhYjNmMzRlMjgzYzQy NDVmMGI2MmNkY2RlMjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC00NiwxMiArNDYsNiBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgpOwogCi0gICAgLy8gPHNwYW4+PC9zcGFuPiBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8v IDxzcGFuPjxicj48L3NwYW4+IGlzIGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8gPHNwYW4+dGV4 dDwvc3Bhbj4gaXMgbm90IGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8gPHNwYW4gc3R5bGU9InBh ZGRpbmc6IDEwcHgiPjwvc3Bhbj4gaXMgbm90IGNvbnNpZGVyZWQgZW1wdHkuIAotICAgIGJvb2wg aXNDb25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29uc2lkZXJlZEVtcHR5OyB9 Ci0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJl dHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBtX3J1bnMuaXNFbXB0eSgpID8gMC4wZiA6 IG1fcnVucy5sYXN0KCkubG9naWNhbFJpZ2h0KCk7IH0KIApAQCAtMTc4LDggKzE3Miw2IEBAIHBy aXZhdGU6CiAgICAgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50IG1fdHJpbW1hYmxlVHJhaWxpbmdD b250ZW50OwogICAgIElubGluZUxheW91dFVuaXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsgMCB9 OwogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lk dGggeyAwIH07Ci0gICAgYm9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwotICAgIE9w dGlvbmFsPGJvb2w+IG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0Nv bnRlbnQ7CiB9OwogCiBpbmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6 OnJlc2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBkMWYyZDk4OTU2YmVlZDczMzhl NTZjOTkxODJkYjZjOGQzNDNjNTg0Li4xNDI3NzA2YjczNmQ3YmRiYThmN2U4ZWUyNTRjOTA4NmIz NjZlNWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNTUsOCArMzU1LDcgQEAgTGlu ZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRlcjo6Y2xvc2UoY29uc3QgSW5saW5l SXRlbVJhbmdlJiBuZWVkc0xheW8KICAgICBpZiAocnVuc0V4cGFuZEhvcml6b250YWxseSkKICAg ICAgICAgbV9saW5lLmFwcGx5UnVuRXhwYW5zaW9uKG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkg LSBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpKTsKICAgICBhdXRvIGxpbmVFbmRzV2l0aEh5 cGhlbiA9IGZhbHNlOwotICAgIGlmICghbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkpIHsKLSAg ICAgICAgQVNTRVJUKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSk7CisgICAgaWYgKCFtX2xpbmUu cnVucygpLmlzRW1wdHkoKSkgewogICAgICAgICBhdXRvJiBsYXN0VGV4dENvbnRlbnQgPSBtX2xp bmUucnVucygpLmxhc3QoKS50ZXh0Q29udGVudCgpOwogICAgICAgICBsaW5lRW5kc1dpdGhIeXBo ZW4gPSBsYXN0VGV4dENvbnRlbnQgJiYgbGFzdFRleHRDb250ZW50LT5uZWVkc0h5cGhlbigpOwog ICAgIH0KQEAgLTYyMiw5ICs2MjEsOSBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVy OjpoYW5kbGVJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiBpbmxpbgogICAgICAg ICByZXR1cm4gYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3Q7CiAgICAgfSgpOwogICAgIGF1dG8gYXZh aWxhYmxlV2lkdGggPSBsaW5lTG9naWNhbFJlY3RGb3JDYW5kaWRhdGVDb250ZW50LndpZHRoKCkg LSBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpOwotICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3 IGNvbnRlbnQgZml0cy4KLSAgICBhdXRvIGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9IG1fbGluZS5p c0NvbnNpZGVyZWRFbXB0eSgpICYmICFtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKLSAg ICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1f bGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1h YmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9s aW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBpc0xpbmVDb25zaWRlcmVkRW1wdHkg fTsKKyAgICAvLyBXaGlsZSB0aGUgZmxvYXRzIGFyZSBub3QgY29uc2lkZXJlZCB0byBiZSBvbiB0 aGUgbGluZSwgdGhleSBtYWtlIHRoZSBsaW5lIGNvbnRlbnRmdWwgZm9yIGxpbmUgYnJlYWtpbmcu CisgICAgYXV0byBsaW5lSGFzQ29udGVudCA9ICFtX2xpbmUucnVucygpLmlzRW1wdHkoKSB8fCBt X2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxp bmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0 KCksIGF2YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xp bmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRy aW1tYWJsZSgpLCBsaW5lSGFzQ29udGVudCB9OwogICAgIGF1dG8gcmVzdWx0ID0gaW5saW5lQ29u dGVudEJyZWFrZXIucHJvY2Vzc0lubGluZUNvbnRlbnQoY29udGludW91c0lubGluZUNvbnRlbnQs IGxpbmVTdGF0dXMpOwogICAgIGlmIChyZXN1bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pCiAg ICAgICAgIG1fd3JhcE9wcG9ydHVuaXR5TGlzdC5hcHBlbmQocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0 dW5pdHlJdGVtKTsK 417772 2021-01-16 21:22:07 -0800 2021-01-17 06:44:42 -0800 Patch bug-220228-20210116212206.patch text/plain 12258 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU3MzczODg2YjQ2ZDcy ZGE1OTM3M2Q0MmIxMjYxODgwMjhhYzhjNC4uNzAzMDlkZDM2YjE1MWZiNzBiNjA0ZmJkOGMzNmM5 Y2Y2YWU1MmIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAxLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBObyBuZWVk IHRvIG1haW50YWluIHRoZSAiaXMgY29uc2lkZXJlZCBlbXB0eSIgYml0IGFueW1vcmUuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAyMjgKKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBOb3cgdGhhdCBpc0Nv bnNpZGVyZWRFbXB0eSgpIGJpdCBpcyBvbmx5IHVzZWQgYXMgaW5wdXQgdG8gbGluZSBicmVha2lu ZywgbGV0J3MgY2hhbmdlIGl0IHRvIGEgbW9yZQorICAgICAgICBmb2N1c2VkIGNoZWNrIGFuZCBy ZW1vdmUgdGhlIGNvbmNlcHQgb2YgImlzIGNvbnNpZGVyZWQgZW1wdHkiIGNvbXBsZXRlbHkuCisK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjpwcm9j ZXNzSW5saW5lQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRl bnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50IGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oOgorICAgICAgICAq IGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6cmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZTo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNDb25zaWRlcmVk RW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmNsb3NlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6Omhh bmRsZUlubGluZUNvbnRlbnQpOgorCiAyMDIxLTAxLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEbyBub3QgdXNlIExpbmVCb3g6OmlzQ29u c2lkZXJlZEVtcHR5IHdoZW4gY2hlY2tpbmcgaWYgaW5saW5lIGJveCBzdHJldGNoZXMgdGhlIGxp bmUgYm94LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4IDhjZGZjMTY2ZTY2MDVi MjEzYjU2MWQ5MzY2ZjFmOTQ1MmFkZmU1MWMuLmIxYTZkZmYwYzFlMTFkNjFkNTgyYjgwZDc4NTA4 ZjBlZTEwN2M3Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTEzNiw3ICsx MzYsNyBAQCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2Vy Ojpwcm9jZXNzSW5saW5lQ29udGVudChjb25zdCBDbwogICAgICAgICBpZiAoYXV0byBsYXN0TGlu ZVdyYXBPcHBvcnR1bml0eUluZGV4ID0gbGFzdFdyYXBPcHBvcnR1bml0eUluZGV4KGNhbmRpZGF0 ZUNvbnRlbnQucnVucygpKSkgewogICAgICAgICAgICAgYXV0byBpc0VsaWdpYmxlTGluZVdyYXBP cHBvcnR1bml0eSA9IFsmXSAoYXV0byYgY2FuZGlkYXRlSXRlbSkgewogICAgICAgICAgICAgICAg IC8vIEp1c3QgY2hlY2sgZm9yIGxlYWRpbmcgcHJlc2VydmVkIHdoaXRlc3BhY2UgZm9yIG5vdy4K LSAgICAgICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMuaXNFbXB0eSB8fCAhaXM8SW5saW5lVGV4 dEl0ZW0+KGNhbmRpZGF0ZUl0ZW0pKQorICAgICAgICAgICAgICAgIGlmIChsaW5lU3RhdHVzLmhh c0NvbnRlbnQgfHwgIWlzPElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKSkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICAgICAgYXV0byBpbmxpbmVUZXh0 SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjYW5kaWRhdGVJdGVtKTsKICAgICAgICAg ICAgICAgICByZXR1cm4gIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpIHx8IElubGluZVRl eHRJdGVtOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pOwpAQCAt MTk5LDcgKzE5OSw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5lQ29udGVu dEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgICAgICAgICAg Ly8gV2UgdHJpZWQgdG8gYnJlYWsgdGhlIGNvbnRlbnQgYnV0IHRoZSBhdmFpbGFibGUgc3BhY2Ug Y2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUgZmlyc3QgY2hhcmFjdGVyLgogICAgICAgICAgICAg ICAgIC8vIDEuIFdyYXAgdGhlIGNvbnRlbnQgb3ZlciB0byB0aGUgbmV4dCBsaW5lIHdoZW4gd2Un dmUgZ290IGNvbnRlbnQgb24gdGhlIGxpbmUgYWxyZWFkeS4KICAgICAgICAgICAgICAgICAvLyAy LiBLZWVwIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9yIGtlZXAgdGhl IHdob2xlIHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyL2NvbXBsZXRlbHkgZW1wdHkp LgotICAgICAgICAgICAgICAgIGlmICghbGluZVN0YXR1cy5pc0VtcHR5KQorICAgICAgICAgICAg ICAgIGlmIChsaW5lU3RhdHVzLmhhc0NvbnRlbnQpCiAgICAgICAgICAgICAgICAgICAgIHJldHVy biB7IFJlc3VsdDo6QWN0aW9uOjpXcmFwLCBJc0VuZE9mTGluZTo6WWVzIH07CiAgICAgICAgICAg ICAgICAgYXV0byBsZWFkaW5nVGV4dFJ1bkluZGV4ID0gKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRp bnVvdXNDb250ZW50KTsKICAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRv d25jYXN0PElubGluZVRleHRJdGVtPihjb250aW51b3VzQ29udGVudC5ydW5zKClbbGVhZGluZ1Rl eHRSdW5JbmRleF0uaW5saW5lSXRlbSk7CkBAIC0yMTQsNyArMjE0LDcgQEAgSW5saW5lQ29udGVu dEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5n Q29udGVudChjb24KICAgICAgICAgfQogICAgIH0KICAgICAvLyBJZiB3ZSBhcmUgbm90IGFsbG93 ZWQgdG8gYnJlYWsgdGhpcyBvdmVyZmxvd2luZyBjb250ZW50LCB3ZSBzdGlsbCBuZWVkIHRvIGRl Y2lkZSB3aGV0aGVyIGtlZXAgaXQgb3Igd3JhcCBpdCB0byB0aGUgbmV4dCBsaW5lLgotICAgIGlm IChsaW5lU3RhdHVzLmlzRW1wdHkpIHsKKyAgICBpZiAoIWxpbmVTdGF0dXMuaGFzQ29udGVudCkg ewogICAgICAgICBBU1NFUlQoIW1faGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9u KTsKICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OktlZXAsIElzRW5kT2ZMaW5lOjpO byB9OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oCmluZGV4IGQ4N2I1OGZmYmU3MDU5 NTlhMzIwOTgxZDYzNjVhYzljMDMzMTM4NGQuLjY3YTQyNGU4MWRlZmU1YTczNzUyMTA0YTQ0NGE1 YjU3Njg4YWU2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaApAQCAtMTEwLDcgKzExMCw3 IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBjb2xsYXBzaWJsZVdpZHRoIHsg MCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB0cmFpbGluZ1NvZnRIeXBo ZW5XaWR0aDsKICAgICAgICAgYm9vbCBoYXNGdWxseUNvbGxhcHNpYmxlVHJhaWxpbmdSdW4geyBm YWxzZSB9OwotICAgICAgICBib29sIGlzRW1wdHkgeyB0cnVlIH07CisgICAgICAgIGJvb2wgaGFz Q29udGVudCB7IGZhbHNlIH07CiAgICAgfTsKICAgICBSZXN1bHQgcHJvY2Vzc0lubGluZUNvbnRl bnQoY29uc3QgQ29udGludW91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJik7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCBhYzMzMzAxMjQ0 NzZjYmUzMzE1ZGNlMGU0MjBlYzkzYTk3YTYwYjFkLi4yMzIxODA5ZjM3NmY0YWEyMGMwNDM2MDgx OGM3NWZlOWI5MDE4ZWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwCkBAIC02Nyw3ICs2Nyw3IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94CiAgICAg ICAgIH0KICAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91dFN0 YXRlKCkuaW5TdGFuZGFyZHNNb2RlKCk7CiAgICAgICAgIC8vIElubGluZSBib3ggd2l0aCBzdHJ1 dCBvbmx5IHN0ZXRjaGVzIHRoZSBsaW5lIGJveCB3aGVuIGl0IGhhcyBhZGRpdGlvbmFsIGlubGlu ZSBsZXZlbCBib3hlcyAobm90IGlubGluZSBib3hlcykgb3IgdGhlIHJvb3QgaW5saW5lIGJveCBo YXMgY29udGVudC4KLSAgICAgICAgLy8gZS5nLiA8IURPQ1RZUEUgaHRtbD48ZGl2Ij48c3BhbiBz dHlsZT0iZm9udC1zaXplOiAxMDBweDsiPjwvc3Bhbj48aW1nIHNyYz0iZm9vIiBzdHlsZT0id2lk dGg6IDBweDsgaGVpZ2h0OiAwcHg7Ij48L2Rpdj4KKyAgICAgICAgLy8gZS5nLiA8IURPQ1RZUEUg aHRtbD48ZGl2PjxzcGFuIHN0eWxlPSJmb250LXNpemU6IDEwMHB4OyI+PC9zcGFuPjxpbWcgc3Jj PSJmb28iIHN0eWxlPSJ3aWR0aDogMHB4OyBoZWlnaHQ6IDBweDsiPjwvZGl2PgogICAgICAgICBy ZXR1cm4gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgJiYgKGxpbmVCb3guaGFzTm9uSW5saW5l Qm94KCkgfHwgbGluZUJveC5yb290SW5saW5lQm94KCkuaGFzQ29udGVudCgpKTsKICAgICB9CiAg ICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNw cAppbmRleCAzNmY4ZGM0NWU4ZTViNDlkNzZkMDRlNTRlMDc4Yjk0OTEwYzg5OWJiLi4wMGMzMTE3 NTgwMjcxNzU1MWIxNGNlNzM1NWRjZDExMDNkMmQ5MDViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtNTYsOCAr NTYsNiBAQCB2b2lkIExpbmU6OmluaXRpYWxpemUoKQogICAgIG1fcnVucy5jbGVhcigpOwogICAg IG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiAgICAgbV90cmltbWFibGVUcmFpbGlu Z0NvbnRlbnQucmVzZXQoKTsKLSAgICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0gdHJ1ZTsKLSAgICBt X2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50ID0geyB9Owog fQogCiB2b2lkIExpbmU6OnJlbW92ZUNvbGxhcHNpYmxlQ29udGVudChJbmxpbmVMYXlvdXRVbml0 IGV4dHJhSG9yaXpvbnRhbFNwYWNlKQpAQCAtMTMyLDE5ICsxMzAsNiBAQCB2b2lkIExpbmU6OnJl bW92ZVRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpCiAgICAgfQogCiAgICAgbV9jb250ZW50TG9n aWNhbFdpZHRoIC09IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlbW92ZSgpOwotICAgIC8v IElmIHdlIHJlbW92ZWQgdGhlIGZpcnN0IHZpc2libGUgcnVuIG9uIHRoZSBsaW5lLCB3ZSBuZWVk IHRvIHJlLWNoZWNrIHRoZSB2aXNpYmlsaXR5IHN0YXR1cy4KLSAgICBpZiAobV9pc0NvbnNpZGVy ZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCkgewotICAgICAgICAvLyBKdXN0 IGJlY2F1c2UgdGhlIGxpbmUgd2FzIGNvbnNpZGVyZWQgZW1wdHkgYmVmb3JlIHRoZSByZW1vdmVk IGNvbnRlbnQsIGl0IGRvZXMgbm90IG5lY2Vzc2FyaWx5IG1lYW4gaXQgaXMgc3RpbGwgZW1wdHku Ci0gICAgICAgIC8vIDxzcGFuPiAgPC9zcGFuPjxzcGFuIHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDEw cHgiPjwvc3Bhbj4gIDwtIG5vbi1lbXB0eQotICAgICAgICBtX2lzQ29uc2lkZXJlZEVtcHR5ID0g WyZdIHsKLSAgICAgICAgICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5zKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKCFpc1J1bkNvbnNpZGVyZWRFbXB0eShydW4pKQotICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAgICAgfSgpOwotICAgICAgICBtX2lzQ29uc2lkZXJlZEVtcHR5QmVmb3JlVHJpbW1hYmxl VHJhaWxpbmdDb250ZW50ID0geyB9OwotICAgIH0KIH0KIAogdm9pZCBMaW5lOjp2aXN1YWxseUNv bGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudChJbmxpbmVMYXlvdXRVbml0IGV4dHJhSG9yaXpv bnRhbFNwYWNlKQpAQCAtMjA0LDEwICsxODksNiBAQCB2b2lkIExpbmU6OmFwcGVuZChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKICAg ICAgICAgYXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goaW5saW5lSXRlbSwgbG9naWNhbFdpZHRo KTsKICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotCi0gICAgLy8gQ2hl Y2sgaWYgdGhpcyBuZXdseSBhcHBlbmRlZCBjb250ZW50IG1ha2VzIHRoZSBsaW5lIG5vbi1lbXB0 eS4KLSAgICBpZiAobV9pc0NvbnNpZGVyZWRFbXB0eSAmJiAhbV9ydW5zLmlzRW1wdHkoKSAmJiAh aXNSdW5Db25zaWRlcmVkRW1wdHkobV9ydW5zLmxhc3QoKSkpCi0gICAgICAgIG1faXNDb25zaWRl cmVkRW1wdHkgPSBmYWxzZTsKIH0KIAogdm9pZCBMaW5lOjphcHBlbmROb25CcmVha2FibGVTcGFj ZShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKQEAgLTI5NSw5ICsyNzYsNiBAQCB2 b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVU ZXh0SXRlbSwgSW5saW5lTGF5b3V0VQogICAgIC8vIFNldCB0aGUgdHJhaWxpbmcgdHJpbW1hYmxl IGNvbnRlbnQuCiAgICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpICYmICFJbmxp bmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVtKSkg ewogICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRGdWxseVRyaW1tYWJsZUNv bnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSAtIG9sZENvbnRl bnRMb2dpY2FsV2lkdGgpOwotICAgICAgICAvLyBJZiB3ZSBldmVyIHRyaW0gdGhpcyBjb250ZW50 LCB3ZSBuZWVkIHRvIGtub3cgaWYgdGhlIGxpbmUgdmlzaWJpbGl0eSBzdGF0ZSBuZWVkcyB0byBi ZSByZWNvbXB1dGVkLgotICAgICAgICBpZiAobV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuaXNF bXB0eSgpKQotICAgICAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRy YWlsaW5nQ29udGVudCA9IGlzQ29uc2lkZXJlZEVtcHR5KCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAgICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBuby10cmltbWFibGUgY29udGVudCByZXNl dHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAppbmRleCA2MDQ3Y2NiOTU5NjU4YzY0NGYx NTk0YTNiZDNmN2MxM2EwZmIzOWM1Li5mOWQwODUxNGFmMDhhYjNmMzRlMjgzYzQyNDVmMGI2MmNk Y2RlMjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5oCkBAIC00NiwxMiArNDYsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFw cGVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwog Ci0gICAgLy8gPHNwYW4+PC9zcGFuPiBjb25zaWRlcmVkIGVtcHR5LgotICAgIC8vIDxzcGFuPjxi cj48L3NwYW4+IGlzIGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8gPHNwYW4+dGV4dDwvc3Bhbj4g aXMgbm90IGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgLy8gPHNwYW4gc3R5bGU9InBhZGRpbmc6IDEw cHgiPjwvc3Bhbj4gaXMgbm90IGNvbnNpZGVyZWQgZW1wdHkuIAotICAgIGJvb2wgaXNDb25zaWRl cmVkRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzQ29uc2lkZXJlZEVtcHR5OyB9Ci0KICAgICBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2Nv bnRlbnRMb2dpY2FsV2lkdGg7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs UmlnaHQoKSBjb25zdCB7IHJldHVybiBtX3J1bnMuaXNFbXB0eSgpID8gMC4wZiA6IG1fcnVucy5s YXN0KCkubG9naWNhbFJpZ2h0KCk7IH0KIApAQCAtMTc4LDggKzE3Miw2IEBAIHByaXZhdGU6CiAg ICAgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50Owog ICAgIElubGluZUxheW91dFVuaXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsgMCB9OwogICAgIE9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggeyAwIH07 Ci0gICAgYm9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwotICAgIE9wdGlvbmFsPGJv b2w+IG1faXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CiB9 OwogCiBpbmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6OnJlc2V0KCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBkMWYyZDk4OTU2YmVlZDczMzhlNTZjOTkxODJk YjZjOGQzNDNjNTg0Li4xNDI3NzA2YjczNmQ3YmRiYThmN2U4ZWUyNTRjOTA4NmIzNjZlNWIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNTUsOCArMzU1LDcgQEAgTGluZUJ1aWxkZXI6 OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRlcjo6Y2xvc2UoY29uc3QgSW5saW5lSXRlbVJhbmdl JiBuZWVkc0xheW8KICAgICBpZiAocnVuc0V4cGFuZEhvcml6b250YWxseSkKICAgICAgICAgbV9s aW5lLmFwcGx5UnVuRXhwYW5zaW9uKG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkgLSBtX2xpbmUu Y29udGVudExvZ2ljYWxSaWdodCgpKTsKICAgICBhdXRvIGxpbmVFbmRzV2l0aEh5cGhlbiA9IGZh bHNlOwotICAgIGlmICghbV9saW5lLmlzQ29uc2lkZXJlZEVtcHR5KCkpIHsKLSAgICAgICAgQVNT RVJUKCFtX2xpbmUucnVucygpLmlzRW1wdHkoKSk7CisgICAgaWYgKCFtX2xpbmUucnVucygpLmlz RW1wdHkoKSkgewogICAgICAgICBhdXRvJiBsYXN0VGV4dENvbnRlbnQgPSBtX2xpbmUucnVucygp Lmxhc3QoKS50ZXh0Q29udGVudCgpOwogICAgICAgICBsaW5lRW5kc1dpdGhIeXBoZW4gPSBsYXN0 VGV4dENvbnRlbnQgJiYgbGFzdFRleHRDb250ZW50LT5uZWVkc0h5cGhlbigpOwogICAgIH0KQEAg LTYyMiw5ICs2MjEsOSBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVJ bmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiBpbmxpbgogICAgICAgICByZXR1cm4g YWRqdXN0ZWRMaW5lTG9naWNhbFJlY3Q7CiAgICAgfSgpOwogICAgIGF1dG8gYXZhaWxhYmxlV2lk dGggPSBsaW5lTG9naWNhbFJlY3RGb3JDYW5kaWRhdGVDb250ZW50LndpZHRoKCkgLSBtX2xpbmUu Y29udGVudExvZ2ljYWxSaWdodCgpOwotICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3IGNvbnRlbnQg Zml0cy4KLSAgICBhdXRvIGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9IG1fbGluZS5pc0NvbnNpZGVy ZWRFbXB0eSgpICYmICFtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKLSAgICBhdXRvIGxp bmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250 ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxp bmdXaWR0aCgpLCBtX2xpbmUudHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJh aWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBpc0xpbmVDb25zaWRlcmVkRW1wdHkgfTsKKyAgICAv LyBXaGlsZSB0aGUgZmxvYXRzIGFyZSBub3QgY29uc2lkZXJlZCB0byBiZSBvbiB0aGUgbGluZSwg dGhleSBtYWtlIHRoZSBsaW5lIGNvbnRlbnRmdWwgZm9yIGxpbmUgYnJlYWtpbmcuCisgICAgYXV0 byBsaW5lSGFzQ29udGVudCA9ICFtX2xpbmUucnVucygpLmlzRW1wdHkoKSB8fCBtX2NvbnRlbnRJ c0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50 QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWls YWJsZVdpZHRoLCBtX2xpbmUudHJpbW1hYmxlVHJhaWxpbmdXaWR0aCgpLCBtX2xpbmUudHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgp LCBsaW5lSGFzQ29udGVudCB9OwogICAgIGF1dG8gcmVzdWx0ID0gaW5saW5lQ29udGVudEJyZWFr ZXIucHJvY2Vzc0lubGluZUNvbnRlbnQoY29udGludW91c0lubGluZUNvbnRlbnQsIGxpbmVTdGF0 dXMpOwogICAgIGlmIChyZXN1bHQubGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0pCiAgICAgICAgIG1f d3JhcE9wcG9ydHVuaXR5TGlzdC5hcHBlbmQocmVzdWx0Lmxhc3RXcmFwT3Bwb3J0dW5pdHlJdGVt KTsK