237732 2022-03-10 13:46:38 -0800 [css-grid] Grid contents sometimes layout with the wrong width 2022-03-29 16:05:37 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209282 https://www.economist.com/the-economist-explains/2022/02/03/how-apples-privacy-push-cost-meta-10bn InRadar P2 Normal --- 1 mattwoodrow mattwoodrow bfulgham changseok dino esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan obrufau pdr rego sebastian.sams simon.fraser svillar webkit-bug-importer zalan zsun oldest_to_newest 1850229 0 mattwoodrow 2022-03-10 13:46:38 -0800 <rdar://88512506> Resizing the browser on the provided URL sometimes lays out the main article text to the wrong width, where it doesn't line wrap at all and just extends off the right side of the page. It looks like we call RenderGrid::computeIntrinsicLogicalWidths and that results in us calling layoutIfNeeded on the child RenderBlock with an estimated width (which turns out to be wrong). Now that we've mutated the child and laid it out incorrectly, nothing marks the RenderGrid itself as needing layout, so we never do a proper layout with the final grid column sizes to fix this again. The bug happens intermittently, since anytime we do a full layout of the grid, we also layout the children correctly. 1850771 1 mattwoodrow 2022-03-13 14:16:16 -0700 *** Bug 237710 has been marked as a duplicate of this bug. *** 1850772 2 mattwoodrow 2022-03-13 14:17:25 -0700 Bug 237710 has a reduced test case for this: https://bugs.webkit.org/attachment.cgi?id=454343 This is a regression from https://bugs.webkit.org/show_bug.cgi?id=232140 1850773 3 mattwoodrow 2022-03-13 14:32:28 -0700 It seems like we shouldn't be laying out children of a RenderGrid from (const!) computeIntrinsicLogicalWidths using estimated grid breadths. Could we cache the intrinsic sizes when we do a full layout, and reuse those if we haven't marked the RenderGrid as needing layout? A quick prototype of that seems to work. 1850783 4 mattwoodrow 2022-03-13 18:53:49 -0700 Looks like this showed up previously, but went away due to a change in the flex code. This is new variant of the same existing issue. https://bugs.webkit.org/show_bug.cgi?id=209282 1852119 5 454926 mattwoodrow 2022-03-16 20:08:42 -0700 Created attachment 454926 Patch 1852522 6 454926 jfernandez 2022-03-17 15:39:40 -0700 Comment on attachment 454926 Patch The change looks fine, but there are a few tests that regressed. 1855850 7 455971 mattwoodrow 2022-03-28 17:02:38 -0700 Created attachment 455971 Patch 1856227 8 ews-feeder 2022-03-29 16:05:31 -0700 Committed r292079 (249006@main): <https://commits.webkit.org/249006@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455971. 454926 2022-03-16 20:08:42 -0700 2022-03-28 17:02:33 -0700 Patch bug-237732-20220317160839.patch text/plain 6811 mattwoodrow U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc3ZTU3NDZlNDY4NTNh NWUxZGIxMTBhN2NiZmMxYzhhNWJmZTViMS4uMDMzMmQ2ZDgwODQzZGVhOTBlMzVjN2UwNjBjZjY0 OTQxZjAwNThhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTE2ICBNYXR0 IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgbXV0YXRl IGNoaWxkcmVuIGR1cmluZyBSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo cyB1bmxlc3Mgd2UncmUgYWJvdXQgdG8gcmUtbGF5b3V0LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NzMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyBjb25zdCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKworICAgICAgICBjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRocyBjYW4gcmUtbGF5b3V0IGNoaWxkcmVuICh2aWEgcGVyZm9ybUdyaWRJ dGVtc1ByZUxheW91dCwgYXMgd2VsbCBhcyBkdXJpbmcKKyAgICAgICAgdGhlIHRyYWNrIHNpemlu ZyBhbGdvcml0aG0pLCBhbmQgZG9lcyBzbyB1c2luZyB0aGUgZXN0aW1hdGVkIHRyYWNrIHNpemVz LiBUaGlzIGNhbiBiZSBpbmNvcnJlY3QsIGFuZCBpZgorICAgICAgICB3ZSdyZSBub3QgYWJvdXQg dG8gZG8gYSBmdWxsIGxheW91dCBvbiB0aGlzIFJlbmRlckdyaWQsIGl0IGNhbiBsZWF2ZSB0aGUg Y2hpbGRyZW4gaW4gYW4gaW52YWxpZCBzdGF0ZS4KKworICAgICAgICBUaGlzIGNhY2hlcyB0aGUg aW50cmluc2ljIHNpemVzIHdoZW4gd2UgZG8gYSBmdWxsIGxheW91dCwgc28gdGhhdCB3ZSBjYW4g dXNlIHRoZXNlIHZhbHVlcyBpbnN0ZWFkIHdoZW4KKyAgICAgICAgd2UganVzdCB3YW50IHRvIHF1 ZXJ5IHRoZSBSZW5kZXJHcmlkIHdpdGhvdXQgbXV0YXRpbmcgYW55dGhpbmcuCisKIDIwMjItMDMt MDkgIE1hdHQgV29vZHJvdyAgPG1hdHR3b29kcm93QGFwcGxlLmNvbT4KIAogICAgICAgICBHcmlk IGl0ZW1zIHRoYXQgZXN0YWJsaXNoIGFuIGluZGVwZW5kZW50IGZvcm1hdHRpbmcgY29udGV4dCBz aG91bGQgbm90IGJlIHN1YmdyaWRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu Y3BwCmluZGV4IDVlOTkyMzJkOTA1Yzk1NDI1NWIxMzNlN2Y2MWNmYWUxMWYxYThjODAuLjVkMWRm YWQ0YzM5NDAwZDhiM2UxMGFlYTgzNzgxZDNiZjgxZmZjY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTI4MSw2ICsyODEsOCBAQCB2b2lkIFJlbmRlckdyaWQ6 OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICAgICAg Ly8gc2l6ZXMuIFdlIGNhbm5vdCBkbyB0aGUgc2FtZSBmb3IgaGVpZ2h0cyB0aG91Z2ggYmVjYXVz ZSBtYW55IGNvZGUgcGF0aHMgaW5zaWRlIHVwZGF0ZUxvZ2ljYWxIZWlnaHQoKSByZXF1aXJlIAog ICAgICAgICAvLyBhIHByZXZpb3VzIGNhbGwgdG8gc2V0TG9naWNhbEhlaWdodCgpIHRvIHJlc29s dmUgaGVpZ2h0cyBwcm9wZXJseSAobGlrZSBmb3IgcG9zaXRpb25lZCBpdGVtcyBmb3IgZXhhbXBs ZSkuCiAgICAgICAgIGNvbXB1dGVUcmFja1NpemVzRm9yRGVmaW5pdGVTaXplKEZvckNvbHVtbnMs IGF2YWlsYWJsZVNwYWNlRm9yQ29sdW1ucyk7CisgICAgICAgIG1fbWluQ29udGVudFNpemUgPSBt X3RyYWNrU2l6aW5nQWxnb3JpdGhtLm1pbkNvbnRlbnRTaXplKCk7CisgICAgICAgIG1fbWF4Q29u dGVudFNpemUgPSBtX3RyYWNrU2l6aW5nQWxnb3JpdGhtLm1heENvbnRlbnRTaXplKCk7CiAKICAg ICAgICAgLy8gMS41LSBDb21wdXRlIENvbnRlbnQgRGlzdHJpYnV0aW9uIG9mZnNldHMgZm9yIGNv bHVtbiB0cmFja3MKICAgICAgICAgY29tcHV0ZUNvbnRlbnRQb3NpdGlvbkFuZERpc3RyaWJ1dGlv bk9mZnNldChGb3JDb2x1bW5zLCBtX3RyYWNrU2l6aW5nQWxnb3JpdGhtLmZyZWVTcGFjZShGb3JD b2x1bW5zKS52YWx1ZSgpLCBub25Db2xsYXBzZWRUcmFja3MoRm9yQ29sdW1ucykpOwpAQCAtNDU5 LDIzICs0NjEsMjkgQEAgdm9pZCBSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdp ZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW8KICAgICBMYXlvdXRVbml0IGNo aWxkTWF4V2lkdGg7CiAgICAgYm9vbCBoYWRFeGNsdWRlZENoaWxkcmVuID0gY29tcHV0ZVByZWZl cnJlZFdpZHRoc0ZvckV4Y2x1ZGVkQ2hpbGRyZW4oY2hpbGRNaW5XaWR0aCwgY2hpbGRNYXhXaWR0 aCk7CiAKLSAgICBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG0gYWxnb3JpdGhtKHRoaXMsIGNvbnN0 X2Nhc3Q8R3JpZCY+KG1fZ3JpZCkpOwotICAgIHBsYWNlSXRlbXNPbkdyaWQoYWxnb3JpdGhtLCBz dGQ6Om51bGxvcHQpOworICAgIGlmIChuZWVkc0xheW91dCgpKSB7CisgICAgICAgIEdyaWRUcmFj a1NpemluZ0FsZ29yaXRobSBhbGdvcml0aG0odGhpcywgY29uc3RfY2FzdDxHcmlkJj4obV9ncmlk KSk7CisgICAgICAgIHBsYWNlSXRlbXNPbkdyaWQoYWxnb3JpdGhtLCBzdGQ6Om51bGxvcHQpOwog Ci0gICAgcGVyZm9ybUdyaWRJdGVtc1ByZUxheW91dChhbGdvcml0aG0pOworICAgICAgICBwZXJm b3JtR3JpZEl0ZW1zUHJlTGF5b3V0KGFsZ29yaXRobSk7CiAKLSAgICBpZiAobV9iYXNlbGluZUl0 ZW1zQ2FjaGVkKQotICAgICAgICBhbGdvcml0aG0uY29weUJhc2VsaW5lSXRlbXNDYWNoZShtX3Ry YWNrU2l6aW5nQWxnb3JpdGhtLCBHcmlkUm93QXhpcyk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIGZv ciAoYXV0byogY2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5u ZXh0U2libGluZ0JveCgpKSB7Ci0gICAgICAgICAgICBpZiAoY2hpbGQtPmlzT3V0T2ZGbG93UG9z aXRpb25lZCgpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgaWYgKGlz QmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCgqY2hpbGQsIEdyaWRSb3dBeGlzKSkKLSAgICAgICAg ICAgICAgICBhbGdvcml0aG0uY2FjaGVCYXNlbGluZUFsaWduZWRJdGVtKCpjaGlsZCwgR3JpZFJv d0F4aXMpOworICAgICAgICBpZiAobV9iYXNlbGluZUl0ZW1zQ2FjaGVkKQorICAgICAgICAgICAg YWxnb3JpdGhtLmNvcHlCYXNlbGluZUl0ZW1zQ2FjaGUobV90cmFja1NpemluZ0FsZ29yaXRobSwg R3JpZFJvd0F4aXMpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGZvciAoYXV0byogY2hp bGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0Jv eCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQo KSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgaWYgKGlz QmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCgqY2hpbGQsIEdyaWRSb3dBeGlzKSkKKyAgICAgICAg ICAgICAgICAgICAgYWxnb3JpdGhtLmNhY2hlQmFzZWxpbmVBbGlnbmVkSXRlbSgqY2hpbGQsIEdy aWRSb3dBeGlzKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0KIAotICAgIGNvbXB1 dGVUcmFja1NpemVzRm9ySW5kZWZpbml0ZVNpemUoYWxnb3JpdGhtLCBGb3JDb2x1bW5zLCAmbWlu TG9naWNhbFdpZHRoLCAmbWF4TG9naWNhbFdpZHRoKTsKKyAgICAgICAgY29tcHV0ZVRyYWNrU2l6 ZXNGb3JJbmRlZmluaXRlU2l6ZShhbGdvcml0aG0sIEZvckNvbHVtbnMsICZtaW5Mb2dpY2FsV2lk dGgsICZtYXhMb2dpY2FsV2lkdGgpOworICAgIH0gZWxzZSB7CisgICAgICAgIExheW91dFVuaXQg dG90YWxHdXR0ZXJzU2l6ZSA9IGd1dHRlcnNTaXplKG1fZ3JpZCwgRm9yQ29sdW1ucywgMCwgbnVt VHJhY2tzKEZvckNvbHVtbnMpLCBzdGQ6Om51bGxvcHQpOworICAgICAgICBtaW5Mb2dpY2FsV2lk dGggPSBtX21pbkNvbnRlbnRTaXplICsgdG90YWxHdXR0ZXJzU2l6ZTsKKyAgICAgICAgbWF4TG9n aWNhbFdpZHRoID0gbV9tYXhDb250ZW50U2l6ZSArIHRvdGFsR3V0dGVyc1NpemU7CisgICAgfQog CiAgICAgaWYgKGhhZEV4Y2x1ZGVkQ2hpbGRyZW4pIHsKICAgICAgICAgbWluTG9naWNhbFdpZHRo ID0gc3RkOjptYXgobWluTG9naWNhbFdpZHRoLCBjaGlsZE1pbldpZHRoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDI5OGYyYjdlYzZhMGU4N2Q3MzA1MzgxNWE4NWJk NmNmNTQ4ZGFjMTYuLjY1NmIxYTVjYzAzODdjY2VjNGNiNzNhZmQ3NmI2OTA5NGVmYzJjN2MgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtMjQwLDYgKzI0MCw5IEBAIHBy aXZhdGU6CiAgICAgT3V0T2ZGbG93UG9zaXRpb25zTWFwIG1fb3V0T2ZGbG93SXRlbUNvbHVtbjsK ICAgICBPdXRPZkZsb3dQb3NpdGlvbnNNYXAgbV9vdXRPZkZsb3dJdGVtUm93OwogCisgICAgTGF5 b3V0VW5pdCBtX21pbkNvbnRlbnRTaXplIHsgMCB9OworICAgIExheW91dFVuaXQgbV9tYXhDb250 ZW50U2l6ZSB7IDAgfTsKKwogICAgIGJvb2wgbV9oYXNBbnlPcnRob2dvbmFsSXRlbSB7ZmFsc2V9 OwogICAgIGJvb2wgbV9oYXNBc3BlY3RSYXRpb0Jsb2NrU2l6ZURlcGVuZGVudEl0ZW0geyBmYWxz ZSB9OwogICAgIGJvb2wgbV9iYXNlbGluZUl0ZW1zQ2FjaGVkIHtmYWxzZX07CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjEy ZDMzNTEyMGRmODMxNjQ2MmM5YjRmNmQ5OGU0MDI1MWU4Y2M2YS4uMGNjNmU5MjE2YmNkMzk3ZTE0 Y2YxM2ZjZTJlYjljNmMxMGI3NTQyMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTE2 ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3Qg bXV0YXRlIGNoaWxkcmVuIGR1cmluZyBSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNh bFdpZHRocyB1bmxlc3Mgd2UncmUgYWJvdXQgdG8gcmUtbGF5b3V0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NzMyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCisg ICAgICAgIE1hcmtlZCBleGlzdGluZyBXUFQgYXMgcGFzc2luZy4KKwogMjAyMi0wMy0wOCAgRXJp YyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIG1l dGFkYXRhIGN1ZSBlbmRUaW1lIG1heSBub3QgYmUgdXBkYXRlZApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k ZXggMzcwMzVmMzA2NWM4MjkyOTliYmYwZTFiMjU4MDEzODA2N2MyNzU2MS4uYTUwMzI5YTk2NGIw MjY2MDMwOTUyOGI4YWQ3N2M1ZjE5Y2Y1MTJmYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMzQ3 LDcgKzEzNDcsNiBAQCB3ZWJraXQub3JnL2IvMjE2MTQ1IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLQogd2Via2l0Lm9yZy9iLzIxNjE0 NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQv Z3JpZC1pdGVtLW5vLWFzcGVjdC1yYXRpby1zdHJldGNoLTYuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlk LWRlZmluaXRpb24vZ3JpZC1hdXRvLXJlcGVhdC1keW5hbWljLTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9n cmlkLWRlZmluaXRpb24vZ3JpZC1yZXBlYXQtbWF4LXdpZHRoLTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8yMzQ4NzkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1pdGVtcy9ncmlkLWludHJpbnNpYy1tYXhpbXVtcy5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZ3JpZC9ncmlkLWl0ZW1zL2dyaWQtaXRlbS1pbmxpbmUtY29udHJpYnV0aW9uLTAw My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 455971 2022-03-28 17:02:38 -0700 2022-03-29 16:05:34 -0700 Patch bug-237732-20220329130237.patch text/plain 13773 mattwoodrow U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxOTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRjYjQ2Yjg0N2UxODk1 NmNhNzJhNTI1MDMzOTk4YmIzOTYyYTE5Yi4uZjVlNDAwYTRkMGI1NDk4YThlYmZhMzI4OTkxYTM1 MTQxYjRmMWE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAzLTI4ICBNYXR0 IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgbXV0YXRl IGNoaWxkcmVuIGR1cmluZyBSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo cyB1bmxlc3Mgd2UncmUgYWJvdXQgdG8gcmUtbGF5b3V0LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NzMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvY29t cHV0ZS1pbnRyaW5zaWMtbG9naWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUtY2hpbGRyZW4u aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG06OmdyaWRBcmVhQnJl YWR0aEZvckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0Fs Z29yaXRobTo6YWR2YW5jZU5leHRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tT aXppbmdBbGdvcml0aG06OmlzVmFsaWRUcmFuc2l0aW9uIGNvbnN0KToKKyAgICAgICAgKiByZW5k ZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmg6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bGF5b3V0QmxvY2sp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aHMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKKyAgICAg ICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMgY2FuIHJlLWxheW91dCBjaGlsZHJlbiAo dmlhIHBlcmZvcm1HcmlkSXRlbXNQcmVMYXlvdXQsIGFzIHdlbGwgYXMgZHVyaW5nCisgICAgICAg IHRoZSB0cmFjayBzaXppbmcgYWxnb3JpdGhtKSwgYW5kIGRvZXMgc28gdXNpbmcgdGhlIGVzdGlt YXRlZCB0cmFjayBzaXplcy4gVGhpcyBjYW4gYmUgaW5jb3JyZWN0LCBhbmQgaWYKKyAgICAgICAg d2UncmUgbm90IGFib3V0IHRvIGRvIGEgZnVsbCBsYXlvdXQgb24gdGhpcyBSZW5kZXJHcmlkLCBp dCBjYW4gbGVhdmUgdGhlIGNoaWxkcmVuIGluIGFuIGludmFsaWQgc3RhdGUuCisKKyAgICAgICAg VGhpcyBjYWNoZXMgdGhlIGludHJpbnNpYyBzaXplcyB3aGVuIHdlIGRvIGEgZnVsbCBsYXlvdXQs IHNvIHRoYXQgd2UgY2FuIHVzZSB0aGVzZSB2YWx1ZXMgaW5zdGVhZCB3aGVuCisgICAgICAgIHdl IGp1c3Qgd2FudCB0byBxdWVyeSB0aGUgUmVuZGVyR3JpZCB3aXRob3V0IG11dGF0aW5nIGFueXRo aW5nLgorCiAyMDIyLTAzLTI3ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+ CiAKICAgICAgICAgVXNlIHRoZSBzaXppbmcgYWxnb3JpdGhtJ3MgYXZhaWxhYmxlIHNpemUgdG8g Y29tcHV0ZSBncmlkIGdhcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9H cmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dy aWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKaW5kZXggYWM1OTIxMjJjODU0ZDI0OGQ5ZWUxNjkx MWY3NjVmYzhiYjJhMjY5Ni4uMGZjYmE3ZWFkYTdkNzhiNGNhZWE0YzgxYjI0ZGVjMTE5MWE3Y2Ey ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0Fs Z29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1Npemlu Z0FsZ29yaXRobS5jcHAKQEAgLTYyMywxMSArNjIzLDExIEBAIHN0ZDo6b3B0aW9uYWw8TGF5b3V0 VW5pdD4gR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtOjpncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChj b25zCiAgICAgLy8gVG8gZGV0ZXJtaW5lIHRoZSBjb2x1bW4gdHJhY2sncyBzaXplIGJhc2VkIG9u IGFuIG9ydGhvZ29uYWwgZ3JpZCBpdGVtIHdlIG5lZWQgaXQncyBsb2dpY2FsCiAgICAgLy8gaGVp Z2h0LCB3aGljaCBtYXkgZGVwZW5kIG9uIHRoZSByb3cgdHJhY2sncyBzaXplLiBJdCdzIHBvc3Np YmxlIHRoYXQgdGhlIHJvdyB0cmFja3Mgc2l6aW5nCiAgICAgLy8gbG9naWMgaGFzIG5vdCBiZWVu IHBlcmZvcm1lZCB5ZXQsIHNvIHdlIHdpbGwgbmVlZCB0byBkbyBhbiBlc3RpbWF0aW9uLgotICAg IGlmIChkaXJlY3Rpb24gPT0gRm9yUm93cyAmJiAobV9zaXppbmdTdGF0ZSA9PSBDb2x1bW5TaXpp bmdGaXJzdEl0ZXJhdGlvbiB8fCBtX3NpemluZ1N0YXRlID09IENvbHVtblNpemluZ1NlY29uZEl0 ZXJhdGlvbikpIHsKKyAgICBpZiAoZGlyZWN0aW9uID09IEZvclJvd3MgJiYgKG1fc2l6aW5nU3Rh dGUgPT0gQ29sdW1uU2l6aW5nRmlyc3RJdGVyYXRpb24gfHwgbV9zaXppbmdTdGF0ZSA9PSBDb2x1 bW5TaXppbmdFeHRyYUl0ZXJhdGlvbkZvclNpemVDb250YWlubWVudCB8fCBtX3NpemluZ1N0YXRl ID09IENvbHVtblNpemluZ1NlY29uZEl0ZXJhdGlvbikpIHsKICAgICAgICAgQVNTRVJUKEdyaWRM YXlvdXRGdW5jdGlvbnM6OmlzT3J0aG9nb25hbENoaWxkKCptX3JlbmRlckdyaWQsIGNoaWxkKSk7 CiAgICAgICAgIC8vIEZJWE1FIChqZmVybmFuZGV6KSBDb250ZW50IEFsaWdubWVudCBzaG91bGQg YWNjb3VudCBmb3IgdGhpcyBoZXVyaXN0aWMuCiAgICAgICAgIC8vIGh0dHBzOi8vZ2l0aHViLmNv bS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy8yNjk3Ci0gICAgICAgIGlmIChtX3NpemluZ1N0YXRl ID09IENvbHVtblNpemluZ0ZpcnN0SXRlcmF0aW9uKQorICAgICAgICBpZiAobV9zaXppbmdTdGF0 ZSA9PSBDb2x1bW5TaXppbmdGaXJzdEl0ZXJhdGlvbiB8fCBtX3NpemluZ1N0YXRlID09IENvbHVt blNpemluZ0V4dHJhSXRlcmF0aW9uRm9yU2l6ZUNvbnRhaW5tZW50KQogICAgICAgICAgICAgcmV0 dXJuIGVzdGltYXRlZEdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBGb3JSb3dzKTsKICAg ICAgICAgYWRkQ29udGVudEFsaWdubWVudE9mZnNldCA9IHRydWU7CiAgICAgfQpAQCAtMTQxMCw2 ICsxNDEwLDkgQEAgdm9pZCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG06OmFkdmFuY2VOZXh0U3Rh dGUoKQogewogICAgIHN3aXRjaCAobV9zaXppbmdTdGF0ZSkgewogICAgIGNhc2UgQ29sdW1uU2l6 aW5nRmlyc3RJdGVyYXRpb246CisgICAgICAgIG1fc2l6aW5nU3RhdGUgPSBtX3N0cmF0ZWd5LT5p c0NvbXB1dGluZ1NpemVDb250YWlubWVudCgpID8gQ29sdW1uU2l6aW5nRXh0cmFJdGVyYXRpb25G b3JTaXplQ29udGFpbm1lbnQgOiBSb3dTaXppbmdGaXJzdEl0ZXJhdGlvbjsKKyAgICAgICAgcmV0 dXJuOworICAgIGNhc2UgQ29sdW1uU2l6aW5nRXh0cmFJdGVyYXRpb25Gb3JTaXplQ29udGFpbm1l bnQ6CiAgICAgICAgIG1fc2l6aW5nU3RhdGUgPSBSb3dTaXppbmdGaXJzdEl0ZXJhdGlvbjsKICAg ICAgICAgcmV0dXJuOwogICAgIGNhc2UgUm93U2l6aW5nRmlyc3RJdGVyYXRpb246CkBAIC0xNDMz LDYgKzE0MzYsNyBAQCBib29sIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobTo6aXNWYWxpZFRyYW5z aXRpb24oKSBjb25zdAogewogICAgIHN3aXRjaCAobV9zaXppbmdTdGF0ZSkgewogICAgIGNhc2Ug Q29sdW1uU2l6aW5nRmlyc3RJdGVyYXRpb246CisgICAgY2FzZSBDb2x1bW5TaXppbmdFeHRyYUl0 ZXJhdGlvbkZvclNpemVDb250YWlubWVudDoKICAgICBjYXNlIENvbHVtblNpemluZ1NlY29uZEl0 ZXJhdGlvbjoKICAgICAgICAgcmV0dXJuIG1fZGlyZWN0aW9uID09IEZvckNvbHVtbnM7CiAgICAg Y2FzZSBSb3dTaXppbmdGaXJzdEl0ZXJhdGlvbjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaAppbmRleCBjMDdlNTM4NjgxNDJiNDNk ZGQ4YWE2OGYxMDA2YjdmNmViNmRiNTNhLi4xOTA1ZGUxODVlYjdjOGE1MDUwYjE4OTg4NDM0MzIx NzU1ODA3ZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNr U2l6aW5nQWxnb3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFj a1NpemluZ0FsZ29yaXRobS5oCkBAIC0yNDEsNiArMjQxLDcgQEAgcHJpdmF0ZToKIAogICAgIGVu dW0gU2l6aW5nU3RhdGUgewogICAgICAgICBDb2x1bW5TaXppbmdGaXJzdEl0ZXJhdGlvbiwKKyAg ICAgICAgQ29sdW1uU2l6aW5nRXh0cmFJdGVyYXRpb25Gb3JTaXplQ29udGFpbm1lbnQsCiAgICAg ICAgIFJvd1NpemluZ0ZpcnN0SXRlcmF0aW9uLAogICAgICAgICBSb3dTaXppbmdFeHRyYUl0ZXJh dGlvbkZvclNpemVDb250YWlubWVudCwKICAgICAgICAgQ29sdW1uU2l6aW5nU2Vjb25kSXRlcmF0 aW9uLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDNkZWFmZWRm MjFhNmMwMzg5NTczZDQyMGEwNTY0ZGZhYjlhOGRiYmYuLmMyMDM2NDZmYWY2YzljYjJhMWUzN2Ri NTBmM2Q3NjAyNGE2NTY4MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5j cHAKQEAgLTI4MCw3ICsyODAsMTUgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayhib29s IHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIC8vIGxvZ2ljYWwgd2lkdGgg aXMgYWx3YXlzIGRlZmluaXRlIGFzIHRoZSBhYm92ZSBjYWxsIHRvIHVwZGF0ZUxvZ2ljYWxXaWR0 aCgpIHByb3Blcmx5IHJlc29sdmVzIGludHJpbnNpYyAKICAgICAgICAgLy8gc2l6ZXMuIFdlIGNh bm5vdCBkbyB0aGUgc2FtZSBmb3IgaGVpZ2h0cyB0aG91Z2ggYmVjYXVzZSBtYW55IGNvZGUgcGF0 aHMgaW5zaWRlIHVwZGF0ZUxvZ2ljYWxIZWlnaHQoKSByZXF1aXJlIAogICAgICAgICAvLyBhIHBy ZXZpb3VzIGNhbGwgdG8gc2V0TG9naWNhbEhlaWdodCgpIHRvIHJlc29sdmUgaGVpZ2h0cyBwcm9w ZXJseSAobGlrZSBmb3IgcG9zaXRpb25lZCBpdGVtcyBmb3IgZXhhbXBsZSkuCi0gICAgICAgIGNv bXB1dGVUcmFja1NpemVzRm9yRGVmaW5pdGVTaXplKEZvckNvbHVtbnMsIGF2YWlsYWJsZVNwYWNl Rm9yQ29sdW1ucyk7CisgICAgICAgIGlmIChzaG91bGRBcHBseVNpemVDb250YWlubWVudCgqdGhp cykpCisgICAgICAgICAgICBjb21wdXRlVHJhY2tTaXplc0ZvckluZGVmaW5pdGVTaXplKG1fdHJh Y2tTaXppbmdBbGdvcml0aG0sIEZvckNvbHVtbnMpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBjb21wdXRlVHJhY2tTaXplc0ZvckRlZmluaXRlU2l6ZShGb3JDb2x1bW5zLCBhdmFpbGFibGVT cGFjZUZvckNvbHVtbnMpOworCisgICAgICAgIG1fbWluQ29udGVudFNpemUgPSBtX3RyYWNrU2l6 aW5nQWxnb3JpdGhtLm1pbkNvbnRlbnRTaXplKCk7CisgICAgICAgIG1fbWF4Q29udGVudFNpemUg PSBtX3RyYWNrU2l6aW5nQWxnb3JpdGhtLm1heENvbnRlbnRTaXplKCk7CisgICAgICAgIGlmIChz aG91bGRBcHBseVNpemVDb250YWlubWVudCgqdGhpcykpCisgICAgICAgICAgICBjb21wdXRlVHJh Y2tTaXplc0ZvckRlZmluaXRlU2l6ZShGb3JDb2x1bW5zLCBhdmFpbGFibGVTcGFjZUZvckNvbHVt bnMpOwogCiAgICAgICAgIC8vIDEuNS0gQ29tcHV0ZSBDb250ZW50IERpc3RyaWJ1dGlvbiBvZmZz ZXRzIGZvciBjb2x1bW4gdHJhY2tzCiAgICAgICAgIGNvbXB1dGVDb250ZW50UG9zaXRpb25BbmRE aXN0cmlidXRpb25PZmZzZXQoRm9yQ29sdW1ucywgbV90cmFja1NpemluZ0FsZ29yaXRobS5mcmVl U3BhY2UoRm9yQ29sdW1ucykudmFsdWUoKSwgbm9uQ29sbGFwc2VkVHJhY2tzKEZvckNvbHVtbnMp KTsKQEAgLTQ1OSwyMyArNDY3LDI5IEBAIHZvaWQgUmVuZGVyR3JpZDo6Y29tcHV0ZUludHJpbnNp Y0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvCiAgICAgTGF5 b3V0VW5pdCBjaGlsZE1heFdpZHRoOwogICAgIGJvb2wgaGFkRXhjbHVkZWRDaGlsZHJlbiA9IGNv bXB1dGVQcmVmZXJyZWRXaWR0aHNGb3JFeGNsdWRlZENoaWxkcmVuKGNoaWxkTWluV2lkdGgsIGNo aWxkTWF4V2lkdGgpOwogCi0gICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtIGFsZ29yaXRobSh0 aGlzLCBjb25zdF9jYXN0PEdyaWQmPihtX2dyaWQpKTsKLSAgICBwbGFjZUl0ZW1zT25HcmlkKGFs Z29yaXRobSwgc3RkOjpudWxsb3B0KTsKKyAgICBpZiAobmVlZHNMYXlvdXQoKSkgeworICAgICAg ICBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG0gYWxnb3JpdGhtKHRoaXMsIGNvbnN0X2Nhc3Q8R3Jp ZCY+KG1fZ3JpZCkpOworICAgICAgICBwbGFjZUl0ZW1zT25HcmlkKGFsZ29yaXRobSwgc3RkOjpu dWxsb3B0KTsKIAotICAgIHBlcmZvcm1HcmlkSXRlbXNQcmVMYXlvdXQoYWxnb3JpdGhtKTsKKyAg ICAgICAgcGVyZm9ybUdyaWRJdGVtc1ByZUxheW91dChhbGdvcml0aG0pOwogCi0gICAgaWYgKG1f YmFzZWxpbmVJdGVtc0NhY2hlZCkKLSAgICAgICAgYWxnb3JpdGhtLmNvcHlCYXNlbGluZUl0ZW1z Q2FjaGUobV90cmFja1NpemluZ0FsZ29yaXRobSwgR3JpZFJvd0F4aXMpOwotICAgIGVsc2Ugewot ICAgICAgICBmb3IgKGF1dG8qIGNoaWxkID0gZmlyc3RDaGlsZEJveCgpOyBjaGlsZDsgY2hpbGQg PSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewotICAgICAgICAgICAgaWYgKGNoaWxkLT5pc091 dE9mRmxvd1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg ICAgIGlmIChpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoKmNoaWxkLCBHcmlkUm93QXhpcykp Ci0gICAgICAgICAgICAgICAgYWxnb3JpdGhtLmNhY2hlQmFzZWxpbmVBbGlnbmVkSXRlbSgqY2hp bGQsIEdyaWRSb3dBeGlzKTsKKyAgICAgICAgaWYgKG1fYmFzZWxpbmVJdGVtc0NhY2hlZCkKKyAg ICAgICAgICAgIGFsZ29yaXRobS5jb3B5QmFzZWxpbmVJdGVtc0NhY2hlKG1fdHJhY2tTaXppbmdB bGdvcml0aG0sIEdyaWRSb3dBeGlzKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBmb3Ig KGF1dG8qIGNoaWxkID0gZmlyc3RDaGlsZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4 dFNpYmxpbmdCb3goKSkgeworICAgICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAg ICAgIGlmIChpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoKmNoaWxkLCBHcmlkUm93QXhpcykp CisgICAgICAgICAgICAgICAgICAgIGFsZ29yaXRobS5jYWNoZUJhc2VsaW5lQWxpZ25lZEl0ZW0o KmNoaWxkLCBHcmlkUm93QXhpcyk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICB9CiAK LSAgICBjb21wdXRlVHJhY2tTaXplc0ZvckluZGVmaW5pdGVTaXplKGFsZ29yaXRobSwgRm9yQ29s dW1ucywgJm1pbkxvZ2ljYWxXaWR0aCwgJm1heExvZ2ljYWxXaWR0aCk7CisgICAgICAgIGNvbXB1 dGVUcmFja1NpemVzRm9ySW5kZWZpbml0ZVNpemUoYWxnb3JpdGhtLCBGb3JDb2x1bW5zLCAmbWlu TG9naWNhbFdpZHRoLCAmbWF4TG9naWNhbFdpZHRoKTsKKyAgICB9IGVsc2UgeworICAgICAgICBM YXlvdXRVbml0IHRvdGFsR3V0dGVyc1NpemUgPSBndXR0ZXJzU2l6ZShtX2dyaWQsIEZvckNvbHVt bnMsIDAsIG51bVRyYWNrcyhGb3JDb2x1bW5zKSwgc3RkOjpudWxsb3B0KTsKKyAgICAgICAgbWlu TG9naWNhbFdpZHRoID0gKm1fbWluQ29udGVudFNpemUgKyB0b3RhbEd1dHRlcnNTaXplOworICAg ICAgICBtYXhMb2dpY2FsV2lkdGggPSAqbV9tYXhDb250ZW50U2l6ZSArIHRvdGFsR3V0dGVyc1Np emU7CisgICAgfQogCiAgICAgaWYgKGhhZEV4Y2x1ZGVkQ2hpbGRyZW4pIHsKICAgICAgICAgbWlu TG9naWNhbFdpZHRoID0gc3RkOjptYXgobWluTG9naWNhbFdpZHRoLCBjaGlsZE1pbldpZHRoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDE4NGU2NDJiYWMyMzM3M2Iw ZTJkZTNkMzhiY2NhYmU3ZmZjYzIyYjkuLmExM2M5NmI5OGVlOTVhYjBjMDA2YWFlMjZiNTM3OTUx YzczNmZjMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtMjQzLDYg KzI0Myw5IEBAIHByaXZhdGU6CiAgICAgT3V0T2ZGbG93UG9zaXRpb25zTWFwIG1fb3V0T2ZGbG93 SXRlbUNvbHVtbjsKICAgICBPdXRPZkZsb3dQb3NpdGlvbnNNYXAgbV9vdXRPZkZsb3dJdGVtUm93 OwogCisgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtX21pbkNvbnRlbnRTaXplOworICAg IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbV9tYXhDb250ZW50U2l6ZTsKKwogICAgIGJvb2wg bV9oYXNBbnlPcnRob2dvbmFsSXRlbSB7ZmFsc2V9OwogICAgIGJvb2wgbV9oYXNBc3BlY3RSYXRp b0Jsb2NrU2l6ZURlcGVuZGVudEl0ZW0geyBmYWxzZSB9OwogICAgIGJvb2wgbV9iYXNlbGluZUl0 ZW1zQ2FjaGVkIHtmYWxzZX07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2UxOGVmNDM1M2JkYmZiMTBkZmFiNDc3ZDRjZWMx YWFlYjE1YzZmMy4uYjE5YmNkMGFmNTI4MjFmYWYwNDIzZjkyZTVmZTAzNGIzY2EzOGFkYyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAzLTI4ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJv d0BhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgbXV0YXRlIGNoaWxkcmVuIGR1cmluZyBSZW5k ZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyB1bmxlc3Mgd2UncmUgYWJvdXQg dG8gcmUtbGF5b3V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM3NzMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRG9uJ3QgbXV0YXRlIGNoaWxkcmVuIGR1cmluZyBjb21wdXRlSW50cmluc2ljV2lkdGgK KworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1s YXlvdXQvY29tcHV0ZS1pbnRyaW5zaWMtbG9naWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUt Y2hpbGRyZW4tZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1s YXlvdXQvY29tcHV0ZS1pbnRyaW5zaWMtbG9naWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUt Y2hpbGRyZW4uaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3Rh dGlvbnM6CisKKyAgICAgICAgTWFya2VkIGV4aXN0aW5nIFdQVCBhcyBwYXNzaW5nIG9uIE1hY09T IChzaW5jZSB3ZSBydW4gbGF5b3V0IG11bHRpcGxlIHRpbWVzIHRoZXJlKS4KKyAgICAgICAgQWRk ZWQgbmV3IHRlc3QgZm9yIHRoaXMgaW1wbGVtZW50YXRpb24tc3BlY2lmaWMgYnVnLgorCiAyMDIy LTAzLTI3ICBNYXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAg VXNlIHRoZSBzaXppbmcgYWxnb3JpdGhtJ3MgYXZhaWxhYmxlIHNpemUgdG8gY29tcHV0ZSBncmlk IGdhcC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDQxMTAwZWFlNjliNzc3YjhlZWFjNWE2NWM4NTNl MWMxYWVjNTEwZWIuLmRkZTIwZGIxMzJlMzg1MDI1Mzg1MGVmYmM4MzRhMTFmNmJhYmFkYzkgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucwpAQCAtMTM2Miw3ICsxMzYyLDYgQEAgd2Via2l0Lm9yZy9iLzIxNjE0 NSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQv Z3JpZC0KIHdlYmtpdC5vcmcvYi8yMTYxNDUgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtaXRlbS1uby1hc3BlY3QtcmF0aW8tc3RyZXRj aC02Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1kZWZpbml0aW9uL2dyaWQtYXV0by1yZXBlYXQtZHlu YW1pYy0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1kZWZpbml0aW9uL2dyaWQtcmVwZWF0LW1heC13 aWR0aC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMjM0ODc5 IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtaXRlbXMv Z3JpZC1pbnRyaW5zaWMtbWF4aW11bXMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1pdGVtcy9ncmlkLWl0 ZW0taW5saW5lLWNvbnRyaWJ1dGlvbi0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvY29tcHV0ZS1pbnRyaW5z aWMtbG9naWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUtY2hpbGRyZW4tZXhwZWN0ZWQuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2NvbXB1dGUtaW50cmluc2ljLWxv Z2ljYWwtd2lkdGhzLXNob3VsZC1ub3QtbXV0YXRlLWNoaWxkcmVuLWV4cGVjdGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZDU0ZWNkZTJiOTZlYTkwMjAzMWY2YmYwNDcxYmY4NDY5YWU3ODEwNAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2NvbXB1dGUtaW50 cmluc2ljLWxvZ2ljYWwtd2lkdGhzLXNob3VsZC1ub3QtbXV0YXRlLWNoaWxkcmVuLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5Pgor PGRpdiBzdHlsZT0iYmFja2dyb3VuZDogcmVkOyBtYXgtd2lkdGg6IDIwMHB4OyBwYWRkaW5nOiAy MHB4OyI+CisgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogeWVsbG93Z3JlZW47IGRpc3BsYXk6 IGdyaWQ7IGFsaWduLWl0ZW1zOiBiYXNlbGluZTsiPgorICAgICAgICA8c3Bhbj5WZXJ5IGxvbmcg ZXhhbXBsZSB0ZXh0IGZvciB0ZXN0aW5nIGxpbmUgYnJlYWsgd2hpY2ggd2lsbCBub3QgaGFwcGVu IGR1ZSB0byB0aGUgYnVnPC9zcGFuPgorICAgIDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9jb21wdXRl LWludHJpbnNpYy1sb2dpY2FsLXdpZHRocy1zaG91bGQtbm90LW11dGF0ZS1jaGlsZHJlbi5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvY29tcHV0ZS1pbnRyaW5zaWMtbG9n aWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUtY2hpbGRyZW4uaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4x ZTBmZTY4YWFkOWRjNTEyN2I3MDc4ZGFkZDQ1MTNlMTI3MGRkOTA2Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvY29tcHV0ZS1pbnRyaW5zaWMtbG9n aWNhbC13aWR0aHMtc2hvdWxkLW5vdC1tdXRhdGUtY2hpbGRyZW4uaHRtbApAQCAtMCwwICsxLDEy IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5 OiBncmlkOyI+CisgICAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogcmVkOyBtYXgtd2lkdGg6IDIw MHB4OyBwYWRkaW5nOiAyMHB4OyBkaXNwbGF5OiBmbGV4OyI+CisgICAgICAgIDxkaXYgc3R5bGU9 ImJhY2tncm91bmQ6IHllbGxvd2dyZWVuOyBkaXNwbGF5OiBncmlkOyBhbGlnbi1pdGVtczogYmFz ZWxpbmU7Ij4KKyAgICAgICAgICAgIDxzcGFuPlZlcnkgbG9uZyBleGFtcGxlIHRleHQgZm9yIHRl c3RpbmcgbGluZSBicmVhayB3aGljaCB3aWxsIG5vdCBoYXBwZW4gZHVlIHRvIHRoZSBidWc8L3Nw YW4+CisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDg3NzczMmJh Y2EwNzZmNzgyZjk4YTAxMWRkMGZhZDI4ZTA3OWYxNjAuLjhkMzg2YzYyOWY1NzU0ODMzYjU0NDEw MGRlNGI2ODZlZWIzNjVjZmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0 YXRpb25zCkBAIC0zMTU0LDYgKzMxNTQsOCBAQCB3ZWJraXQub3JnL2IvMjEyMjE4IHdlYnJ0Yy9k YXRhY2hhbm5lbC9nYXRoZXItY2FuZGlkYXRlcy1uZXR3b3JrcHJvY2Vzcy1jcmFzaC5odAogd2Vi a2l0Lm9yZy9iLzIxMjIyNiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Z3JpZC9hbGlnbm1lbnQvc2VsZi1iYXNlbGluZS9ncmlkLXNlbGYtYmFzZWxpbmUtY2hhbmdlcy1n cmlkLWFyZWEtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxMjIyNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln bm1lbnQvc2VsZi1iYXNlbGluZS9ncmlkLXNlbGYtYmFzZWxpbmUtY2hhbmdlcy1ncmlkLWFyZWEt c2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCitpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9ncmlkLWRlZmluaXRpb24vZ3JpZC1yZXBlYXQtbWF4 LXdpZHRoLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCisKIGZhc3QvdGV4dC90ZXh0LXN0 eWxlcy8tYXBwbGUtc3lzdGVtIFsgUGFzcyBdCiAKIHdlYmtpdC5vcmcvYi8yMTQxNTUgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1lbWJlZGRlci1wb2xp Y3kvYmxvYi5odHRwcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0K