256410 2023-05-05 21:43:28 -0700 overflow:clip fails when intrusive float is present 2023-05-15 23:26:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr rbuis simon.fraser webkit-bug-importer zalan oldest_to_newest 1953372 0 simon.fraser 2023-05-05 21:43:28 -0700 As noted here: https://github.com/w3c/csswg-drafts/issues/8607#issuecomment-1533932813 "First, in Safari, the test doesn't work, because it seems that overflow: clip stops having any effect at all (!) if a float overflows in the block axis. It would take effect in the inline axis if there was no block overflow, or if any block axis overflow was caused by something other than a float, like an abspos. Hard to think that's anything but a bug, but that bug could be a sign of "it's harder than we thought"." Test case at http://software.hixie.ch/utilities/js/live-dom-viewer/?saved=11611 1955177 1 webkit-bug-importer 2023-05-12 21:44:18 -0700 <rdar://problem/109293228> 1955266 2 zalan 2023-05-13 13:55:26 -0700 intrusive floats like this don't get clipped by their containing block (or ancestors all the way to where they end up being intrusive) because we paint them out of the normal paint order (see RenderBlockFlow::paintFloats), so by the time we get to paint them, clipping is gone. Probably RenderBlockFlow::paintFloats should apply clipping by looking at the ancestor chain of these intrusive floats. should read the spec first (always), but with overflow: clip, layout and paint could get very disconnected when intrusive floats are involved due to the fact that unlike overflow: hidden, clip does not establish a formatting context. such intrusive floats can impact the position of other, inline level and/or float avoider boxes and yet in the final rendering they look like as if some invisible force pushed them away. e.g. <style> .clip { width: 50px; height: 50px; } .float { width: 500px; height: 100px; float: left; } </style> <div class=clip> <div class=float></div> </div> <div> this line is constrained by the intrusive but yet clipped float </div will produce something like this: .clip ___________ | |******************************* | .float | * | | * |__________| clipped out part * * *this line is constrained by the intrusive but yet clipped float ****************************************** where the '*' part is hidden. ___________ | | | | | | |__________| this line is constrained by the intrusive but yet clipped float 1955287 3 466348 zalan 2023-05-13 21:09:07 -0700 Created attachment 466348 Patch 1955508 4 466348 simon.fraser 2023-05-15 15:05:52 -0700 Comment on attachment 466348 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466348&action=review > Source/WebCore/rendering/FloatingObjects.cpp:56 > + , m_overflowClippedByAncestor(false) maybe `m_hasAncestorWithOverflowClip`. Also, we can initialize bitfield members with initializers now. 1955571 5 466358 zalan 2023-05-15 19:44:59 -0700 Created attachment 466358 Patch 1955591 6 ews-feeder 2023-05-15 21:59:14 -0700 Committed 264101@main (a5ba024da4f4): <https://commits.webkit.org/264101@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466358. 466348 2023-05-13 21:09:07 -0700 2023-05-15 19:44:56 -0700 Patch bug-256410-20230513210906.patch text/plain 9961 zalan RnJvbSA5MjA0ZTdmNDA5YzgzNzMzYzRjY2M0YWQ1YWFmNzNhNDVjNTMwYjc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTMgTWF5IDIwMjMgMTc6NTI6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBvdmVyZmxv dzpjbGlwIGZhaWxzIHdoZW4gaW50cnVzaXZlIGZsb2F0IGlzIHByZXNlbnQKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTY0MTAgPHJkYXI6Ly9wcm9ibGVtLzEwOTI5 MzIyOD4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKSW50cnVzaXZlIChvdmVyaGFuZ2lu ZykgZmxvYXQgcGFpbnRpbmcgaXMgcHJvcGFnYXRlZCB0byB0aGUgb3V0ZXJtb3N0IGJsb2NrIHdo ZXJlIHRoZSBmbG9hdCBzdG9wcyBiZWluZyBpbnRydXNpdmUuCmUuZy4KPGRpdiBvdXRlcj4KICA8 ZGl2IGNvbnRpbmFpbmdfYmxvY2s+CiAgICA8ZGl2IHRhbGxfZmxvYXQ+PC9kaXY+CiAgPC9kaXY+ CjwvZGl2PgoKInRhbGxfZmxvYXQiIGdldHMgcGFpbnRlZCBieSAib3V0ZXIiIChzZWUgUmVuZGVy QmxvY2tGbG93OjpwYWludEZsb2F0cykuCgpUaGUgInBhaW50aW5nIGZsYWciIGdldHMgcHJvcGFn YXRlZCBpbiBSZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJoYW5naW5nRmxvYXRzIGFzIHdlIGNyZWF0 ZSBjb3BpZXMgb2YgdGhlIG9yaWdpbmFsIEZsb2F0aW5nT2JqZWN0CmZvciBlYWNoIGJsb2NrIHdo ZXJlIHRoZSBmbG9hdCBvdmVyaGFuZ3MgKGFuZCBvbmx5IG9uZSAodGhlIG91dGVybW9zdCkgb2Yg dGhlc2UgY29waWVzIGhhcyB0aGUgZmxhZyAic2hvdWxkUGFpbnQiIHR1cm5lZCBvbikuCgpJbiB0 aGlzIHBhdGNoIHdlIHN0b3AgcHJvcGFnYXRpbmcgdGhpcyAic2hvdWxkUGFpbnQiIGZsYWcgd2hl biB3ZSBzZWUgYSBhbmNlc3RvciBibG9jayB3aXRoIG92ZXJmbG93IGNsaXAuCgoqIExheW91dFRl c3RzL2Zhc3QvYmxvY2svb3ZlcmZsb3ctY2xpcC13aXRoLWluc3RydXNpdmUtZmxvYXQtZXhwZWN0 ZWQuaHRtbDogQWRkZWQuCiogTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9vdmVyZmxvdy1jbGlwLXdp dGgtaW5zdHJ1c2l2ZS1mbG9hdC5odG1sOiBBZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6YWRkT3Zl cmhhbmdpbmdGbG9hdHMpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09i amVjdHMuY3BwICB8IDEyICsrKy0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdP YmplY3RzLmggICAgfCAgNyArKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwICB8ICA1ICsrLQogLi4udy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1mbG9hdC1leHBl Y3RlZC5odG1sIHwgMTIgKysrKysKIC4uLi9vdmVyZmxvdy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1m bG9hdC5odG1sICB8IDQ1ICsrKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgNzMg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRU ZXN0cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0LWV4cGVj dGVkLmh0bWwKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJm bG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0Lmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwCmluZGV4IDY3YTJmOTA1MmM3Yy4uM2NhMjQwYjdi ZDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3Rz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcApA QCAtNTMsNiArNTMsNyBAQCBGbG9hdGluZ09iamVjdDo6RmxvYXRpbmdPYmplY3QoUmVuZGVyQm94 JiByZW5kZXJlcikKICAgICAsIG1fcGFpbnRzRmxvYXQodHJ1ZSkKICAgICAsIG1faXNEZXNjZW5k YW50KGZhbHNlKQogICAgICwgbV9pc1BsYWNlZChmYWxzZSkKKyAgICAsIG1fb3ZlcmZsb3dDbGlw cGVkQnlBbmNlc3RvcihmYWxzZSkKICNpZiBBU1NFUlRfRU5BQkxFRAogICAgICwgbV9pc0luUGxh Y2VkVHJlZShmYWxzZSkKICNlbmRpZgpAQCAtNjMsOSArNjQsMTEgQEAgRmxvYXRpbmdPYmplY3Q6 OkZsb2F0aW5nT2JqZWN0KFJlbmRlckJveCYgcmVuZGVyZXIpCiAgICAgICAgIG1fdHlwZSA9IEZs b2F0TGVmdDsKICAgICBlbHNlIGlmICh0eXBlID09IFVzZWRGbG9hdDo6UmlnaHQpCiAgICAgICAg IG1fdHlwZSA9IEZsb2F0UmlnaHQ7CisgICAgaWYgKGF1dG8qIGNvbnRhaW5pbmdCbG9jayA9IHJl bmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpKQorICAgICAgICBtX292ZXJmbG93Q2xpcHBlZEJ5QW5j ZXN0b3IgPSBjb250YWluaW5nQmxvY2stPmVmZmVjdGl2ZU92ZXJmbG93WCgpID09IE92ZXJmbG93 OjpDbGlwIHx8IGNvbnRhaW5pbmdCbG9jay0+ZWZmZWN0aXZlT3ZlcmZsb3dZKCkgPT0gT3ZlcmZs b3c6OkNsaXA7CiB9CiAKLUZsb2F0aW5nT2JqZWN0OjpGbG9hdGluZ09iamVjdChSZW5kZXJCb3gm IHJlbmRlcmVyLCBUeXBlIHR5cGUsIGNvbnN0IExheW91dFJlY3QmIGZyYW1lUmVjdCwgY29uc3Qg TGF5b3V0U2l6ZSYgbWFyZ2luT2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlzRGVzY2Vu ZGFudCkKK0Zsb2F0aW5nT2JqZWN0OjpGbG9hdGluZ09iamVjdChSZW5kZXJCb3gmIHJlbmRlcmVy LCBUeXBlIHR5cGUsIGNvbnN0IExheW91dFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgTGF5b3V0U2l6 ZSYgbWFyZ2luT2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlzRGVzY2VuZGFudCwgYm9v bCBvdmVyZmxvd0NsaXBwZWQpCiAgICAgOiBtX3JlbmRlcmVyKHJlbmRlcmVyKQogICAgICwgbV9m cmFtZVJlY3QoZnJhbWVSZWN0KQogICAgICwgbV9tYXJnaW5PZmZzZXQobWFyZ2luT2Zmc2V0KQpA QCAtNzMsNiArNzYsNyBAQCBGbG9hdGluZ09iamVjdDo6RmxvYXRpbmdPYmplY3QoUmVuZGVyQm94 JiByZW5kZXJlciwgVHlwZSB0eXBlLCBjb25zdCBMYXlvdXRSZWN0JgogICAgICwgbV9wYWludHNG bG9hdChzaG91bGRQYWludCkKICAgICAsIG1faXNEZXNjZW5kYW50KGlzRGVzY2VuZGFudCkKICAg ICAsIG1faXNQbGFjZWQodHJ1ZSkKKyAgICAsIG1fb3ZlcmZsb3dDbGlwcGVkQnlBbmNlc3Rvcihv dmVyZmxvd0NsaXBwZWQpCiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICAsIG1faXNJblBsYWNlZFRy ZWUoZmFsc2UpCiAjZW5kaWYKQEAgLTg2LDE0ICs5MCwxNCBAQCBzdGQ6OnVuaXF1ZV9wdHI8Rmxv YXRpbmdPYmplY3Q+IEZsb2F0aW5nT2JqZWN0OjpjcmVhdGUoUmVuZGVyQm94JiByZW5kZXJlcikK ICAgICByZXR1cm4gb2JqZWN0OwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8RmxvYXRpbmdPYmplY3Q+ IEZsb2F0aW5nT2JqZWN0Ojpjb3B5VG9OZXdDb250YWluZXIoTGF5b3V0U2l6ZSBvZmZzZXQsIGJv b2wgc2hvdWxkUGFpbnQsIGJvb2wgaXNEZXNjZW5kYW50KSBjb25zdAorc3RkOjp1bmlxdWVfcHRy PEZsb2F0aW5nT2JqZWN0PiBGbG9hdGluZ09iamVjdDo6Y29weVRvTmV3Q29udGFpbmVyKExheW91 dFNpemUgb2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlzRGVzY2VuZGFudCwgYm9vbCBv dmVyZmxvd0NsaXBwZWQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1ha2VVbmlxdWU8RmxvYXRpbmdP YmplY3Q+KHJlbmRlcmVyKCksIHR5cGUoKSwgTGF5b3V0UmVjdChmcmFtZVJlY3QoKS5sb2NhdGlv bigpIC0gb2Zmc2V0LCBmcmFtZVJlY3QoKS5zaXplKCkpLCBtYXJnaW5PZmZzZXQoKSwgc2hvdWxk UGFpbnQsIGlzRGVzY2VuZGFudCk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8RmxvYXRpbmdPYmpl Y3Q+KHJlbmRlcmVyKCksIHR5cGUoKSwgTGF5b3V0UmVjdChmcmFtZVJlY3QoKS5sb2NhdGlvbigp IC0gb2Zmc2V0LCBmcmFtZVJlY3QoKS5zaXplKCkpLCBtYXJnaW5PZmZzZXQoKSwgc2hvdWxkUGFp bnQsIGlzRGVzY2VuZGFudCwgb3ZlcmZsb3dDbGlwcGVkKTsKIH0KIAogc3RkOjp1bmlxdWVfcHRy PEZsb2F0aW5nT2JqZWN0PiBGbG9hdGluZ09iamVjdDo6Y2xvbmVGb3JOZXdQYXJlbnQoKSBjb25z dAogewotICAgIGF1dG8gY2xvbmVPYmplY3QgPSBtYWtlVW5pcXVlPEZsb2F0aW5nT2JqZWN0Pihy ZW5kZXJlcigpLCB0eXBlKCksIG1fZnJhbWVSZWN0LCBtX21hcmdpbk9mZnNldCwgbV9wYWludHNG bG9hdCwgbV9pc0Rlc2NlbmRhbnQpOworICAgIGF1dG8gY2xvbmVPYmplY3QgPSBtYWtlVW5pcXVl PEZsb2F0aW5nT2JqZWN0PihyZW5kZXJlcigpLCB0eXBlKCksIG1fZnJhbWVSZWN0LCBtX21hcmdp bk9mZnNldCwgbV9wYWludHNGbG9hdCwgbV9pc0Rlc2NlbmRhbnQsIG1fb3ZlcmZsb3dDbGlwcGVk QnlBbmNlc3Rvcik7CiAgICAgY2xvbmVPYmplY3QtPm1fcGFnaW5hdGlvblN0cnV0ID0gbV9wYWdp bmF0aW9uU3RydXQ7CiAgICAgY2xvbmVPYmplY3QtPm1faXNQbGFjZWQgPSBtX2lzUGxhY2VkOwog ICAgIHJldHVybiBjbG9uZU9iamVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9GbG9hdGluZ09iamVjdHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGlu Z09iamVjdHMuaAppbmRleCBjZDYwZGI4YmQ1NDIuLjU2YmEyYTQ2MTFkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuaApAQCAtNDIsMTEgKzQyLDExIEBAIHB1 YmxpYzoKICAgICBlbnVtIFR5cGUgeyBGbG9hdExlZnQgPSAxLCBGbG9hdFJpZ2h0ID0gMiwgRmxv YXRMZWZ0UmlnaHQgPSAzIH07CiAKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPEZsb2F0aW5n T2JqZWN0PiBjcmVhdGUoUmVuZGVyQm94Jik7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPEZsb2F0aW5n T2JqZWN0PiBjb3B5VG9OZXdDb250YWluZXIoTGF5b3V0U2l6ZSwgYm9vbCBzaG91bGRQYWludCA9 IGZhbHNlLCBib29sIGlzRGVzY2VuZGFudCA9IGZhbHNlKSBjb25zdDsKKyAgICBzdGQ6OnVuaXF1 ZV9wdHI8RmxvYXRpbmdPYmplY3Q+IGNvcHlUb05ld0NvbnRhaW5lcihMYXlvdXRTaXplLCBib29s IHNob3VsZFBhaW50ID0gZmFsc2UsIGJvb2wgaXNEZXNjZW5kYW50ID0gZmFsc2UsIGJvb2wgb3Zl cmZsb3dDbGlwcGVkID0gZmFsc2UpIGNvbnN0OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxGbG9hdGlu Z09iamVjdD4gY2xvbmVGb3JOZXdQYXJlbnQoKSBjb25zdDsKIAogICAgIGV4cGxpY2l0IEZsb2F0 aW5nT2JqZWN0KFJlbmRlckJveCYpOwotICAgIEZsb2F0aW5nT2JqZWN0KFJlbmRlckJveCYsIFR5 cGUsIGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBMYXlvdXRTaXplJiwgYm9vbCBzaG91bGRQYWlu dCwgYm9vbCBpc0Rlc2NlbmRhbnQpOworICAgIEZsb2F0aW5nT2JqZWN0KFJlbmRlckJveCYsIFR5 cGUsIGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBMYXlvdXRTaXplJiwgYm9vbCBzaG91bGRQYWlu dCwgYm9vbCBpc0Rlc2NlbmRhbnQsIGJvb2wgb3ZlcmZsb3dDbGlwcGVkKTsKIAogICAgIFR5cGUg dHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFR5cGU+KG1fdHlwZSk7IH0KICAgICBS ZW5kZXJCb3gmIHJlbmRlcmVyKCkgY29uc3QgeyBBU1NFUlQobV9yZW5kZXJlcik7IHJldHVybiAq bV9yZW5kZXJlcjsgfQpAQCAtODQsNiArODQsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBwYWludHNG bG9hdCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFpbnRzRmxvYXQ7IH0KICAgICB2b2lkIHNldFBhaW50 c0Zsb2F0KGJvb2wgcGFpbnRzRmxvYXQpIHsgbV9wYWludHNGbG9hdCA9IHBhaW50c0Zsb2F0OyB9 CiAKKyAgICBib29sIGhhc0FuY2VzdG9yV2l0aE92ZXJmbG93Q2xpcCgpIGNvbnN0IHsgcmV0dXJu IG1fb3ZlcmZsb3dDbGlwcGVkQnlBbmNlc3RvcjsgfQorCiAgICAgYm9vbCBpc0Rlc2NlbmRhbnQo KSBjb25zdCB7IHJldHVybiBtX2lzRGVzY2VuZGFudDsgfQogICAgIHZvaWQgc2V0SXNEZXNjZW5k YW50KGJvb2wgaXNEZXNjZW5kYW50KSB7IG1faXNEZXNjZW5kYW50ID0gaXNEZXNjZW5kYW50OyB9 CiAKQEAgLTExMiw2ICsxMTQsNyBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fcGFpbnRzRmxv YXQgOiAxOwogICAgIHVuc2lnbmVkIG1faXNEZXNjZW5kYW50IDogMTsKICAgICB1bnNpZ25lZCBt X2lzUGxhY2VkIDogMTsKKyAgICB1bnNpZ25lZCBtX292ZXJmbG93Q2xpcHBlZEJ5QW5jZXN0b3Ig OiAxOwogI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgdW5zaWduZWQgbV9pc0luUGxhY2VkVHJlZSA6 IDE7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKaW5kZXggZTgzN2IyNDIwZjg1Li40MTIxOTA1ODVkNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0zMTA5LDYgKzMxMDksNyBAQCBMYXlv dXRVbml0IFJlbmRlckJsb2NrRmxvdzo6YWRkT3ZlcmhhbmdpbmdGbG9hdHMoUmVuZGVyQmxvY2tG bG93JiBjaGlsZCwgYm9vbCBtYQogCiAgICAgLy8gRmxvYXRzIHRoYXQgd2lsbCByZW1haW4gdGhl IGNoaWxkJ3MgcmVzcG9uc2liaWxpdHkgdG8gcGFpbnQgc2hvdWxkIGZhY3RvciBpbnRvIGl0cwog ICAgIC8vIG92ZXJmbG93LgorICAgIGF1dG8gYmxvY2tIYXNPdmVyZmxvd0NsaXAgPSBlZmZlY3Rp dmVPdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6Q2xpcCB8fCBlZmZlY3RpdmVPdmVyZmxvd1koKSA9 PSBPdmVyZmxvdzo6Q2xpcDsKICAgICBhdXRvIGNoaWxkRW5kID0gY2hpbGQubV9mbG9hdGluZ09i amVjdHMtPnNldCgpLmVuZCgpOwogICAgIGZvciAoYXV0byBjaGlsZEl0ID0gY2hpbGQubV9mbG9h dGluZ09iamVjdHMtPnNldCgpLmJlZ2luKCk7IGNoaWxkSXQgIT0gY2hpbGRFbmQ7ICsrY2hpbGRJ dCkgewogICAgICAgICBhdXRvJiBmbG9hdGluZ09iamVjdCA9ICpjaGlsZEl0LT5nZXQoKTsKQEAg LTMxMjYsNyArMzEyNyw3IEBAIExheW91dFVuaXQgUmVuZGVyQmxvY2tGbG93OjphZGRPdmVyaGFu Z2luZ0Zsb2F0cyhSZW5kZXJCbG9ja0Zsb3cmIGNoaWxkLCBib29sIG1hCiAgICAgICAgICAgICAg ICAgLy8gYmVoYXZlcyBwcm9wZXJseSkuIFdlIGFsd2F5cyB3YW50IHRvIHByb3BhZ2F0ZSB0aGUg ZGVzaXJlIHRvIHBhaW50IHRoZSBmbG9hdCBhcwogICAgICAgICAgICAgICAgIC8vIGZhciBvdXQg YXMgd2UgY2FuLCB0byB0aGUgb3V0ZXJtb3N0IGJsb2NrIHRoYXQgb3ZlcmxhcHMgdGhlIGZsb2F0 LCBzdG9wcGluZyBvbmx5CiAgICAgICAgICAgICAgICAgLy8gaWYgd2UgaGl0IGEgc2VsZi1wYWlu dGluZyBsYXllciBib3VuZGFyeS4KLSAgICAgICAgICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3Qu cmVuZGVyZXIoKS5lbmNsb3NpbmdGbG9hdFBhaW50aW5nTGF5ZXIoKSA9PSBlbmNsb3NpbmdGbG9h dFBhaW50aW5nTGF5ZXIoKSkgeworICAgICAgICAgICAgICAgIGlmICghZmxvYXRpbmdPYmplY3Qu aGFzQW5jZXN0b3JXaXRoT3ZlcmZsb3dDbGlwKCkgJiYgZmxvYXRpbmdPYmplY3QucmVuZGVyZXIo KS5lbmNsb3NpbmdGbG9hdFBhaW50aW5nTGF5ZXIoKSA9PSBlbmNsb3NpbmdGbG9hdFBhaW50aW5n TGF5ZXIoKSkgewogICAgICAgICAgICAgICAgICAgICBmbG9hdGluZ09iamVjdC5zZXRQYWludHNG bG9hdChmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIHNob3VsZFBhaW50ID0gdHJ1ZTsKICAg ICAgICAgICAgICAgICB9CkBAIC0zMTM0LDcgKzMxMzUsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJs b2NrRmxvdzo6YWRkT3ZlcmhhbmdpbmdGbG9hdHMoUmVuZGVyQmxvY2tGbG93JiBjaGlsZCwgYm9v bCBtYQogICAgICAgICAgICAgICAgIGlmICghbV9mbG9hdGluZ09iamVjdHMpCiAgICAgICAgICAg ICAgICAgICAgIGNyZWF0ZUZsb2F0aW5nT2JqZWN0cygpOwogCi0gICAgICAgICAgICAgICAgbV9m bG9hdGluZ09iamVjdHMtPmFkZChmbG9hdGluZ09iamVjdC5jb3B5VG9OZXdDb250YWluZXIob2Zm c2V0LCBzaG91bGRQYWludCwgdHJ1ZSkpOworICAgICAgICAgICAgICAgIG1fZmxvYXRpbmdPYmpl Y3RzLT5hZGQoZmxvYXRpbmdPYmplY3QuY29weVRvTmV3Q29udGFpbmVyKG9mZnNldCwgc2hvdWxk UGFpbnQsIHRydWUsIGZsb2F0aW5nT2JqZWN0Lmhhc0FuY2VzdG9yV2l0aE92ZXJmbG93Q2xpcCgp IHx8IGJsb2NrSGFzT3ZlcmZsb3dDbGlwKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICBjb25zdCBhdXRvJiByZW5kZXJlciA9IGZsb2F0aW5nT2JqZWN0LnJl bmRlcmVyKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNs aXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0LWV4cGVjdGVkLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi45YTBmNWE3OTc5ZTEKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0 aC1pbnN0cnVzaXZlLWZsb2F0LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMiBAQAorPHN0eWxl PgorZGl2IHsKKyAgd2lkdGg6IDIwcHg7CisgIGhlaWdodDogMjBweDsKKyAgbWFyZ2luLWJvdHRv bTogODBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdj48 L2Rpdj4KKzxkaXY+PC9kaXY+Cis8ZGl2PjwvZGl2PgorPGRpdj48L2Rpdj4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvYmxvY2svb3ZlcmZsb3ctY2xpcC13aXRoLWluc3RydXNpdmUtZmxv YXQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvYmxvY2svb3ZlcmZsb3ctY2xpcC13aXRoLWluc3Ry dXNpdmUtZmxvYXQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAu LjVmNTcyZTIxMWY0YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYmxvY2sv b3ZlcmZsb3ctY2xpcC13aXRoLWluc3RydXNpdmUtZmxvYXQuaHRtbApAQCAtMCwwICsxLDQ1IEBA Cis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAgbWFyZ2luLWJvdHRvbTogODBweDsKK30KKy5mbG9h dCB7CisgIHdpZHRoOiA0MHB4OworICBoZWlnaHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9y OiBncmVlbjsKKyAgZmxvYXQ6IGxlZnQ7Cit9CisKK2RpdiB7CisgIHdpZHRoOiAyMHB4OworICBo ZWlnaHQ6IDIwcHg7Cit9CisKKy5jbGlwIHsKKyAgb3ZlcmZsb3c6IGNsaXA7Cit9Cis8L3N0eWxl PgorPGRpdiBjbGFzcz0iY2xpcCBjb250YWluZXIiPgorICA8ZGl2IGNsYXNzPWZsb2F0PjwvZGl2 PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNsaXAgY29udGFpbmVyIj4KKyAgPGRpdj4KKyAgICA8 ZGl2IGNsYXNzPWZsb2F0PjwvZGl2PgorICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJj bGlwIGNvbnRhaW5lciI+CisgIDxkaXY+CisgICAgPGRpdj4KKyAgICAgIDxkaXYgY2xhc3M9Zmxv YXQ+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Y29u dGFpbmVyPgorICA8ZGl2IGNsYXNzPWNsaXA+CisgICAgPGRpdj4KKyAgICAgIDxkaXYgY2xhc3M9 ZmxvYXQ+PC9kaXY+CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9kaXY+Cg== 466358 2023-05-15 19:44:59 -0700 2023-05-15 23:26:56 -0700 Patch bug-256410-20230515194458.patch text/plain 10469 zalan RnJvbSA2ZjI3MWI1OWUxY2MzZmVkZWM0ZWVlMGRmMGJjZDhhM2FjYjAyNzQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTMgTWF5IDIwMjMgMTc6NTI6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBvdmVyZmxv dzpjbGlwIGZhaWxzIHdoZW4gaW50cnVzaXZlIGZsb2F0IGlzIHByZXNlbnQKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTY0MTAgPHJkYXI6Ly9wcm9ibGVtLzEwOTI5 MzIyOD4KClJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KCkludHJ1c2l2ZSAob3Zlcmhhbmdpbmcp IGZsb2F0IHBhaW50aW5nIGlzIHByb3BhZ2F0ZWQgdG8gdGhlIG91dGVybW9zdCBibG9jayB3aGVy ZSB0aGUgZmxvYXQgc3RvcHMgYmVpbmcgaW50cnVzaXZlLgplLmcuCjxkaXYgb3V0ZXI+CiAgPGRp diBjb250YWluaW5nX2Jsb2NrPgogICAgPGRpdiB0YWxsX2Zsb2F0PjwvZGl2PgogIDwvZGl2Pgo8 L2Rpdj4KCiJ0YWxsX2Zsb2F0IiBnZXRzIHBhaW50ZWQgYnkgIm91dGVyIiAoc2VlIFJlbmRlckJs b2NrRmxvdzo6cGFpbnRGbG9hdHMpLgoKVGhlICJwYWludGluZyBmbGFnIiBnZXRzIHByb3BhZ2F0 ZWQgaW4gUmVuZGVyQmxvY2tGbG93OjphZGRPdmVyaGFuZ2luZ0Zsb2F0cyBhcyB3ZSBjcmVhdGUg Y29waWVzIG9mIHRoZSBvcmlnaW5hbCBGbG9hdGluZ09iamVjdApmb3IgZWFjaCBibG9jayB3aGVy ZSB0aGUgZmxvYXQgb3ZlcmhhbmdzIChhbmQgb25seSBvbmUgKHRoZSBvdXRlcm1vc3QpIG9mIHRo ZXNlIGNvcGllcyBoYXMgdGhlIGZsYWcgInNob3VsZFBhaW50IiB0dXJuZWQgb24pLgoKSW4gdGhp cyBwYXRjaCB3ZSBzdG9wIHByb3BhZ2F0aW5nIHRoaXMgInNob3VsZFBhaW50IiBmbGFnIHdoZW4g d2Ugc2VlIGEgYW5jZXN0b3IgYmxvY2sgd2l0aCBvdmVyZmxvdyBjbGlwLgoKKiBMYXlvdXRUZXN0 cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0LWV4cGVjdGVk Lmh0bWw6IEFkZGVkLgoqIExheW91dFRlc3RzL2Zhc3QvYmxvY2svb3ZlcmZsb3ctY2xpcC13aXRo LWluc3RydXNpdmUtZmxvYXQuaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJo YW5naW5nRmxvYXRzKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmpl Y3RzLmNwcCAgfCAyMCArKystLS0tLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGlu Z09iamVjdHMuaCAgICB8IDE1ICsrKystLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwICB8ICA1ICsrLQogLi4udy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1mbG9h dC1leHBlY3RlZC5odG1sIHwgMTIgKysrKysKIC4uLi9vdmVyZmxvdy1jbGlwLXdpdGgtaW5zdHJ1 c2l2ZS1mbG9hdC5odG1sICB8IDQ1ICsrKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdl ZCwgNzYgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQg TGF5b3V0VGVzdHMvZmFzdC9ibG9jay9vdmVyZmxvdy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1mbG9h dC1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9ibG9j ay9vdmVyZmxvdy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1mbG9hdC5odG1sCgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcAppbmRleCA2N2EyZjkwNTJjN2MuLjMy NDAyZDM3MzM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5n T2JqZWN0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0 cy5jcHAKQEAgLTUwLDEyICs1MCw2IEBAIHN0YXRpY19hc3NlcnQoc2l6ZW9mKFdlYWtQdHI8TGVn YWN5Um9vdElubGluZUJveD4pID09IHNpemVvZih2b2lkKiksICJXZWFrUHRyIHNoCiAKIEZsb2F0 aW5nT2JqZWN0OjpGbG9hdGluZ09iamVjdChSZW5kZXJCb3gmIHJlbmRlcmVyKQogICAgIDogbV9y ZW5kZXJlcihyZW5kZXJlcikKLSAgICAsIG1fcGFpbnRzRmxvYXQodHJ1ZSkKLSAgICAsIG1faXNE ZXNjZW5kYW50KGZhbHNlKQotICAgICwgbV9pc1BsYWNlZChmYWxzZSkKLSNpZiBBU1NFUlRfRU5B QkxFRAotICAgICwgbV9pc0luUGxhY2VkVHJlZShmYWxzZSkKLSNlbmRpZgogewogICAgIFVzZWRG bG9hdCB0eXBlID0gUmVuZGVyU3R5bGU6OnVzZWRGbG9hdChyZW5kZXJlcik7CiAgICAgQVNTRVJU KHR5cGUgIT0gVXNlZEZsb2F0OjpOb25lKTsKQEAgLTYzLDkgKzU3LDExIEBAIEZsb2F0aW5nT2Jq ZWN0OjpGbG9hdGluZ09iamVjdChSZW5kZXJCb3gmIHJlbmRlcmVyKQogICAgICAgICBtX3R5cGUg PSBGbG9hdExlZnQ7CiAgICAgZWxzZSBpZiAodHlwZSA9PSBVc2VkRmxvYXQ6OlJpZ2h0KQogICAg ICAgICBtX3R5cGUgPSBGbG9hdFJpZ2h0OworICAgIGlmIChhdXRvKiBjb250YWluaW5nQmxvY2sg PSByZW5kZXJlci5jb250YWluaW5nQmxvY2soKSkKKyAgICAgICAgbV9oYXNBbmNlc3RvcldpdGhP dmVyZmxvd0NsaXAgPSBjb250YWluaW5nQmxvY2stPmVmZmVjdGl2ZU92ZXJmbG93WCgpID09IE92 ZXJmbG93OjpDbGlwIHx8IGNvbnRhaW5pbmdCbG9jay0+ZWZmZWN0aXZlT3ZlcmZsb3dZKCkgPT0g T3ZlcmZsb3c6OkNsaXA7CiB9CiAKLUZsb2F0aW5nT2JqZWN0OjpGbG9hdGluZ09iamVjdChSZW5k ZXJCb3gmIHJlbmRlcmVyLCBUeXBlIHR5cGUsIGNvbnN0IExheW91dFJlY3QmIGZyYW1lUmVjdCwg Y29uc3QgTGF5b3V0U2l6ZSYgbWFyZ2luT2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlz RGVzY2VuZGFudCkKK0Zsb2F0aW5nT2JqZWN0OjpGbG9hdGluZ09iamVjdChSZW5kZXJCb3gmIHJl bmRlcmVyLCBUeXBlIHR5cGUsIGNvbnN0IExheW91dFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgTGF5 b3V0U2l6ZSYgbWFyZ2luT2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlzRGVzY2VuZGFu dCwgYm9vbCBvdmVyZmxvd0NsaXBwZWQpCiAgICAgOiBtX3JlbmRlcmVyKHJlbmRlcmVyKQogICAg ICwgbV9mcmFtZVJlY3QoZnJhbWVSZWN0KQogICAgICwgbV9tYXJnaW5PZmZzZXQobWFyZ2luT2Zm c2V0KQpAQCAtNzMsOSArNjksNyBAQCBGbG9hdGluZ09iamVjdDo6RmxvYXRpbmdPYmplY3QoUmVu ZGVyQm94JiByZW5kZXJlciwgVHlwZSB0eXBlLCBjb25zdCBMYXlvdXRSZWN0JgogICAgICwgbV9w YWludHNGbG9hdChzaG91bGRQYWludCkKICAgICAsIG1faXNEZXNjZW5kYW50KGlzRGVzY2VuZGFu dCkKICAgICAsIG1faXNQbGFjZWQodHJ1ZSkKLSNpZiBBU1NFUlRfRU5BQkxFRAotICAgICwgbV9p c0luUGxhY2VkVHJlZShmYWxzZSkKLSNlbmRpZgorICAgICwgbV9oYXNBbmNlc3RvcldpdGhPdmVy Zmxvd0NsaXAob3ZlcmZsb3dDbGlwcGVkKQogewogfQogCkBAIC04NiwxNCArODAsMTQgQEAgc3Rk Ojp1bmlxdWVfcHRyPEZsb2F0aW5nT2JqZWN0PiBGbG9hdGluZ09iamVjdDo6Y3JlYXRlKFJlbmRl ckJveCYgcmVuZGVyZXIpCiAgICAgcmV0dXJuIG9iamVjdDsKIH0KIAotc3RkOjp1bmlxdWVfcHRy PEZsb2F0aW5nT2JqZWN0PiBGbG9hdGluZ09iamVjdDo6Y29weVRvTmV3Q29udGFpbmVyKExheW91 dFNpemUgb2Zmc2V0LCBib29sIHNob3VsZFBhaW50LCBib29sIGlzRGVzY2VuZGFudCkgY29uc3QK K3N0ZDo6dW5pcXVlX3B0cjxGbG9hdGluZ09iamVjdD4gRmxvYXRpbmdPYmplY3Q6OmNvcHlUb05l d0NvbnRhaW5lcihMYXlvdXRTaXplIG9mZnNldCwgYm9vbCBzaG91bGRQYWludCwgYm9vbCBpc0Rl c2NlbmRhbnQsIGJvb2wgb3ZlcmZsb3dDbGlwcGVkKSBjb25zdAogewotICAgIHJldHVybiBtYWtl VW5pcXVlPEZsb2F0aW5nT2JqZWN0PihyZW5kZXJlcigpLCB0eXBlKCksIExheW91dFJlY3QoZnJh bWVSZWN0KCkubG9jYXRpb24oKSAtIG9mZnNldCwgZnJhbWVSZWN0KCkuc2l6ZSgpKSwgbWFyZ2lu T2Zmc2V0KCksIHNob3VsZFBhaW50LCBpc0Rlc2NlbmRhbnQpOworICAgIHJldHVybiBtYWtlVW5p cXVlPEZsb2F0aW5nT2JqZWN0PihyZW5kZXJlcigpLCB0eXBlKCksIExheW91dFJlY3QoZnJhbWVS ZWN0KCkubG9jYXRpb24oKSAtIG9mZnNldCwgZnJhbWVSZWN0KCkuc2l6ZSgpKSwgbWFyZ2luT2Zm c2V0KCksIHNob3VsZFBhaW50LCBpc0Rlc2NlbmRhbnQsIG92ZXJmbG93Q2xpcHBlZCk7CiB9CiAK IHN0ZDo6dW5pcXVlX3B0cjxGbG9hdGluZ09iamVjdD4gRmxvYXRpbmdPYmplY3Q6OmNsb25lRm9y TmV3UGFyZW50KCkgY29uc3QKIHsKLSAgICBhdXRvIGNsb25lT2JqZWN0ID0gbWFrZVVuaXF1ZTxG bG9hdGluZ09iamVjdD4ocmVuZGVyZXIoKSwgdHlwZSgpLCBtX2ZyYW1lUmVjdCwgbV9tYXJnaW5P ZmZzZXQsIG1fcGFpbnRzRmxvYXQsIG1faXNEZXNjZW5kYW50KTsKKyAgICBhdXRvIGNsb25lT2Jq ZWN0ID0gbWFrZVVuaXF1ZTxGbG9hdGluZ09iamVjdD4ocmVuZGVyZXIoKSwgdHlwZSgpLCBtX2Zy YW1lUmVjdCwgbV9tYXJnaW5PZmZzZXQsIG1fcGFpbnRzRmxvYXQsIG1faXNEZXNjZW5kYW50LCBt X2hhc0FuY2VzdG9yV2l0aE92ZXJmbG93Q2xpcCk7CiAgICAgY2xvbmVPYmplY3QtPm1fcGFnaW5h dGlvblN0cnV0ID0gbV9wYWdpbmF0aW9uU3RydXQ7CiAgICAgY2xvbmVPYmplY3QtPm1faXNQbGFj ZWQgPSBtX2lzUGxhY2VkOwogICAgIHJldHVybiBjbG9uZU9iamVjdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuaAppbmRleCBjZDYwZGI4YmQ1NDIuLmJiOWEyZDlh ZjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0 cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuaApAQCAt NDIsMTEgKzQyLDExIEBAIHB1YmxpYzoKICAgICBlbnVtIFR5cGUgeyBGbG9hdExlZnQgPSAxLCBG bG9hdFJpZ2h0ID0gMiwgRmxvYXRMZWZ0UmlnaHQgPSAzIH07CiAKICAgICBzdGF0aWMgc3RkOjp1 bmlxdWVfcHRyPEZsb2F0aW5nT2JqZWN0PiBjcmVhdGUoUmVuZGVyQm94Jik7Ci0gICAgc3RkOjp1 bmlxdWVfcHRyPEZsb2F0aW5nT2JqZWN0PiBjb3B5VG9OZXdDb250YWluZXIoTGF5b3V0U2l6ZSwg Ym9vbCBzaG91bGRQYWludCA9IGZhbHNlLCBib29sIGlzRGVzY2VuZGFudCA9IGZhbHNlKSBjb25z dDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RmxvYXRpbmdPYmplY3Q+IGNvcHlUb05ld0NvbnRhaW5l cihMYXlvdXRTaXplLCBib29sIHNob3VsZFBhaW50ID0gZmFsc2UsIGJvb2wgaXNEZXNjZW5kYW50 ID0gZmFsc2UsIGJvb2wgb3ZlcmZsb3dDbGlwcGVkID0gZmFsc2UpIGNvbnN0OwogICAgIHN0ZDo6 dW5pcXVlX3B0cjxGbG9hdGluZ09iamVjdD4gY2xvbmVGb3JOZXdQYXJlbnQoKSBjb25zdDsKIAog ICAgIGV4cGxpY2l0IEZsb2F0aW5nT2JqZWN0KFJlbmRlckJveCYpOwotICAgIEZsb2F0aW5nT2Jq ZWN0KFJlbmRlckJveCYsIFR5cGUsIGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBMYXlvdXRTaXpl JiwgYm9vbCBzaG91bGRQYWludCwgYm9vbCBpc0Rlc2NlbmRhbnQpOworICAgIEZsb2F0aW5nT2Jq ZWN0KFJlbmRlckJveCYsIFR5cGUsIGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBMYXlvdXRTaXpl JiwgYm9vbCBzaG91bGRQYWludCwgYm9vbCBpc0Rlc2NlbmRhbnQsIGJvb2wgb3ZlcmZsb3dDbGlw cGVkKTsKIAogICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFR5cGU+ KG1fdHlwZSk7IH0KICAgICBSZW5kZXJCb3gmIHJlbmRlcmVyKCkgY29uc3QgeyBBU1NFUlQobV9y ZW5kZXJlcik7IHJldHVybiAqbV9yZW5kZXJlcjsgfQpAQCAtODQsNiArODQsOCBAQCBwdWJsaWM6 CiAgICAgYm9vbCBwYWludHNGbG9hdCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFpbnRzRmxvYXQ7IH0K ICAgICB2b2lkIHNldFBhaW50c0Zsb2F0KGJvb2wgcGFpbnRzRmxvYXQpIHsgbV9wYWludHNGbG9h dCA9IHBhaW50c0Zsb2F0OyB9CiAKKyAgICBib29sIGhhc0FuY2VzdG9yV2l0aE92ZXJmbG93Q2xp cCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQW5jZXN0b3JXaXRoT3ZlcmZsb3dDbGlwOyB9CisKICAg ICBib29sIGlzRGVzY2VuZGFudCgpIGNvbnN0IHsgcmV0dXJuIG1faXNEZXNjZW5kYW50OyB9CiAg ICAgdm9pZCBzZXRJc0Rlc2NlbmRhbnQoYm9vbCBpc0Rlc2NlbmRhbnQpIHsgbV9pc0Rlc2NlbmRh bnQgPSBpc0Rlc2NlbmRhbnQ7IH0KIApAQCAtMTA5LDExICsxMTEsMTIgQEAgcHJpdmF0ZToKICAg ICBMYXlvdXRVbml0IG1fcGFnaW5hdGlvblN0cnV0OwogICAgIExheW91dFNpemUgbV9tYXJnaW5P ZmZzZXQ7CiAgICAgdW5zaWduZWQgbV90eXBlIDogMjsgLy8gVHlwZSAobGVmdCBvciByaWdodCBh bGlnbmVkKQotICAgIHVuc2lnbmVkIG1fcGFpbnRzRmxvYXQgOiAxOwotICAgIHVuc2lnbmVkIG1f aXNEZXNjZW5kYW50IDogMTsKLSAgICB1bnNpZ25lZCBtX2lzUGxhY2VkIDogMTsKKyAgICB1bnNp Z25lZCBtX3BhaW50c0Zsb2F0IDogMSB7IHRydWUgfTsKKyAgICB1bnNpZ25lZCBtX2lzRGVzY2Vu ZGFudCA6IDEgeyBmYWxzZSB9OworICAgIHVuc2lnbmVkIG1faXNQbGFjZWQgOiAxIHsgZmFsc2Ug fTsKKyAgICB1bnNpZ25lZCBtX2hhc0FuY2VzdG9yV2l0aE92ZXJmbG93Q2xpcCA6IDEgeyBmYWxz ZSB9OwogI2lmIEFTU0VSVF9FTkFCTEVECi0gICAgdW5zaWduZWQgbV9pc0luUGxhY2VkVHJlZSA6 IDE7CisgICAgdW5zaWduZWQgbV9pc0luUGxhY2VkVHJlZSA6IDEgeyBmYWxzZSB9OwogI2VuZGlm CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmlu ZGV4IGU4MzdiMjQyMGY4NS4uNDEyMTkwNTg1ZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzEwOSw2ICszMTA5LDcgQEAgTGF5b3V0VW5p dCBSZW5kZXJCbG9ja0Zsb3c6OmFkZE92ZXJoYW5naW5nRmxvYXRzKFJlbmRlckJsb2NrRmxvdyYg Y2hpbGQsIGJvb2wgbWEKIAogICAgIC8vIEZsb2F0cyB0aGF0IHdpbGwgcmVtYWluIHRoZSBjaGls ZCdzIHJlc3BvbnNpYmlsaXR5IHRvIHBhaW50IHNob3VsZCBmYWN0b3IgaW50byBpdHMKICAgICAv LyBvdmVyZmxvdy4KKyAgICBhdXRvIGJsb2NrSGFzT3ZlcmZsb3dDbGlwID0gZWZmZWN0aXZlT3Zl cmZsb3dYKCkgPT0gT3ZlcmZsb3c6OkNsaXAgfHwgZWZmZWN0aXZlT3ZlcmZsb3dZKCkgPT0gT3Zl cmZsb3c6OkNsaXA7CiAgICAgYXV0byBjaGlsZEVuZCA9IGNoaWxkLm1fZmxvYXRpbmdPYmplY3Rz LT5zZXQoKS5lbmQoKTsKICAgICBmb3IgKGF1dG8gY2hpbGRJdCA9IGNoaWxkLm1fZmxvYXRpbmdP YmplY3RzLT5zZXQoKS5iZWdpbigpOyBjaGlsZEl0ICE9IGNoaWxkRW5kOyArK2NoaWxkSXQpIHsK ICAgICAgICAgYXV0byYgZmxvYXRpbmdPYmplY3QgPSAqY2hpbGRJdC0+Z2V0KCk7CkBAIC0zMTI2 LDcgKzMxMjcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJsb2NrRmxvdzo6YWRkT3ZlcmhhbmdpbmdG bG9hdHMoUmVuZGVyQmxvY2tGbG93JiBjaGlsZCwgYm9vbCBtYQogICAgICAgICAgICAgICAgIC8v IGJlaGF2ZXMgcHJvcGVybHkpLiBXZSBhbHdheXMgd2FudCB0byBwcm9wYWdhdGUgdGhlIGRlc2ly ZSB0byBwYWludCB0aGUgZmxvYXQgYXMKICAgICAgICAgICAgICAgICAvLyBmYXIgb3V0IGFzIHdl IGNhbiwgdG8gdGhlIG91dGVybW9zdCBibG9jayB0aGF0IG92ZXJsYXBzIHRoZSBmbG9hdCwgc3Rv cHBpbmcgb25seQogICAgICAgICAgICAgICAgIC8vIGlmIHdlIGhpdCBhIHNlbGYtcGFpbnRpbmcg bGF5ZXIgYm91bmRhcnkuCi0gICAgICAgICAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LnJlbmRl cmVyKCkuZW5jbG9zaW5nRmxvYXRQYWludGluZ0xheWVyKCkgPT0gZW5jbG9zaW5nRmxvYXRQYWlu dGluZ0xheWVyKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWZsb2F0aW5nT2JqZWN0Lmhhc0Fu Y2VzdG9yV2l0aE92ZXJmbG93Q2xpcCgpICYmIGZsb2F0aW5nT2JqZWN0LnJlbmRlcmVyKCkuZW5j bG9zaW5nRmxvYXRQYWludGluZ0xheWVyKCkgPT0gZW5jbG9zaW5nRmxvYXRQYWludGluZ0xheWVy KCkpIHsKICAgICAgICAgICAgICAgICAgICAgZmxvYXRpbmdPYmplY3Quc2V0UGFpbnRzRmxvYXQo ZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICBzaG91bGRQYWludCA9IHRydWU7CiAgICAgICAg ICAgICAgICAgfQpAQCAtMzEzNCw3ICszMTM1LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9ja0Zs b3c6OmFkZE92ZXJoYW5naW5nRmxvYXRzKFJlbmRlckJsb2NrRmxvdyYgY2hpbGQsIGJvb2wgbWEK ICAgICAgICAgICAgICAgICBpZiAoIW1fZmxvYXRpbmdPYmplY3RzKQogICAgICAgICAgICAgICAg ICAgICBjcmVhdGVGbG9hdGluZ09iamVjdHMoKTsKIAotICAgICAgICAgICAgICAgIG1fZmxvYXRp bmdPYmplY3RzLT5hZGQoZmxvYXRpbmdPYmplY3QuY29weVRvTmV3Q29udGFpbmVyKG9mZnNldCwg c2hvdWxkUGFpbnQsIHRydWUpKTsKKyAgICAgICAgICAgICAgICBtX2Zsb2F0aW5nT2JqZWN0cy0+ YWRkKGZsb2F0aW5nT2JqZWN0LmNvcHlUb05ld0NvbnRhaW5lcihvZmZzZXQsIHNob3VsZFBhaW50 LCB0cnVlLCBmbG9hdGluZ09iamVjdC5oYXNBbmNlc3RvcldpdGhPdmVyZmxvd0NsaXAoKSB8fCBi bG9ja0hhc092ZXJmbG93Q2xpcCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgY29uc3QgYXV0byYgcmVuZGVyZXIgPSBmbG9hdGluZ09iamVjdC5yZW5kZXJl cigpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9vdmVyZmxvdy1jbGlwLXdp dGgtaW5zdHJ1c2l2ZS1mbG9hdC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9ibG9j ay9vdmVyZmxvdy1jbGlwLXdpdGgtaW5zdHJ1c2l2ZS1mbG9hdC1leHBlY3RlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uOWEwZjVhNzk3OWUxCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9vdmVyZmxvdy1jbGlwLXdpdGgtaW5z dHJ1c2l2ZS1mbG9hdC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTIgQEAKKzxzdHlsZT4KK2Rp diB7CisgIHdpZHRoOiAyMHB4OworICBoZWlnaHQ6IDIwcHg7CisgIG1hcmdpbi1ib3R0b206IDgw cHg7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PC9kaXY+ Cis8ZGl2PjwvZGl2PgorPGRpdj48L2Rpdj4KKzxkaXY+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0Lmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJmbG93LWNsaXAtd2l0aC1pbnN0cnVzaXZl LWZsb2F0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi41ZjU3 MmUyMTFmNGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL292ZXJm bG93LWNsaXAtd2l0aC1pbnN0cnVzaXZlLWZsb2F0Lmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPHN0 eWxlPgorLmNvbnRhaW5lciB7CisgIG1hcmdpbi1ib3R0b206IDgwcHg7Cit9CisuZmxvYXQgewor ICB3aWR0aDogNDBweDsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3Jl ZW47CisgIGZsb2F0OiBsZWZ0OworfQorCitkaXYgeworICB3aWR0aDogMjBweDsKKyAgaGVpZ2h0 OiAyMHB4OworfQorCisuY2xpcCB7CisgIG92ZXJmbG93OiBjbGlwOworfQorPC9zdHlsZT4KKzxk aXYgY2xhc3M9ImNsaXAgY29udGFpbmVyIj4KKyAgPGRpdiBjbGFzcz1mbG9hdD48L2Rpdj4KKzwv ZGl2PgorCis8ZGl2IGNsYXNzPSJjbGlwIGNvbnRhaW5lciI+CisgIDxkaXY+CisgICAgPGRpdiBj bGFzcz1mbG9hdD48L2Rpdj4KKyAgPC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iY2xpcCBj b250YWluZXIiPgorICA8ZGl2PgorICAgIDxkaXY+CisgICAgICA8ZGl2IGNsYXNzPWZsb2F0Pjwv ZGl2PgorICAgIDwvZGl2PgorICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5l cj4KKyAgPGRpdiBjbGFzcz1jbGlwPgorICAgIDxkaXY+CisgICAgICA8ZGl2IGNsYXNzPWZsb2F0 PjwvZGl2PgorICAgIDwvZGl2PgorICA8L2Rpdj4KKzwvZGl2Pgo=