8056 2006-03-29 10:51:43 -0800 Flexible boxes do not repaint their top, left and children's overflows 2006-04-04 01:50:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 mitz webkit-unassigned oldest_to_newest 37867 0 mitz 2006-03-29 10:51:43 -0800 I am going to attach a patch including test cases. 37868 1 7375 mitz 2006-03-29 10:57:23 -0800 Created attachment 7375 Patch 37981 2 7375 darin 2006-03-30 08:40:29 -0800 Comment on attachment 7375 Patch Looks good to me, but also I think lots of layout code is crying out for use of overflowRect as opposed to the separate overflowLeft, Top, Width, Height functions. r=me 38481 3 mitz 2006-04-04 01:50:20 -0700 Verified in r13675 nightly. 7375 2006-03-29 10:57:23 -0800 2006-03-30 08:40:29 -0800 Patch 8056_r1.patch text/plain 19787 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEzNTYwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDYtIyMtIyMgIE1pdHogUGV0dGVsICA8b3Bl bmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgLSBUZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTgwNTYKKyAgICAgICAgICBGbGV4aWJsZSBib3hlcyBkbyBu b3QgcmVwYWludCB0aGVpciB0b3AsIGxlZnQgYW5kIGNoaWxkcmVuJ3Mgb3ZlcmZsb3dzCisKKyAg ICAgICAgKiBmYXN0L3JlcGFpbnQvZmxleGlibGUtYm94LW92ZXJmbG93LWV4cGVjdGVkLmNoZWNr c3VtOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlcGFpbnQvZmxleGlibGUtYm94LW92ZXJmbG93 LWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJv eC1vdmVyZmxvdy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcmVwYWludC9m bGV4aWJsZS1ib3gtb3ZlcmZsb3ctaG9yaXpvbnRhbC1leHBlY3RlZC5jaGVja3N1bTogQWRkZWQu CisgICAgICAgICogZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVyZmxvdy1ob3Jpem9udGFs LWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJv eC1vdmVyZmxvdy1ob3Jpem9udGFsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVyZmxvdy1ob3Jpem9udGFsLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3cuaHRtbDogQWRkZWQu CisKIDIwMDYtMDMtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBueXBvcC5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQv ZmxleGlibGUtYm94LW92ZXJmbG93LWV4cGVjdGVkLmNoZWNrc3VtCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3ctZXhwZWN0ZWQuY2hl Y2tzdW0JKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvZmxleGlibGUt Ym94LW92ZXJmbG93LWV4cGVjdGVkLmNoZWNrc3VtCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBA CisyNTVhMTEwNWI1ZGFmYzcyYTNkMWE4ZTYzNmRiZTgxNgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZs b3ctZXhwZWN0ZWQucG5nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFz IGEgYmluYXJ5IHR5cGUuCnN2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0K ClByb3BlcnR5IGNoYW5nZXMgb246IGZsZXhpYmxlLWJveC1vdmVyZmxvdy1leHBlY3RlZC5wbmcK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpOYW1lOiBzdm46bWltZS10eXBlCiAgICsgYXBwbGljYXRpb24vb2N0ZXQtc3Ry ZWFtCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVyZmxv dy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1i b3gtb3ZlcmZsb3cuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvcmVwYWlu dC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3cuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2OCBA QAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2lmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIudGVz dFJlcGFpbnQoKTsKKzwvc2NyaXB0PgorPHN0eWxlPgorZGl2LmZsZXhib3ggeworICBoZWlnaHQ6 IDgwcHg7CisgIHdpZHRoOiA4MHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiB5ZWxsb3c7CisgIGRp c3BsYXk6IC1tb3otYm94OworICBkaXNwbGF5OiAta2h0bWwtYm94OworICBkaXNwbGF5OiBib3g7 CisgIC1tb3otYm94LWFsaWduOiBjZW50ZXI7CisgIC1raHRtbC1ib3gtYWxpZ246IGNlbnRlcjsK KyAgYm94LWFsaWduOiBjZW50ZXI7Cit9CisKK2Rpdi5ob3Jpem9udGFsIHsKKyAgLW1vei1ib3gt b3JpZW50OiBob3Jpem9udGFsOworICAta2h0bWwtYm94LW9yaWVudDogaG9yaXpvbnRhbDsKKyAg Ym94LW9yaWVudDogaG9yaXpvbnRhbDsKK30KKworZGl2LnZlcnRpY2FsIHsKKyAgLW1vei1ib3gt b3JpZW50OiB2ZXJ0aWNhbDsKKyAgLWtodG1sLWJveC1vcmllbnQ6IHZlcnRpY2FsOworICBib3gt b3JpZW50OiB2ZXJ0aWNhbDsKK30KKworZGl2LmJpZ2JveCB7CisgIGhlaWdodDogOThweDsKKyAg d2lkdGg6IDk4cHg7CisgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICBtYXJnaW4tbGVmdDog LTEwcHg7CisgIG1hcmdpbi10b3A6IC0xMHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 PgorPHA+CisgICAgVGhpcyBpcyBhIHRlc3QgZm9yIHJlZ3Jlc3Npb25zIGFnYWluc3QgPGk+PGEg aHJlZj0iaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD04MDU2 Ij5odHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTgwNTY8L2E+ CisgICAgRmxleGlibGUgYm94ZXMgZG8gbm90IHJlcGFpbnQgdGhlaXIgdG9wLCBsZWZ0IGFuZCBj aGlsZHJlbidzIG92ZXJmbG93czwvaT4uCis8L3A+Cis8aHI+Cis8ZGl2IHN0eWxlPSJwYWRkaW5n OjEwcHg7Ij4KKzxkaXYgY2xhc3M9ImZsZXhib3ggaG9yaXpvbnRhbCI+Cis8ZGl2IGNsYXNzPSJi aWdib3giIHN0eWxlPSJ3aGl0ZS1zcGFjZTogcHJlOyI+TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFt ZXQuPC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorPGRpdiBzdHlsZT0icGFkZGluZzoxMHB4OyBtYXJn aW4tdG9wOiAyMHB4OyI+Cis8ZGl2IGNsYXNzPSJmbGV4Ym94IGhvcml6b250YWwiPgorPGRpdiBj bGFzcz0iYmlnYm94Ij48L2Rpdj4KKzwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJwYWRkaW5n OjEwcHg7IG1hcmdpbi10b3A6IDIwcHg7Ij4KKzxkaXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwi PgorPGRpdiBjbGFzcz0iYmlnYm94Ij48L2Rpdj4KKzwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxl PSJwYWRkaW5nOjEwcHg7IG1hcmdpbi10b3A6IDIwcHg7IG1hcmdpbi1ib3R0b206IDQwcHg7Ij4K KzxkaXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwiPgorPGRpdiBjbGFzcz0iYmlnYm94Ij5Mb3Jl bSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dWVyIGFkaXBpc2NpbmcgZWxpdC4gRXRp YW0gZXQgaXBzdW0uIE5hbSBjb25zZWN0ZXR1ZXIgbWkgZWdldCB2ZWxpdC48L2Rpdj4KKzwvZGl2 PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3JlcGFp bnQvZmxleGlibGUtYm94LW92ZXJmbG93LWhvcml6b250YWwtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3ctaG9y aXpvbnRhbC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3Jl cGFpbnQvZmxleGlibGUtYm94LW92ZXJmbG93LWhvcml6b250YWwtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDQyIEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAg UmVuZGVyQ2FudmFzIGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4 MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBS ZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1NTIKKyAgICAgIFJlbmRlckJsb2Nr IHtQfSBhdCAoMCwwKSBzaXplIDc4NHgzNgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAo MCwwKSBzaXplIDIyNngxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDIyNjog IlRoaXMgaXMgYSB0ZXN0IGZvciByZWdyZXNzaW9ucyBhZ2FpbnN0ICIKKyAgICAgICAgUmVuZGVy SW5saW5lIHtJfSBhdCAoMCwwKSBzaXplIDc2MngzNgorICAgICAgICAgIFJlbmRlcklubGluZSB7 QX0gYXQgKDAsMCkgc2l6ZSAzNDh4MTggW2NvbG9yPSMwMDAwRUVdCisgICAgICAgICAgICBSZW5k ZXJUZXh0IHtURVhUfSBhdCAoMjI2LDApIHNpemUgMzQ4eDE4CisgICAgICAgICAgICAgIHRleHQg cnVuIGF0ICgyMjYsMCkgd2lkdGggMzQ4OiAiaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDU2IgorICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICg1 NzQsMCkgc2l6ZSA3NjJ4MzYKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICg1NzQsMCkgd2lkdGgg NDogIiAiCisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoNTc4LDApIHdpZHRoIDE4NDogIkZsZXhp YmxlIGJveGVzIGRvIG5vdCByZXBhaW50IgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgp IHdpZHRoIDIzODogInRoZWlyIHRvcCwgbGVmdCBhbmQgY2hpbGRyZW4ncyBvdmVyZmxvd3MiCisg ICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgyMzgsMTgpIHNpemUgNHgxOAorICAgICAgICAg IHRleHQgcnVuIGF0ICgyMzgsMTgpIHdpZHRoIDQ6ICIuIgorICAgICAgUmVuZGVyQmxvY2sge0hS fSBhdCAoMCw1Mikgc2l6ZSA3ODR4MiBbYm9yZGVyOiAoMXB4IGluc2V0ICMwMDAwMDApXQorICAg ICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsNjIpIHNpemUgNzg0eDEwMAorICAgICAgICBSZW5k ZXJGbGV4aWJsZUJveCB7RElWfSBhdCAoMTAsMTApIHNpemUgODB4ODAgW2JnY29sb3I9I0ZGRkYw MF0KKyAgICAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoLTEwLC0xMCkgc2l6ZSAxMDB4MTAw IFtib3JkZXI6ICgxcHggc29saWQgIzAwMDAwMCldCisgICAgICAgICAgICBSZW5kZXJUZXh0IHtU RVhUfSBhdCAoMSwxKSBzaXplIDE3N3gxOAorICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMSwx KSB3aWR0aCAxNzc6ICJMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldC4iCisgICAgICBSZW5kZXJC bG9jayB7RElWfSBhdCAoMCwxODIpIHNpemUgNzg0eDEwMAorICAgICAgICBSZW5kZXJGbGV4aWJs ZUJveCB7RElWfSBhdCAoMTAsMTApIHNpemUgODB4ODAgW2JnY29sb3I9I0ZGRkYwMF0KKyAgICAg ICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoLTEwLC0xMCkgc2l6ZSAxMDB4MTAwIFtib3JkZXI6 ICgxcHggc29saWQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwzMDIp IHNpemUgNzg0eDEwMAorICAgICAgICBSZW5kZXJGbGV4aWJsZUJveCB7RElWfSBhdCAoMTAsMTAp IHNpemUgODB4ODAgW2JnY29sb3I9I0ZGRkYwMF0KKyAgICAgICAgICBSZW5kZXJCbG9jayB7RElW fSBhdCAoLTEwLC0xMCkgc2l6ZSAxMDB4MTAwIFtib3JkZXI6ICgxcHggc29saWQgIzAwMDAwMCld CisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw0MjIpIHNpemUgNzg0eDEwMAorICAgICAg ICBSZW5kZXJGbGV4aWJsZUJveCB7RElWfSBhdCAoMTAsMTApIHNpemUgODB4ODAgW2JnY29sb3I9 I0ZGRkYwMF0KKyAgICAgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoLTEwLC0xMCkgc2l6ZSAx MDB4MTAwIFtib3JkZXI6ICgxcHggc29saWQgIzAwMDAwMCldCisgICAgICAgICAgICBSZW5kZXJU ZXh0IHtURVhUfSBhdCAoMSwxKSBzaXplIDk4eDE0NAorICAgICAgICAgICAgICB0ZXh0IHJ1biBh dCAoMSwxKSB3aWR0aCA4NDogIkxvcmVtIGlwc3VtIgorICAgICAgICAgICAgICB0ZXh0IHJ1biBh dCAoMSwxOSkgd2lkdGggODk6ICJkb2xvciBzaXQgYW1ldCwiCisgICAgICAgICAgICAgIHRleHQg cnVuIGF0ICgxLDM3KSB3aWR0aCA3ODogImNvbnNlY3RldHVlciIKKyAgICAgICAgICAgICAgdGV4 dCBydW4gYXQgKDEsNTUpIHdpZHRoIDkxOiAiYWRpcGlzY2luZyBlbGl0LiIKKyAgICAgICAgICAg ICAgdGV4dCBydW4gYXQgKDEsNzMpIHdpZHRoIDk4OiAiRXRpYW0gZXQgaXBzdW0uIgorICAgICAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMSw5MSkgd2lkdGggMzE6ICJOYW0iCisgICAgICAgICAgICAg IHRleHQgcnVuIGF0ICgxLDEwOSkgd2lkdGggOTg6ICJjb25zZWN0ZXR1ZXIgbWkiCisgICAgICAg ICAgICAgIHRleHQgcnVuIGF0ICgxLDEyNykgd2lkdGggNjE6ICJlZ2V0IHZlbGl0LiIKSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3ctaG9yaXpvbnRh bC1leHBlY3RlZC5jaGVja3N1bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3JlcGFp bnQvZmxleGlibGUtYm94LW92ZXJmbG93LWhvcml6b250YWwtZXhwZWN0ZWQuY2hlY2tzdW0JKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvZmxleGlibGUtYm94LW92ZXJm bG93LWhvcml6b250YWwtZXhwZWN0ZWQuY2hlY2tzdW0JKHJldmlzaW9uIDApCkBAIC0wLDAgKzEg QEAKKzk2OGFkZjg1MmQxN2JiODY5NDg2NmZiMmEyNTg0MTI4ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVy Zmxvdy1ob3Jpem9udGFsLWV4cGVjdGVkLnBuZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CkNhbm5vdCBkaXNwbGF5OiBm aWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLgpzdm46bWltZS10eXBlID0gYXBwbGljYXRpb24v b2N0ZXQtc3RyZWFtCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBmbGV4aWJsZS1ib3gtb3ZlcmZsb3ct aG9yaXpvbnRhbC1leHBlY3RlZC5wbmcKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46bWltZS10eXBlCiAg ICsgYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9yZXBh aW50L2ZsZXhpYmxlLWJveC1vdmVyZmxvdy1ob3Jpem9udGFsLmh0bWwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVyZmxvdy1ob3Jpem9udGFs Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlcGFpbnQvZmxleGlibGUt Ym94LW92ZXJmbG93LWhvcml6b250YWwuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw3MCBA QAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2lmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci50 ZXN0UmVwYWludCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLnJlcGFpbnRTd2VlcEhvcml6 b250YWxseSgpOworfQorPC9zY3JpcHQ+Cis8c3R5bGU+CitkaXYuZmxleGJveCB7CisgIGhlaWdo dDogODBweDsKKyAgd2lkdGg6IDgwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsKKyAg ZGlzcGxheTogLW1vei1ib3g7CisgIGRpc3BsYXk6IC1raHRtbC1ib3g7CisgIGRpc3BsYXk6IGJv eDsKKyAgLW1vei1ib3gtYWxpZ246IGNlbnRlcjsKKyAgLWtodG1sLWJveC1hbGlnbjogY2VudGVy OworICBib3gtYWxpZ246IGNlbnRlcjsKK30KKworZGl2Lmhvcml6b250YWwgeworICAtbW96LWJv eC1vcmllbnQ6IGhvcml6b250YWw7CisgIC1raHRtbC1ib3gtb3JpZW50OiBob3Jpem9udGFsOwor ICBib3gtb3JpZW50OiBob3Jpem9udGFsOworfQorCitkaXYudmVydGljYWwgeworICAtbW96LWJv eC1vcmllbnQ6IHZlcnRpY2FsOworICAta2h0bWwtYm94LW9yaWVudDogdmVydGljYWw7CisgIGJv eC1vcmllbnQ6IHZlcnRpY2FsOworfQorCitkaXYuYmlnYm94IHsKKyAgaGVpZ2h0OiA5OHB4Owor ICB3aWR0aDogOThweDsKKyAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgIG1hcmdpbi1sZWZ0 OiAtMTBweDsKKyAgbWFyZ2luLXRvcDogLTEwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJv ZHk+Cis8cD4KKyAgICBUaGlzIGlzIGEgdGVzdCBmb3IgcmVncmVzc2lvbnMgYWdhaW5zdCA8aT48 YSBocmVmPSJodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTgw NTYiPmh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA1Njwv YT4KKyAgICBGbGV4aWJsZSBib3hlcyBkbyBub3QgcmVwYWludCB0aGVpciB0b3AsIGxlZnQgYW5k IGNoaWxkcmVuJ3Mgb3ZlcmZsb3dzPC9pPi4KKzwvcD4KKzxocj4KKzxkaXYgc3R5bGU9InBhZGRp bmc6MTBweDsiPgorPGRpdiBjbGFzcz0iZmxleGJveCBob3Jpem9udGFsIj4KKzxkaXYgY2xhc3M9 ImJpZ2JveCIgc3R5bGU9IndoaXRlLXNwYWNlOiBwcmU7Ij5Mb3JlbSBpcHN1bSBkb2xvciBzaXQg YW1ldC48L2Rpdj4KKzwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJwYWRkaW5nOjEwcHg7IG1h cmdpbi10b3A6IDIwcHg7Ij4KKzxkaXYgY2xhc3M9ImZsZXhib3ggaG9yaXpvbnRhbCI+Cis8ZGl2 IGNsYXNzPSJiaWdib3giPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKzxkaXYgc3R5bGU9InBhZGRp bmc6MTBweDsgbWFyZ2luLXRvcDogMjBweDsiPgorPGRpdiBjbGFzcz0iZmxleGJveCB2ZXJ0aWNh bCI+Cis8ZGl2IGNsYXNzPSJiaWdib3giPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKzxkaXYgc3R5 bGU9InBhZGRpbmc6MTBweDsgbWFyZ2luLXRvcDogMjBweDsgbWFyZ2luLWJvdHRvbTogNDBweDsi PgorPGRpdiBjbGFzcz0iZmxleGJveCB2ZXJ0aWNhbCI+Cis8ZGl2IGNsYXNzPSJiaWdib3giPkxv cmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ZXIgYWRpcGlzY2luZyBlbGl0LiBF dGlhbSBldCBpcHN1bS4gTmFtIGNvbnNlY3RldHVlciBtaSBlZ2V0IHZlbGl0LjwvZGl2PgorPC9k aXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcmVw YWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3ctZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvcmVwYWludC9mbGV4aWJsZS1ib3gtb3ZlcmZsb3ctZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9yZXBhaW50L2ZsZXhpYmxlLWJveC1v dmVyZmxvdy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDIgQEAKK2xheWVy IGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJDYW52YXMgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0 ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUg Nzg0eDU1MgorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDApIHNpemUgNzg0eDM2CisgICAg ICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMjI2eDE4CisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMCkgd2lkdGggMjI2OiAiVGhpcyBpcyBhIHRlc3QgZm9yIHJlZ3Jlc3Npb25z IGFnYWluc3QgIgorICAgICAgICBSZW5kZXJJbmxpbmUge0l9IGF0ICgwLDApIHNpemUgNzYyeDM2 CisgICAgICAgICAgUmVuZGVySW5saW5lIHtBfSBhdCAoMCwwKSBzaXplIDM0OHgxOCBbY29sb3I9 IzAwMDBFRV0KKyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgyMjYsMCkgc2l6ZSAz NDh4MTgKKyAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDIyNiwwKSB3aWR0aCAzNDg6ICJodHRw Oi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTgwNTYiCisgICAgICAg ICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDU3NCwwKSBzaXplIDc2MngzNgorICAgICAgICAgICAg dGV4dCBydW4gYXQgKDU3NCwwKSB3aWR0aCA0OiAiICIKKyAgICAgICAgICAgIHRleHQgcnVuIGF0 ICg1NzgsMCkgd2lkdGggMTg0OiAiRmxleGlibGUgYm94ZXMgZG8gbm90IHJlcGFpbnQiCisgICAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxOCkgd2lkdGggMjM4OiAidGhlaXIgdG9wLCBsZWZ0IGFu ZCBjaGlsZHJlbidzIG92ZXJmbG93cyIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDIz OCwxOCkgc2l6ZSA0eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDIzOCwxOCkgd2lkdGggNDog Ii4iCisgICAgICBSZW5kZXJCbG9jayB7SFJ9IGF0ICgwLDUyKSBzaXplIDc4NHgyIFtib3JkZXI6 ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw2Mikg c2l6ZSA3ODR4MTAwCisgICAgICAgIFJlbmRlckZsZXhpYmxlQm94IHtESVZ9IGF0ICgxMCwxMCkg c2l6ZSA4MHg4MCBbYmdjb2xvcj0jRkZGRjAwXQorICAgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9 IGF0ICgtMTAsLTEwKSBzaXplIDEwMHgxMDAgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0K KyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgxLDEpIHNpemUgMTc3eDE4CisgICAg ICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDEpIHdpZHRoIDE3NzogIkxvcmVtIGlwc3VtIGRvbG9y IHNpdCBhbWV0LiIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDE4Mikgc2l6ZSA3ODR4 MTAwCisgICAgICAgIFJlbmRlckZsZXhpYmxlQm94IHtESVZ9IGF0ICgxMCwxMCkgc2l6ZSA4MHg4 MCBbYmdjb2xvcj0jRkZGRjAwXQorICAgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgtMTAs LTEwKSBzaXplIDEwMHgxMDAgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0KKyAgICAgIFJl bmRlckJsb2NrIHtESVZ9IGF0ICgwLDMwMikgc2l6ZSA3ODR4MTAwCisgICAgICAgIFJlbmRlckZs ZXhpYmxlQm94IHtESVZ9IGF0ICgxMCwxMCkgc2l6ZSA4MHg4MCBbYmdjb2xvcj0jRkZGRjAwXQor ICAgICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgtMTAsLTEwKSBzaXplIDEwMHgxMDAgW2Jv cmRlcjogKDFweCBzb2xpZCAjMDAwMDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDQyMikgc2l6ZSA3ODR4MTAwCisgICAgICAgIFJlbmRlckZsZXhpYmxlQm94IHtESVZ9IGF0ICgx MCwxMCkgc2l6ZSA4MHg4MCBbYmdjb2xvcj0jRkZGRjAwXQorICAgICAgICAgIFJlbmRlckJsb2Nr IHtESVZ9IGF0ICgtMTAsLTEwKSBzaXplIDEwMHgxMDAgW2JvcmRlcjogKDFweCBzb2xpZCAjMDAw MDAwKV0KKyAgICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgxLDEpIHNpemUgOTh4MTQ0 CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDEpIHdpZHRoIDg0OiAiTG9yZW0gaXBzdW0i CisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDE5KSB3aWR0aCA4OTogImRvbG9yIHNpdCBh bWV0LCIKKyAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDEsMzcpIHdpZHRoIDc4OiAiY29uc2Vj dGV0dWVyIgorICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMSw1NSkgd2lkdGggOTE6ICJhZGlw aXNjaW5nIGVsaXQuIgorICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMSw3Mykgd2lkdGggOTg6 ICJFdGlhbSBldCBpcHN1bS4iCisgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDkxKSB3aWR0 aCAzMTogIk5hbSIKKyAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDEsMTA5KSB3aWR0aCA5ODog ImNvbnNlY3RldHVlciBtaSIKKyAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDEsMTI3KSB3aWR0 aCA2MTogImVnZXQgdmVsaXQuIgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNTYwKQorKysgV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAwNi0jIy0jIyAgTWl0eiBQZXR0 ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAgICAgICBUZXN0czogZmFz dC9yZXBhaW50L2ZsZXhpYmxlLWJveC1vdmVyZmxvdy5odG1sIGZhc3QvcmVwYWludC9mbGV4aWJs ZS1ib3gtb3ZlcmZsb3ctaG9yaXpvbnRhbC5odG1sCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICAtIGZpeCBodHRwOi8vYnVnemlsbGEub3Bl bmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTgwNTYKKyAgICAgICAgICBGbGV4aWJsZSBib3hl cyBkbyBub3QgcmVwYWludCB0aGVpciB0b3AsIGxlZnQgYW5kIGNoaWxkcmVuJ3Mgb3ZlcmZsb3dz CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGRyZW4pOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGbGV4Qm94SXRlcmF0 b3I6Om5leHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEhv cml6b250YWxCb3gpOiBVcGRhdGUgdG9wIG92ZXJmbG93IHdoZW4KKyAgICAgICAgZGV0ZXJtaW5p bmcgdmVydGljYWwgcG9zaXRpb25zLiBVcGRhdGUgaG9yaXpvbnRhbCBvdmVyZmxvd3MgYWZ0ZXIg aG9yaXpvbnRhbAorICAgICAgICBwb3NpdGlvbnMgYXJlIGRldGVybWluZWQuCisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0VmVydGljYWxCb3gpOiAgVXBkYXRlIGxl ZnQgb3ZlcmZsb3cgd2hlbgorICAgICAgICBkZXRlcm1pbmluZyBob3Jpem9udGFsIHBvc2l0aW9u cy4gVXBkYXRlIHZlcnRpY2FsIG92ZXJmbG93cyBhZnRlciB2ZXJ0aWNhbAorICAgICAgICBwb3Np dGlvbnMgYXJlIGRldGVybWluZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv eDo6YWxsb3dlZENoaWxkRmxleCk6CisKIDIwMDYtMDMtMjkgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBueXBvcC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCShyZXZpc2lvbiAxMzU1NSkKKysrIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NzAsOCArNzAsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIGlmIChjdXJyZW50T3Jk aW5hbCA+IGxhc3RPcmRpbmFsKQogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAg ICAgICAgICAgICAgICAgICAgIGN1cnJlbnQgPSBib3gtPmZpcnN0Q2hpbGQoKTsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICAgICAgY3VycmVudE9yZGluYWwtLTsKICAgICAgICAgICAgICAg ICAgICAgaWYgKGN1cnJlbnRPcmRpbmFsID09IDApCiAgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gMDsKQEAgLTQ5MCw2ICs0ODksNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRIb3Jpem9udGFsCiAKICAgICAgICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIHhQb3MsIGNoaWxk WSk7CiAgICAgICAgICAgICBtX292ZXJmbG93SGVpZ2h0ID0ga01heChtX292ZXJmbG93SGVpZ2h0 LCBjaGlsZFkgKyBjaGlsZC0+b3ZlcmZsb3dIZWlnaHQoZmFsc2UpKTsKKyAgICAgICAgICAgIG1f b3ZlcmZsb3dUb3AgPSBrTWluKG1fb3ZlcmZsb3dUb3AsIGNoaWxkLT55UG9zKCkgKyBjaGlsZC0+ b3ZlcmZsb3dUb3AoZmFsc2UpKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgeFBvcyArPSBj aGlsZC0+d2lkdGgoKSArIGNoaWxkLT5tYXJnaW5SaWdodCgpOwogICAgIApAQCAtNTc1LDkgKzU3 NSw2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWwKIAogICAgIG1f ZmxleGluZ0NoaWxkcmVuID0gZmFsc2U7CiAgICAgCi0gICAgaWYgKHhQb3MgPiBtX292ZXJmbG93 V2lkdGgpCi0gICAgICAgIG1fb3ZlcmZsb3dXaWR0aCA9IHhQb3M7Ci0KICAgICBpZiAocmVtYWlu aW5nU3BhY2UgPiAwICYmICgoc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRSICYmIHN0eWxlKCkt PmJveFBhY2soKSAhPSBCU1RBUlQpIHx8CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KHN0eWxlKCktPmRpcmVjdGlvbigpID09IFJUTCAmJiBzdHlsZSgpLT5ib3hQYWNrKCkgIT0gQkVO RCkpKSB7CiAgICAgICAgIC8vIENoaWxkcmVuIG11c3QgYmUgcmVwb3NpdGlvbmVkLgpAQCAtNjIx LDggKzYxOCw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEhvcml6b250YWwKICAg ICAgICAgICAgICAgICAgICAgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCk7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGVsc2UgeworICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgaWYgKHN0eWxlKCktPmJveFBhY2soKSA9PSBCQ0VOVEVSKQog ICAgICAgICAgICAgICAgIG9mZnNldCArPSByZW1haW5pbmdTcGFjZS8yOwogICAgICAgICAgICAg ZWxzZSAvLyBFTkQgZm9yIExUUiwgU1RBUlQgZm9yIFJUTApAQCAtNjM5LDYgKzYzNSwyMiBAQCB2 b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFsCiAgICAgICAgIH0KICAgICB9 CiAgICAgCisgICAgY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOworICAgIHdoaWxlIChjaGlsZCAm JiBjaGlsZC0+aXNQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgY2hpbGQgPSBpdGVyYXRvci5uZXh0 KCk7CisgICAgfQorICAgIAorICAgIGlmIChjaGlsZCkgeworICAgICAgICBtX292ZXJmbG93TGVm dCA9IGtNaW4oY2hpbGQtPnhQb3MoKSArIGNoaWxkLT5vdmVyZmxvd0xlZnQoZmFsc2UpLCBtX292 ZXJmbG93TGVmdCk7CisKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBsYXN0Q2hpbGQgPSBjaGlsZDsK KyAgICAgICAgd2hpbGUgKChjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkpIHsKKyAgICAgICAgICAg IGlmICghY2hpbGQtPmlzUG9zaXRpb25lZCgpKQorICAgICAgICAgICAgICAgIGxhc3RDaGlsZCA9 IGNoaWxkOworICAgICAgICB9CisgICAgICAgIG1fb3ZlcmZsb3dXaWR0aCA9IGtNYXgobGFzdENo aWxkLT54UG9zKCkgKyBsYXN0Q2hpbGQtPm92ZXJmbG93V2lkdGgoZmFsc2UpLCBtX292ZXJmbG93 V2lkdGgpOworICAgIH0KKyAgICAKICAgICAvLyBTbyB0aGF0IHRoZSBjYWxjSGVpZ2h0IGluIGxh eW91dEJsb2NrKCkga25vd3MgdG8gcmVsYXlvdXQgcG9zaXRpb25lZCBvYmplY3RzIGJlY2F1c2Ug b2YKICAgICAvLyBhIGhlaWdodCBjaGFuZ2UsIHdlIHJldmVydCBvdXIgaGVpZ2h0IGJhY2sgdG8g dGhlIGludHJpbnNpYyBoZWlnaHQgYmVmb3JlIHJldHVybmluZy4KICAgICBpZiAoaGVpZ2h0U3Bl Y2lmaWVkKQpAQCAtODM4LDEwICs4NTAsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRWZXJ0aWNhbEJvCiAgICAgICAgICAgICBtX2hlaWdodCArPSBjaGlsZC0+aGVpZ2h0KCkgKyBj aGlsZC0+bWFyZ2luQm90dG9tKCk7CiAgICAgCiAgICAgICAgICAgICAvLyBTZWUgaWYgdGhpcyBj aGlsZCBoYXMgbWFkZSBvdXIgb3ZlcmZsb3cgbmVlZCB0byBncm93LgotICAgICAgICAgICAgLy8g WFhYZHdoIFdvcmsgd2l0aCBsZWZ0IG92ZXJmbG93IGFzIHdlbGwgYXMgcmlnaHQgb3ZlcmZsb3cu Ci0gICAgICAgICAgICBpbnQgcmlnaHRDaGlsZFBvcyA9IGNoaWxkLT54UG9zKCkgKyBrTWF4KGNo aWxkLT5vdmVyZmxvd1dpZHRoKGZhbHNlKSwgY2hpbGQtPndpZHRoKCkpOwotICAgICAgICAgICAg aWYgKHJpZ2h0Q2hpbGRQb3MgPiBtX292ZXJmbG93V2lkdGgpCi0gICAgICAgICAgICAgICAgbV9v dmVyZmxvd1dpZHRoID0gcmlnaHRDaGlsZFBvczsKKyAgICAgICAgICAgIG1fb3ZlcmZsb3dXaWR0 aCA9IGtNYXgoY2hpbGQtPnhQb3MoKSArIGNoaWxkLT5vdmVyZmxvd1dpZHRoKGZhbHNlKSwgbV9v dmVyZmxvd1dpZHRoKTsKKyAgICAgICAgICAgIG1fb3ZlcmZsb3dMZWZ0ID0ga01pbihjaGlsZC0+ eFBvcygpICsgY2hpbGQtPm92ZXJmbG93TGVmdChmYWxzZSksIG1fb3ZlcmZsb3dMZWZ0KTsKICAg ICAgICAgICAgIAogICAgICAgICAgICAgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCk7CiAgICAgICAg IH0KQEAgLTk4MSw4ICs5OTEsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0 aWNhbEJvCiAgICAgICAgICAgICAgICAgICAgIGNoaWxkID0gaXRlcmF0b3IubmV4dCgpOwogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICBlbHNlIHsK KyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChzdHlsZSgpLT5ib3hQYWNrKCkgPT0g QkNFTlRFUikKICAgICAgICAgICAgICAgICBvZmZzZXQgKz0gcmVtYWluaW5nU3BhY2UvMjsKICAg ICAgICAgICAgIGVsc2UgLy8gRU5ECkBAIC05OTksNiArMTAwOCwyMiBAQCB2b2lkIFJlbmRlckZs ZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJvCiAgICAgICAgIH0KICAgICB9CiAgICAgCisgICAg Y2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOworICAgIHdoaWxlIChjaGlsZCAmJiBjaGlsZC0+aXNQ b3NpdGlvbmVkKCkpIHsKKyAgICAgICAgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCk7CisgICAgfQor ICAgIAorICAgIGlmIChjaGlsZCkgeworICAgICAgICBtX292ZXJmbG93VG9wID0ga01pbihjaGls ZC0+eVBvcygpICsgY2hpbGQtPm92ZXJmbG93VG9wKGZhbHNlKSwgbV9vdmVyZmxvd1RvcCk7CisK KyAgICAgICAgUmVuZGVyT2JqZWN0KiBsYXN0Q2hpbGQgPSBjaGlsZDsKKyAgICAgICAgd2hpbGUg KChjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkpIHsKKyAgICAgICAgICAgIGlmICghY2hpbGQtPmlz UG9zaXRpb25lZCgpKQorICAgICAgICAgICAgICAgIGxhc3RDaGlsZCA9IGNoaWxkOworICAgICAg ICB9CisgICAgICAgIG1fb3ZlcmZsb3dIZWlnaHQgPSBrTWF4KGxhc3RDaGlsZC0+eVBvcygpICsg bGFzdENoaWxkLT5vdmVyZmxvd0hlaWdodChmYWxzZSksIG1fb3ZlcmZsb3dIZWlnaHQpOworICAg IH0KKwogICAgIC8vIFNvIHRoYXQgdGhlIGNhbGNIZWlnaHQgaW4gbGF5b3V0QmxvY2soKSBrbm93 cyB0byByZWxheW91dCBwb3NpdGlvbmVkIG9iamVjdHMgYmVjYXVzZSBvZgogICAgIC8vIGEgaGVp Z2h0IGNoYW5nZSwgd2UgcmV2ZXJ0IG91ciBoZWlnaHQgYmFjayB0byB0aGUgaW50cmluc2ljIGhl aWdodCBiZWZvcmUgcmV0dXJuaW5nLgogICAgIGlmIChoZWlnaHRTcGVjaWZpZWQpCkBAIC0xMDQw LDggKzEwNjUsNyBAQCBpbnQgUmVuZGVyRmxleGlibGVCb3g6OmFsbG93ZWRDaGlsZEZsZXgoCiAg ICAgICAgICAgICBpZiAobWF4VyA9PSBJTlRfTUFYKQogICAgICAgICAgICAgICAgIHJldHVybiBt YXhXOwogICAgICAgICAgICAgcmV0dXJuIGtNYXgoMCwgbWF4VyAtIHcpOwotICAgICAgICB9Ci0g ICAgICAgIGVsc2UgeworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gRklYTUU6IEZv ciBub3cganVzdCBoYW5kbGUgZml4ZWQgdmFsdWVzLgogICAgICAgICAgICAgaW50IG1heEggPSBJ TlRfTUFYOwogICAgICAgICAgICAgaW50IGggPSBjaGlsZC0+b3ZlcnJpZGVIZWlnaHQoKSAtIChj aGlsZC0+Ym9yZGVyVG9wKCkgKyBjaGlsZC0+Ym9yZGVyQm90dG9tKCkgKyBjaGlsZC0+cGFkZGlu Z1RvcCgpICsgY2hpbGQtPnBhZGRpbmdCb3R0b20oKSk7CkBAIC0xMDY3LDggKzEwOTEsNyBAQCBp bnQgUmVuZGVyRmxleGlibGVCb3g6OmFsbG93ZWRDaGlsZEZsZXgoCiAgICAgICAgICAgICAKICAg ICAgICAgaW50IGFsbG93ZWRTaHJpbmthZ2UgPSBrTWluKDAsIG1pblcgLSB3KTsKICAgICAgICAg cmV0dXJuIGFsbG93ZWRTaHJpbmthZ2U7Ci0gICAgfQotICAgIGVsc2UgeworICAgIH0gZWxzZSB7 CiAgICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+bWluSGVpZ2h0KCkuaXNGaXhlZCgpKSB7CiAg ICAgICAgICAgICBpbnQgbWluSCA9IGNoaWxkLT5zdHlsZSgpLT5taW5IZWlnaHQoKS52YWx1ZSgp OwogICAgICAgICAgICAgaW50IGggPSBjaGlsZC0+Y29udGVudEhlaWdodCgpOwpJbmRleDogV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMTM1NTUpCisrKyBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMDIsOCArMTEwMiw3IEBA IHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGRyZW4oYm8KICAgICAgICAgYWRkT3Zl cmhhbmdpbmdGbG9hdHMoc3RhdGljX2Nhc3Q8UmVuZGVyQmxvY2sgKj4oY2hpbGQpLCAtY2hpbGQt PnhQb3MoKSwgLWNoaWxkLT55UG9zKCkpOwogCiAgICAgICAgIC8vIFNlZSBpZiB0aGlzIGNoaWxk IGhhcyBtYWRlIG91ciBvdmVyZmxvdyBuZWVkIHRvIGdyb3cuCi0gICAgICAgIGludCByaWdodENo aWxkUG9zID0gY2hpbGQtPnhQb3MoKSArIGtNYXgoY2hpbGQtPm92ZXJmbG93V2lkdGgoZmFsc2Up LCBjaGlsZC0+d2lkdGgoKSk7Ci0gICAgICAgIG1fb3ZlcmZsb3dXaWR0aCA9IGtNYXgocmlnaHRD aGlsZFBvcywgbV9vdmVyZmxvd1dpZHRoKTsKKyAgICAgICAgbV9vdmVyZmxvd1dpZHRoID0ga01h eChjaGlsZC0+eFBvcygpICsgY2hpbGQtPm92ZXJmbG93V2lkdGgoZmFsc2UpLCBtX292ZXJmbG93 V2lkdGgpOwogICAgICAgICBtX292ZXJmbG93TGVmdCA9IGtNaW4oY2hpbGQtPnhQb3MoKSArIGNo aWxkLT5vdmVyZmxvd0xlZnQoZmFsc2UpLCBtX292ZXJmbG93TGVmdCk7CiAgICAgICAgIAogICAg ICAgICAvLyBJbnNlcnQgb3VyIGNvbXBhY3QgaW50byB0aGUgYmxvY2sgbWFyZ2luIGlmIHdlIGhh dmUgb25lLgo=