6418 2006-01-08 00:17:04 -0800 Incorrect scrollbar when using overflow:auto and word-wrap:break-word; in some cases 2006-01-14 02:19:38 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED http://dscoder.com/WebKitTestCases/chat2.xhtml P2 Normal --- 1 catfish.man webkit-unassigned mitz oldest_to_newest 27967 0 catfish.man 2006-01-08 00:17:04 -0800 The URL is a somewhat simplified and fixed up snippet from an Adium chat (which is displayed in a WebView). Opera 8.5.1 has the rendering I would expect, with no scrollbar (although it does mess up the border slightly). Gecko based browsers don't even get close. Expected result: no horizontal scrollbar, with the text wrapped if necessary to fit. Actual result: horizontal scrollbar that can scroll 1px I originally thought this was another case of http://bugzilla.opendarwin.org/show_bug.cgi?id=5619, but discussions on IRC indicated that it may be a separate bug. 27969 1 catfish.man 2006-01-08 00:47:46 -0800 http://trac.adiumx.com/ticket/267 is the relevant ticket in Adium's bug tracking system. 27987 2 mitz 2006-01-08 07:49:02 -0800 Dave Hyatt has noted in the past that findNextLineBreak contains some suspicious-looking comparisons with width+1 instead of width. I think they're what's causing this bug, since it happens only when the text is one pixel too wide to fit. 27988 3 5545 mitz 2006-01-08 08:42:17 -0800 Created attachment 5545 Reduced testcase Note how "ipsum" stays on the first line, although this results in a RenderText wider than its containing RenderBlock (84 and 83 pixels respectively). Just changing the "width+1" instances to "width" solves this particular problem, but breaks tons of other things. I have a feeling that one way or another the rounding hacks are involved in this bug. 28256 4 5608 mitz 2006-01-11 13:41:58 -0800 Created attachment 5608 The opposite case Despite the +1, premature line-breaking can happen too. In this case, "Dolor" is broken into two lines in TOT and shipping WebKit. Eliminating the "single character but not single-character run" case from the WebTextRenderer rounding hack logic when fixing bug 5414 may have increased the likelihood of this happening, but as you can check, it happened even before. I'm working on a fix... 28322 5 5627 mitz 2006-01-12 13:31:16 -0800 Created attachment 5627 Proposed patch 28345 6 5627 darin 2006-01-12 21:48:16 -0800 Comment on attachment 5627 Proposed patch Looks great. Nice to get rid of the always-false appliedEndWidth boolean along with fixing this. r=me 5545 2006-01-08 08:42:17 -0800 2006-01-08 08:42:17 -0800 Reduced testcase 6418-testcase.html text/html 239 mitz PGh0bWw+CjxoZWFkPgoJPHRpdGxlPjwvdGl0bGU+CjwvaGVhZD4KPGJvZHk+CiAgICA8ZGl2IHN0 eWxlPSJmb250eS1mYW1pbHk6IFRpbWVzOyBmb250LXNpemU6IDE2cHg7IHdpZHRoOjgzcHg7IGJh Y2tncm91bmQ6I2ZmZmY5OTsiPgogICAgICAgIExvcmVtIGlwc3VtPHNwYW4+IGRvbG9yPC9zcGFu PgogICAgICAgIDxici8+CiAgICAgICAgTG9yZW0gaXBzdW0gZG9sb3IKICAgIDwvZGl2Pgo8L2Jv ZHk+CjwvaHRtbD4= 5608 2006-01-11 13:41:58 -0800 2006-01-11 13:41:58 -0800 The opposite case 6418-testcase-complement.html text/html 177 mitz PGRpdiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyI+CiAgICA8ZGl2IHN0eWxlPSJmb250LXNp emU6IDE2cHg7IHdvcmQtd3JhcDpicmVhay13b3JkOyBib3JkZXI6IHNvbGlkIDFweCBjeWFuOyBm b250LWZhbWlseTogJ0x1Y2lkYSBHcmFuZGUnOyI+CiAgICAgICAgRG9sb3IKICAgIDwvZGl2Pgo8 L2Rpdj4K 5627 2006-01-12 13:31:16 -0800 2006-01-12 21:48:16 -0800 Proposed patch 6418_r1.patch text/plain 17518 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyMDMxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDYtMDEtIyMgIE1pdHogUGV0dGVsICA8b3Bl bmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgLSBBZGRlZCB0ZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3Bl bmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTY0MTgKKyAgICAgICAgICBJbmNvcnJlY3Qgc2Ny b2xsYmFyIHdoZW4gdXNpbmcgb3ZlcmZsb3c6YXV0byBhbmQgd29yZC13cmFwOmJyZWFrLXdvcmQ7 CisgICAgICAgICAgaW4gc29tZSBjYXNlcworICAgICAgICAgIAorICAgICAgICAtIFVwZGF0ZWQg YSB0ZXN0IHRoYXQgcmVsaWVkIG9uIHRoZSBidWdneSBiZWhhdmlvci4KKworICAgICAgICAqIGZh c3QvcmVwbGFjZWQvaW5saW5lLWJveC13cmFwcGVyLWhhbmRvdmVyLWV4cGVjdGVkLmNoZWNrc3Vt OiBVcGRhdGVkCisgICAgICAgICogZmFzdC9yZXBsYWNlZC9pbmxpbmUtYm94LXdyYXBwZXItaGFu ZG92ZXItZXhwZWN0ZWQucG5nOiBVcGRhdGVkCisgICAgICAgICogZmFzdC9yZXBsYWNlZC9pbmxp bmUtYm94LXdyYXBwZXItaGFuZG92ZXItZXhwZWN0ZWQudHh0OiBVcGRhdGVkCisgICAgICAgICog ZmFzdC9yZXBsYWNlZC9pbmxpbmUtYm94LXdyYXBwZXItaGFuZG92ZXIuaHRtbDogVXBkYXRlZAor ICAgICAgICAqIGZhc3QvdGV4dC9iYXNpYy8wMTUtZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLgor ICAgICAgICAqIGZhc3QvdGV4dC9iYXNpYy8wMTUtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L3RleHQvYmFzaWMvMDE1LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC90ZXh0L2Jhc2ljLzAxNS5odG1sOiBBZGRlZC4KKwogMjAwNi0wMS0xMiAgTWl0eiBQZXR0 ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBh bmQgbGFuZGVkIGJ5IERhcmluLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9yZXBsYWNlZC9pbmxp bmUtYm94LXdyYXBwZXItaGFuZG92ZXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9m YXN0L3JlcGxhY2VkL2lubGluZS1ib3gtd3JhcHBlci1oYW5kb3Zlci5odG1sCShyZXZpc2lvbiAx MjAyOCkKKysrIExheW91dFRlc3RzL2Zhc3QvcmVwbGFjZWQvaW5saW5lLWJveC13cmFwcGVyLWhh bmRvdmVyLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTE1LDcgKzE1LDcgQEAKICAgICAgICAgYS5z dHlsZS53aWR0aCA9ICc0MHB4JzsKICAgICAgICAgCiAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zm c2V0VG9wOwotICAgICAgICBiLnN0eWxlLndpZHRoID0gJzQwcHgnOworICAgICAgICBiLnN0eWxl LndpZHRoID0gJzM1cHgnOwogICAgIH0KICAgICA8L3NjcmlwdD4KIDwvaGVhZD4KQEAgLTM4LDcg KzM4LDcgQEAKICAgICBCb3ggMjoKICAgICA8ZGl2IHN0eWxlPSJib3JkZXI6IDFweCBibGFjayBz b2xpZDsgd2lkdGg6IDU1cHg7IHBhZGRpbmc6IDVweDsiPgogICAgICAgICA8ZGl2IGNsYXNzPSJp YiIgc3R5bGU9ImJhY2tncm91bmQ6IGJsdWU7IHdpZHRoOiA0MHB4OyI+PC9kaXY+IEEKLSAgICAg ICAgPGRpdiBjbGFzcz0iaWIiIHN0eWxlPSJiYWNrZ3JvdW5kOiByZWQ7IHdpZHRoOiA0MHB4OyI+ PC9kaXY+IEIKKyAgICAgICAgPGRpdiBjbGFzcz0iaWIiIHN0eWxlPSJiYWNrZ3JvdW5kOiByZWQ7 IHdpZHRoOiAzNXB4OyI+PC9kaXY+IEIKICAgICAgICAgPGRpdiBjbGFzcz0iaWIiIHN0eWxlPSJi YWNrZ3JvdW5kOiBncmVlbjsiPjwvZGl2PiBDCiAgICAgPC9kaXY+CiA8L2JvZHk+CkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L3JlcGxhY2VkL2lubGluZS1ib3gtd3JhcHBlci1oYW5kb3Zlci1leHBl Y3RlZC5wbmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5h cnkgdHlwZS4Kc3ZuOm1pbWUtdHlwZSA9IGltYWdlL3BuZwpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9yZXBsYWNlZC9pbmxpbmUtYm94LXdyYXBwZXItaGFuZG92ZXItZXhwZWN0ZWQuY2hlY2tzdW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9yZXBsYWNlZC9pbmxpbmUtYm94LXdyYXBw ZXItaGFuZG92ZXItZXhwZWN0ZWQuY2hlY2tzdW0JKHJldmlzaW9uIDEyMDI4KQorKysgTGF5b3V0 VGVzdHMvZmFzdC9yZXBsYWNlZC9pbmxpbmUtYm94LXdyYXBwZXItaGFuZG92ZXItZXhwZWN0ZWQu Y2hlY2tzdW0JKHdvcmtpbmcgY29weSkKQEAgLTEsMiArMSBAQAotN2QwMzA5YzUyNjhlZmI3ODFk MmY3NTVmM2Y4Zjc2Y2UKLVwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorYjNjOTgwZWNkMDAz YTQ1ODljNDQ4Zjg3ZTY3M2ZiYTAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L3JlcGxhY2VkL2lubGluZS1ib3gtd3JhcHBlci1oYW5kb3Zlci1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9yZXBsYWNlZC9pbmxpbmUt Ym94LXdyYXBwZXItaGFuZG92ZXItZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxMjAyOCkKKysrIExh eW91dFRlc3RzL2Zhc3QvcmVwbGFjZWQvaW5saW5lLWJveC13cmFwcGVyLWhhbmRvdmVyLWV4cGVj dGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQCBsYXllciBhdCAoMCwwKSBz aXplIDgwMHg2MDAKICAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDYsNikgc2l6ZSA0MHgy MCBbYmdjb2xvcj0jMDAwMEZGXQogICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoNiwzMikg c2l6ZSAxNngxOAogICAgICAgICAgIHRleHQgcnVuIGF0ICg2LDMyKSB3aWR0aCAxNjogIkEgIgot ICAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMjIsMjYpIHNpemUgNDB4MjAgW2JnY29sb3I9 I0ZGMDAwMF0KKyAgICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDIyLDI2KSBzaXplIDM1eDIw IFtiZ2NvbG9yPSNGRjAwMDBdCiAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICg2LDU2KSBz aXplIDE1eDE4CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDYsNTYpIHdpZHRoIDE1OiAiQiAiCiAg ICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgyMSw1MCkgc2l6ZSAyMHgyMCBbYmdjb2xvcj0j MDA4MDAwXQpAQCAtNDEsNyArNDEsNyBAQCBsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKICAg ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDYsNikgc2l6ZSA0MHgyMCBbYmdjb2xvcj0jMDAw MEZGXQogICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoNiwzMikgc2l6ZSAxNngxOAogICAg ICAgICAgIHRleHQgcnVuIGF0ICg2LDMyKSB3aWR0aCAxNjogIkEgIgotICAgICAgICBSZW5kZXJC bG9jayB7RElWfSBhdCAoMjIsMjYpIHNpemUgNDB4MjAgW2JnY29sb3I9I0ZGMDAwMF0KKyAgICAg ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDIyLDI2KSBzaXplIDM1eDIwIFtiZ2NvbG9yPSNGRjAw MDBdCiAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICg2LDU2KSBzaXplIDE1eDE4CiAgICAg ICAgICAgdGV4dCBydW4gYXQgKDYsNTYpIHdpZHRoIDE1OiAiQiAiCiAgICAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgyMSw1MCkgc2l6ZSAyMHgyMCBbYmdjb2xvcj0jMDA4MDAwXQpJbmRleDog TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2Jhc2ljLzAxNS1leHBlY3RlZC5wbmcKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpD YW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZS4Kc3ZuOm1pbWUtdHlw ZSA9IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQoKUHJvcGVydHkgY2hhbmdlcyBvbjogMDE1LWV4 cGVjdGVkLnBuZwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5cGUKICAgKyBhcHBsaWNhdGlv bi9vY3RldC1zdHJlYW0KCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYmFzaWMvMDE1LWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYmFzaWMvMDE1 LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC9iYXNp Yy8wMTUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYyIEBACitsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQ2FudmFzIGF0ICgwLDApIHNpemUgODAweDYw MAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAo MCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4 NHg1NzYKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBzaXplIDc4NHgzNgorICAgICAg ICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDIxMngxOAorICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDApIHdpZHRoIDIxMjogIlRoaXMgdGVzdHMgZm9yIGEgcmVncmVzc2lvbiBhZ2Fp bnN0ICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtJfSBhdCAoMCwwKSBzaXplIDc1OXgzNgorICAg ICAgICAgIFJlbmRlcklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSAzNDh4MTggW2NvbG9yPSMwMDAw RUVdCisgICAgICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMjEyLDApIHNpemUgMzQ4eDE4 CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgyMTIsMCkgd2lkdGggMzQ4OiAiaHR0cDovL2J1 Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02NDE4IgorICAgICAgICAgIFJl bmRlclRleHQge1RFWFR9IGF0ICg1NjAsMCkgc2l6ZSA3NTl4MzYKKyAgICAgICAgICAgIHRleHQg cnVuIGF0ICg1NjAsMCkgd2lkdGggNDogIiAiCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoNTY0 LDApIHdpZHRoIDE5NTogIkluY29ycmVjdCBzY3JvbGxiYXIgd2hlbiB1c2luZyIKKyAgICAgICAg ICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCAyNzk6ICJvdmVyZmxvdzphdXRvIGFuZCB3b3Jk LXdyYXA6YnJlYWstd29yZDsgIgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDI3OSwxOCkgd2lk dGggODc6ICJpbiBzb21lIGNhc2VzIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMzY2 LDE4KSBzaXplIDR4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzY2LDE4KSB3aWR0aCA0OiAi LiIKKyAgICAgIFJlbmRlckJsb2NrIHtIUn0gYXQgKDAsNTIpIHNpemUgNzg0eDIgW2JvcmRlcjog KDFweCBpbnNldCAjMDAwMDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCw3MCkgc2l6 ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAyNjF4MTgK KyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyNjE6ICJUaGUgZmlyc3QgbGluZSBz aG91bGQgYnJlYWsgYWZ0ZXIgXHh7MjAxQ31Mb3JlbVx4ezIwMUR9LiIKKyAgICAgIFJlbmRlckJs b2NrIHtESVZ9IGF0ICgwLDEwNCkgc2l6ZSA4NXgzOCBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMEZG RkYpXQorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMSwxKSBzaXplIDQyeDM2CisgICAg ICAgICAgdGV4dCBydW4gYXQgKDEsMSkgd2lkdGggNDI6ICJMb3JlbSIKKyAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMSwxOSkgd2lkdGggMzg6ICJpcHN1bSIKKyAgICAgICAgUmVuZGVySW5saW5lIHtT UEFOfSBhdCAoMCwwKSBzaXplIDM3eDE4CisgICAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQg KDM5LDE5KSBzaXplIDM3eDE4CisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzksMTkpIHdpZHRo IDM3OiAiIGRvbG9yIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDB4 MAorICAgICAgUmVuZGVyQmxvY2sge0hSfSBhdCAoMCwxNTApIHNpemUgNzg0eDIgW2JvcmRlcjog KDFweCBpbnNldCAjMDAwMDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwxNjgpIHNp emUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgNjU5eDE4 CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNDc3OiAiVGhlIGZpcnN0IGxpbmUg c2hvdWxkIGJyZWFrIGFmdGVyIHRoZSBsZXR0ZXIgdSwgc28gdGhhdCB0aGUgZ3JheSBib3JkZXIg ZG9lcyBub3QgIgorICAgICAgICAgIHRleHQgcnVuIGF0ICg0NzcsMCkgd2lkdGggMTgyOiAiZXh0 ZW5kIGJleW9uZCB0aGUgY3lhbiBib3guIgorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAs MjAyKSBzaXplIDg3eDM4IFtib3JkZXI6ICgxcHggc29saWQgIzAwRkZGRildCisgICAgICAgIFJl bmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkgc2l6ZSA2OHgzNiBbYm9yZGVyOiAoMzBweCBzb2xp ZCAjQzBDMEMwKSBub25lXQorICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgxLDEpIHNp emUgNjh4MzYKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDEpIHdpZHRoIDY4OiAiTG9yZW1p cHN1IgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDEsMTkpIHdpZHRoIDEyOiAibSIKKyAgICAg ICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJlbmRlckJsb2Nr IHtIUn0gYXQgKDAsMjQ4KSBzaXplIDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCld CisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMjY2KSBzaXplIDc4NHgxOAorICAgICAgICBS ZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDYwOXgxOAorICAgICAgICAgIHRleHQgcnVu IGF0ICgwLDApIHdpZHRoIDQyNzogIlRoZSBmaXJzdCBsaW5lIHNob3VsZCBicmVhayBhZnRlciB0 aGUgbGV0dGVyIHAsIHNvIHRoYXQgdGhlIHRleHQgZG9lcyBub3QgIgorICAgICAgICAgIHRleHQg cnVuIGF0ICg0MjcsMCkgd2lkdGggMTgyOiAiZXh0ZW5kIGJleW9uZCB0aGUgY3lhbiBib3guIgor ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMzAwKSBzaXplIDg3eDM4IFtib3JkZXI6ICgx cHggc29saWQgIzAwRkZGRildCisgICAgICAgIFJlbmRlcklubGluZSB7U1BBTn0gYXQgKDAsMCkg c2l6ZSA4NHgzNiBbYm9yZGVyOiAoMzBweCBzb2xpZCAjQzBDMEMwKV0KKyAgICAgICAgICBSZW5k ZXJUZXh0IHtURVhUfSBhdCAoMzEsMSkgc2l6ZSA4NHgzNgorICAgICAgICAgICAgdGV4dCBydW4g YXQgKDMxLDEpIHdpZHRoIDU0OiAiTG9yZW1pcCIKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICgx LDE5KSB3aWR0aCAyNjogInN1bSIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkg c2l6ZSAweDAKKyAgICAgIFJlbmRlckJsb2NrIHtIUn0gYXQgKDAsMzQ2KSBzaXplIDc4NHgyIFti b3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAs MzY0KSBzaXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXpl IDI1M3gxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI1MzogIlx4ezIwMUN9 RG9sb3JceHsyMDFEfSBzaG91bGQgbm90IGJyZWFrIGludG8gdHdvIGxpbmVzLiIKK2xheWVyIGF0 ICg4LDQwNikgc2l6ZSA0NXgyMAorICBSZW5kZXJCbG9jayAocG9zaXRpb25lZCkge0RJVn0gYXQg KDgsNDA2KSBzaXplIDQ1eDIwCisgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSA0 NXgyMCBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMEZGRkYpXQorICAgICAgUmVuZGVyVGV4dCB7VEVY VH0gYXQgKDEsMSkgc2l6ZSA0M3gxOAorICAgICAgICB0ZXh0IHJ1biBhdCAoMSwxKSB3aWR0aCA0 MzogIkRvbG9yIgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2Jhc2ljLzAxNS1leHBlY3Rl ZC5jaGVja3N1bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYmFzaWMvMDE1 LWV4cGVjdGVkLmNoZWNrc3VtCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2Jhc2ljLzAxNS1leHBlY3RlZC5jaGVja3N1bQkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAor MmI5YWM5ZDViNjIxMDFiYjI4NThmNjZiNDNkNDc5ZjcKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm aWxlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvYmFzaWMvMDE1Lmh0bWwKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2Jhc2ljLzAxNS5odG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2Jhc2ljLzAxNS5odG1sCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDQ1IEBACis8aHRtbD4KKzxoZWFkPgorCTx0aXRsZT5UZXN0Y2FzZSBmb3IgYnVnemls bGEgYnVnIDY0MTg8L3RpdGxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+CisgICAgICAgIFRo aXMgdGVzdHMgZm9yIGEgcmVncmVzc2lvbiBhZ2FpbnN0CisgICAgICAgIDxpPjxhIGhyZWY9Imh0 dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQxOCI+aHR0cDov L2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02NDE4PC9hPgorICAgICAg ICBJbmNvcnJlY3Qgc2Nyb2xsYmFyIHdoZW4gdXNpbmcgb3ZlcmZsb3c6YXV0byBhbmQgd29yZC13 cmFwOmJyZWFrLXdvcmQ7CisgICAgICAgIGluIHNvbWUgY2FzZXM8L2k+LgorICAgIDwvcD4KKyAg ICA8aHI+CisgICAgPHA+CisgICAgICAgIFRoZSBmaXJzdCBsaW5lIHNob3VsZCBicmVhayBhZnRl ciAmbGRxdW87TG9yZW0mcmRxdW87LgorICAgIDwvcD4KKyAgICA8ZGl2IHN0eWxlPSJmb250eS1m YW1pbHk6IFRpbWVzOyBmb250LXNpemU6IDE2cHg7IHdpZHRoOjgzcHg7IGJvcmRlcjogMXB4IGN5 YW4gc29saWQ7Ij4KKyAgICAgICAgTG9yZW0gaXBzdW08c3Bhbj4gZG9sb3I8L3NwYW4+CisgICAg PC9kaXY+CisgICAgPGhyPgorICAgIDxwPgorICAgICAgICBUaGUgZmlyc3QgbGluZSBzaG91bGQg YnJlYWsgYWZ0ZXIgdGhlIGxldHRlciB1LCBzbyB0aGF0IHRoZSBncmF5IGJvcmRlciBkb2VzIG5v dAorICAgICAgICBleHRlbmQgYmV5b25kIHRoZSBjeWFuIGJveC4KKyAgICA8L3A+CisgICAgPGRp diBzdHlsZT0id2lkdGg6IDg1cHg7IGZvbnQtc2l6ZTogMTZweDsgd29yZC13cmFwOmJyZWFrLXdv cmQ7IGJvcmRlcjogc29saWQgMXB4IGN5YW47IGZvbnQtZmFtaWx5OiBUaW1lczsiPgorICAgICAg ICA8c3BhbiBzdHlsZT0iYm9yZGVyLXJpZ2h0OiAzMHB4IHNpbHZlciBzb2xpZDsiPkxvcmVtaXBz dW08L3NwYW4+CisgICAgPC9kaXY+CisgICAgPGhyPgorICAgIDxwPgorICAgICAgICBUaGUgZmly c3QgbGluZSBzaG91bGQgYnJlYWsgYWZ0ZXIgdGhlIGxldHRlciBwLCBzbyB0aGF0IHRoZSB0ZXh0 IGRvZXMgbm90CisgICAgICAgIGV4dGVuZCBiZXlvbmQgdGhlIGN5YW4gYm94LgorICAgIDwvcD4K KyAgICA8ZGl2IHN0eWxlPSJ3aWR0aDogODVweDsgZm9udC1zaXplOiAxNnB4OyB3b3JkLXdyYXA6 YnJlYWstd29yZDsgYm9yZGVyOiBzb2xpZCAxcHggY3lhbjsgZm9udC1mYW1pbHk6IFRpbWVzOyI+ CisgICAgICAgIDxzcGFuIHN0eWxlPSJib3JkZXItbGVmdDogMzBweCBzaWx2ZXIgc29saWQ7Ij5M b3JlbWlwc3VtPC9zcGFuPgorICAgIDwvZGl2PgorICAgIDxocj4KKyAgICA8cD4KKyAgICAgICAg JmxkcXVvO0RvbG9yJnJkcXVvOyBzaG91bGQgbm90IGJyZWFrIGludG8gdHdvIGxpbmVzLgorICAg IDwvcD4KKyAgICA8ZGl2IHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGU7Ij4KKyAgICAgICAgPGRp diBzdHlsZT0iZm9udC1zaXplOiAxNnB4OyB3b3JkLXdyYXA6YnJlYWstd29yZDsgYm9yZGVyOiBz b2xpZCAxcHggY3lhbjsgZm9udC1mYW1pbHk6ICdMdWNpZGEgR3JhbmRlJzsiPgorICAgICAgICAg ICAgRG9sb3IKKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cklu ZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwko cmV2aXNpb24gMTIwMzEpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE4IEBACisyMDA2LTAxLSMjICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1p dHpwZXR0ZWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAg ICAgICAKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2Jhc2ljLzAxNS5odG1sCisKKyAgICAgICAg KiBraHRtbC9yZW5kZXJpbmcvYmlkaS5jcHA6CisgICAgICAgIChraHRtbDo6UmVuZGVyQmxvY2s6 OmZpbmROZXh0TGluZUJyZWFrKToKKyAgICAgICAgQXZvaWQgaW5jb25zaXN0ZW50IHdpZHRoIG1l YXN1cmVtZW50IHdoZW4gYnJlYWtpbmcgaW4gdGhlIG1pZGRsZSBvZiBhCisgICAgICAgIHdvcmQg aXMgYWxsb3dlZC4gRWxpbWluYXRlIHRoZSByZWxheGF0aW9uIGJ5IDEgb2YgdGhlIHdpZHRoIG92 ZXJmbG93CisgICAgICAgIGNoZWNrIHRoYXQgd2FzIHN1cHBvc2VkIHRvIGNvbXBlbnNhdGUgZm9y IHRoZSBpbmNvbnNpc3RlbmN5IGJ1dCBkaWRuJ3QKKyAgICAgICAgYWx3YXlzIHdvcmssIGFuZCBv biB0aGUgb3RoZXIgaGFuZCBzb21ldGltZXMgcmVzdWx0ZWQgaW4gYWxsb3dpbmcgdGV4dAorICAg ICAgICB0byBvdmVyZmxvdyBpdHMgY29udGFpbmVyIGJ5IG9uZSBwaXhlbC4KKyAgICAgICAgQWxz byBhcHBsaWVkIHN0YXJ0IGFuZCBlbmQgd2lkdGggY29ycmVjdGx5IGluIHRoZSBicmVhay13b3Jk cyBjYXNlLgorCiAyMDA2LTAxLTEyICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1pdHpw ZXR0ZWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGFuZCBsYW5kZWQgYnkgRGFyaW4uCkluZGV4 OiBXZWJDb3JlL2todG1sL3JlbmRlcmluZy9iaWRpLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2todG1sL3JlbmRlcmluZy9iaWRpLmNwcAkocmV2aXNpb24gMTIwMjgpCisrKyBXZWJDb3JlL2to dG1sL3JlbmRlcmluZy9iaWRpLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEyMSw5ICsyMTIxLDcg QEAgQmlkaUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcgogCiAgICAgICAgICAg ICBib29sIGFwcGxpZWRTdGFydFdpZHRoID0gcG9zID4gMDsgLy8gSWYgdGhlIHNwYW4gb3JpZ2lu YXRlZCBvbiBhIHByZXZpb3VzIGxpbmUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gdGhlbiBhc3N1bWUgdGhlIHN0YXJ0IHdpZHRoIGhhcyBiZWVuIGFw cGxpZWQuCi0gICAgICAgICAgICBib29sIGFwcGxpZWRFbmRXaWR0aCA9IGZhbHNlOwotCi0gICAg ICAgICAgICBpbnQgd3JhcFcgPSB0bXBXOworICAgICAgICAgICAgaW50IHdyYXBXID0gdG1wVyAr IGlubGluZVdpZHRoKG8sICFhcHBsaWVkU3RhcnRXaWR0aCwgdHJ1ZSk7CiAgICAgICAgICAgICBp bnQgbmV4dEJyZWFrYWJsZSA9IC0xOwogCiAgICAgICAgICAgICB3aGlsZSAobGVuKSB7CkBAIC0y MTgwLDggKzIxNzgsOSBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJy CiAKICAgICAgICAgICAgICAgICBpZiAoYnJlYWtXb3JkcykKICAgICAgICAgICAgICAgICAgICAg d3JhcFcgKz0gdC0+d2lkdGgocG9zLCAxLCBmLCB3K3dyYXBXKTsKKyAgICAgICAgICAgICAgICBi b29sIG1pZFdvcmRCcmVhayA9IGJyZWFrV29yZHMgJiYgKHcgKyB3cmFwVyA+IHdpZHRoKTsKIAot ICAgICAgICAgICAgICAgIGlmIChjID09ICdcbicgfHwgKG8tPnN0eWxlKCktPndoaXRlU3BhY2Uo KSAhPSBQUkUgJiYgaXNCcmVha2FibGUoc3RyLCBwb3MsIHN0cmxlbiwgbmV4dEJyZWFrYWJsZSwg YnJlYWtOQlNQKSkgfHwgKGJyZWFrV29yZHMgJiYgKHcgKyB3cmFwVyA+IHdpZHRoKSkpIHsKKyAg ICAgICAgICAgICAgICBpZiAoYyA9PSAnXG4nIHx8IChvLT5zdHlsZSgpLT53aGl0ZVNwYWNlKCkg IT0gUFJFICYmIGlzQnJlYWthYmxlKHN0ciwgcG9zLCBzdHJsZW4sIG5leHRCcmVha2FibGUsIGJy ZWFrTkJTUCkpIHx8IG1pZFdvcmRCcmVhaykgewogICAgICAgICAgICAgICAgICAgICBpZiAoaWdu b3JpbmdTcGFjZXMpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghY3VycmVudENoYXJh Y3RlcklzU3BhY2UpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBTdG9wIGlnbm9y aW5nIHNwYWNlcyBhbmQgYmVnaW4gYXQgdGhpcwpAQCAtMjE5OSw3ICsyMTk4LDggQEAgQmlkaUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICAgICAgdG1wVyAr PSB0LT53aWR0aChsYXN0U3BhY2UsIHBvcyAtIGxhc3RTcGFjZSwgZiwgdyt0bXBXKSArIGxhc3RT cGFjZVdvcmRTcGFjaW5nOworICAgICAgICAgICAgICAgICAgICBpbnQgYWRkaXRpb25hbFRtcFcg PSB0LT53aWR0aChsYXN0U3BhY2UsIHBvcyAtIGxhc3RTcGFjZSwgZiwgdyt0bXBXKSArIGxhc3RT cGFjZVdvcmRTcGFjaW5nOworICAgICAgICAgICAgICAgICAgICB0bXBXICs9IGFkZGl0aW9uYWxU bXBXOwogICAgICAgICAgICAgICAgICAgICBpZiAoIWFwcGxpZWRTdGFydFdpZHRoKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICB0bXBXICs9IGlubGluZVdpZHRoKG8sIHRydWUsIGZhbHNlKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGxpZWRTdGFydFdpZHRoID0gdHJ1ZTsKQEAgLTIy NDQsOSArMjI0NCwxMyBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJy CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ290byBlbmQ7IC8vIERpZG4n dCBmaXQuIEp1bXAgdG8gdGhlIGVuZC4KLSAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAocG9zID4gMCAmJiBzdHJbcG9zLTFdLnVuaWNvZGUoKSA9PSBTT0ZUX0hZUEhFTikKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBTdWJ0cmFjdCB0aGUgd2lkdGggb2YgdGhlIHNvZnQg aHlwaGVuIG91dCBzaW5jZSB3ZSBmaXQgb24gYSBsaW5lLgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRtcFcgLT0gdC0+d2lkdGgocG9zLTEsIDEsIGYsIHcrdG1wVyk7CisgICAgICAgICAg ICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICht aWRXb3JkQnJlYWspCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRtcFcgLT0gYWRk aXRpb25hbFRtcFc7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHBvcyA+IDAgJiYg c3RyW3Bvcy0xXS51bmljb2RlKCkgPT0gU09GVF9IWVBIRU4pCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIFN1YnRyYWN0IHRoZSB3aWR0aCBvZiB0aGUgc29mdCBoeXBoZW4gb3V0 IHNpbmNlIHdlIGZpdCBvbiBhIGxpbmUuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRtcFcgLT0gdC0+d2lkdGgocG9zLTEsIDEsIGYsIHcrdG1wVyk7CisgICAgICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgICAgICBp ZiAoKihzdHIrcG9zKSA9PSAnXG4nICYmIG8tPnN0eWxlKCktPnByZXNlcnZlTmV3bGluZSgpKSB7 CkBAIC0yMjYyLDggKzIyNjYsMTUgQEAgQmlkaUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4 dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLnBvcyA9IHBvczsKICAgICAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAg ICAgbGFzdFNwYWNlV29yZFNwYWNpbmcgPSBhcHBseVdvcmRTcGFjaW5nID8gd29yZFNwYWNpbmcg OiAwOwotICAgICAgICAgICAgICAgICAgICBsYXN0U3BhY2UgPSBwb3M7CisgICAgICAgICAgICAg ICAgICAgIGlmIChtaWRXb3JkQnJlYWspIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIFJl bWVtYmVyIHRoaXMgYXMgYSBicmVha2FibGUgcG9zaXRpb24gaW4gY2FzZQorICAgICAgICAgICAg ICAgICAgICAgICAgLy8gYWRkaW5nIHRoZSBlbmQgd2lkdGggZm9yY2VzIGEgYnJlYWsuCisgICAg ICAgICAgICAgICAgICAgICAgICBsQnJlYWsub2JqID0gbzsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGxCcmVhay5wb3MgPSBwb3M7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgICAgICAgICBsYXN0U3BhY2VXb3JkU3BhY2luZyA9IGFwcGx5V29yZFNwYWNp bmcgPyB3b3JkU3BhY2luZyA6IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBsYXN0U3BhY2Ug PSBwb3M7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgCiAgICAg ICAgICAgICAgICAgICAgIGlmICghaWdub3JpbmdTcGFjZXMgJiYgby0+c3R5bGUoKS0+Y29sbGFw c2VXaGl0ZVNwYWNlKCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIElmIHdlIGVuY291 bnRlciBhIG5ld2xpbmUsIG9yIGlmIHdlIGVuY291bnRlciBhCkBAIC0yMzE0LDE1ICsyMzI1LDE0 IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnIKICAgICAgICAgICAg ICAgICB0bXBXICs9IHQtPndpZHRoKGxhc3RTcGFjZSwgcG9zIC0gbGFzdFNwYWNlLCBmLCB3K3Rt cFcpICsgbGFzdFNwYWNlV29yZFNwYWNpbmc7CiAgICAgICAgICAgICBpZiAoIWFwcGxpZWRTdGFy dFdpZHRoKQogICAgICAgICAgICAgICAgIHRtcFcgKz0gaW5saW5lV2lkdGgobywgdHJ1ZSwgZmFs c2UpOwotICAgICAgICAgICAgaWYgKCFhcHBsaWVkRW5kV2lkdGgpCi0gICAgICAgICAgICAgICAg dG1wVyArPSBpbmxpbmVXaWR0aChvLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgICAgICB0bXBXICs9 IGlubGluZVdpZHRoKG8sIGZhbHNlLCB0cnVlKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAg ICBLSFRNTEFzc2VydCggZmFsc2UgKTsKIAogICAgICAgICBSZW5kZXJPYmplY3QqIG5leHQgPSBi aWRpTmV4dChzdGFydC5ibG9jaywgbywgYmlkaSk7CiAgICAgICAgIGJvb2wgYXV0b1dyYXAgPSBv LT5zdHlsZSgpLT5hdXRvV3JhcCgpOwogICAgICAgICBib29sIGNoZWNrRm9yQnJlYWsgPSBhdXRv V3JhcDsKLSAgICAgICAgaWYgKHcgJiYgdyArIHRtcFcgPiB3aWR0aCsxICYmIGxCcmVhay5vYmog JiYgby0+c3R5bGUoKS0+d2hpdGVTcGFjZSgpID09IE5PV1JBUCkKKyAgICAgICAgaWYgKHcgJiYg dyArIHRtcFcgPiB3aWR0aCAmJiBsQnJlYWsub2JqICYmIG8tPnN0eWxlKCktPndoaXRlU3BhY2Uo KSA9PSBOT1dSQVApCiAgICAgICAgICAgICBjaGVja0ZvckJyZWFrID0gdHJ1ZTsKICAgICAgICAg ZWxzZSBpZiAobmV4dCAmJiBvLT5pc1RleHQoKSAmJiBuZXh0LT5pc1RleHQoKSAmJiAhbmV4dC0+ aXNCUigpKSB7CiAgICAgICAgICAgICBpZiAoYXV0b1dyYXAgfHwgKG5leHQtPnN0eWxlKCktPmF1 dG9XcmFwKCkpKSB7CkBAIC0yMzQwLDcgKzIzNTAsNyBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxv Y2s6OmZpbmROZXh0TGluZUJyCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2tGb3JC cmVhayA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgICAgICAgICAgYm9vbCBjYW5QbGFjZU9uTGluZSA9ICh3ICsgdG1w VyA8PSB3aWR0aCsxKSB8fCAhYXV0b1dyYXA7CisgICAgICAgICAgICAgICAgICAgIGJvb2wgY2Fu UGxhY2VPbkxpbmUgPSAodyArIHRtcFcgPD0gd2lkdGgpIHx8ICFhdXRvV3JhcDsKICAgICAgICAg ICAgICAgICAgICAgaWYgKGNhblBsYWNlT25MaW5lICYmIGNoZWNrRm9yQnJlYWspIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIHcgKz0gdG1wVzsKICAgICAgICAgICAgICAgICAgICAgICAgIHRt cFcgPSAwOwpAQCAtMjM1MSw3ICsyMzYxLDcgQEAgQmlkaUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpm aW5kTmV4dExpbmVCcgogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGNo ZWNrRm9yQnJlYWsgJiYgKHcgKyB0bXBXID4gd2lkdGgrMSkpIHsKKyAgICAgICAgaWYgKGNoZWNr Rm9yQnJlYWsgJiYgKHcgKyB0bXBXID4gd2lkdGgpKSB7CiAgICAgICAgICAgICAvLyBpZiB3ZSBo YXZlIGZsb2F0cywgdHJ5IHRvIGdldCBiZWxvdyB0aGVtLgogICAgICAgICAgICAgaWYgKGN1cnJl bnRDaGFyYWN0ZXJJc1NwYWNlICYmICFpZ25vcmluZ1NwYWNlcyAmJiBvLT5zdHlsZSgpLT5jb2xs YXBzZVdoaXRlU3BhY2UoKSkKICAgICAgICAgICAgICAgICB0cmFpbGluZ1NwYWNlT2JqZWN0ID0g MDsKQEAgLTIzNzQsNyArMjM4NCw3IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5l eHRMaW5lQnIKICAgICAgICAgICAgIC8vIHx3aWR0aHwgbWF5IGhhdmUgYmVlbiBhZGp1c3RlZCBi ZWNhdXNlIHdlIGdvdCBzaG92ZWQgZG93biBwYXN0IGEgZmxvYXQgKHRodXMKICAgICAgICAgICAg IC8vIGdpdmluZyB1cyBtb3JlIHJvb20pLCBzbyB3ZSBuZWVkIHRvIHJldGVzdCwgYW5kIG9ubHkg anVtcCB0bwogICAgICAgICAgICAgLy8gdGhlIGVuZCBsYWJlbCBpZiB3ZSBzdGlsbCBkb24ndCBm aXQgb24gdGhlIGxpbmUuIC1kd2gKLSAgICAgICAgICAgIGlmICh3ICsgdG1wVyA+IHdpZHRoKzEp CisgICAgICAgICAgICBpZiAodyArIHRtcFcgPiB3aWR0aCkKICAgICAgICAgICAgICAgICBnb3Rv IGVuZDsKICAgICAgICAgfQogCg==