36387 2010-03-19 13:48:49 -0700 REGRESSION: Can "uncheck" radio buttons by clicking on them 2010-03-19 16:42:44 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dglazkov oldest_to_newest 202022 0 simon.fraser 2010-03-19 13:48:49 -0700 http://trac.webkit.org/changeset/56174/ broke radio buttons. You can now uncheck the only checked radio button by clicking on it. 202078 1 51200 simon.fraser 2010-03-19 16:10:40 -0700 Created attachment 51200 Patch 202079 2 51200 dglazkov 2010-03-19 16:16:46 -0700 Comment on attachment 51200 Patch r=me with nits: > + if (window.layoutTestController) > + layoutTestController.dumpAsText(); > + > + function dispatchEvent(target, eventType, offsetX, offsetY) > + { two-space indent? :) > +</body> > +</html> > \ No newline at end of file add extra line break. > // As a way to store the state, we return 0 if we were unchecked, 1 if we were checked, and 2 for > // indeterminate. remove that comment.  202098 3 simon.fraser 2010-03-19 16:42:44 -0700 http://trac.webkit.org/changeset/56284 51200 2010-03-19 16:10:40 -0700 2010-03-19 16:16:46 -0700 Patch bug-36387-20100319161039.patch text/plain 12930 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MjBhMjc4Li5hZjE1ZDM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2Mzg3CisgICAgICAgIFJFR1JFU1NJT046IENhbiAidW5jaGVj ayIgcmFkaW8gYnV0dG9ucyBieSBjbGlja2luZyBvbiB0aGVtCisgICAgICAgIAorICAgICAgICBU ZXN0Y2FzZSBmb3IgdmFyaW91cyBjb21iaW5hdGlvbnMgb2YgY2hlY2tlZC9pbnRlcm1pYXRlIGFu ZCBjbGljayBldmVudHMuCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3JhZGlvLWNoZWNrYm94LXJl c3RvcmUtaW5kZXRlcm1pbmF0ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv Zm9ybXMvcmFkaW8tY2hlY2tib3gtcmVzdG9yZS1pbmRldGVybWluYXRlLmh0bWw6IEFkZGVkLgor CiAyMDEwLTAzLTE5ICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgS2lsemVyLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9yYWRpby1jaGVja2JveC1yZXN0b3JlLWluZGV0ZXJtaW5hdGUtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYWRpby1jaGVja2JveC1yZXN0b3JlLWluZGV0 ZXJtaW5hdGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmM5Y2EyOGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhZGlv LWNoZWNrYm94LXJlc3RvcmUtaW5kZXRlcm1pbmF0ZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx NyBAQAorQSAgQgorSW50ZXJtZWRpYXRlIEEgIEludGVybWVkaWF0ZSBCCitDICBECitDbGljayBk aWQgbm90IHVuc2VsZWN0IGFsbCByYWRpbyBidXR0b25zOiBQQVNTCisKK0NoZWNraW5nIHdoZXRo ZXIgZGVmYXVsdC1wcmV2ZW50ZWQgY2xpY2sgY2xvYmJlcmVkIGluZGV0ZXJtaW5hdGUgc3RhdGU6 CitPbiBjaGVja2VkIHJhZGlvIGJ1dHRvbjogUEFTUworT24gdW5jaGVja2VkIHJhZGlvIGJ1dHRv bjogUEFTUworT24gY2hlY2tlZCBjaGVja2JveDogUEFTUworT24gdW5jaGVja2VkIGNoZWNrYm94 OiBQQVNTCisKK0NoZWNraW5nIHdoZXRoZXIgZGVmYXVsdC1wcmV2ZW50ZWQgY2xpY2sgY2xvYmJl cmVkIGNoZWNrZWQgc3RhdGU6CitPbiBjaGVja2VkIHJhZGlvIGJ1dHRvbjogUEFTUworT24gdW5j aGVja2VkIHJhZGlvIGJ1dHRvbjogUEFTUworT24gY2hlY2tlZCBjaGVja2JveDogUEFTUworT24g dW5jaGVja2VkIGNoZWNrYm94OiBQQVNTCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvcmFkaW8tY2hlY2tib3gtcmVzdG9yZS1pbmRldGVybWluYXRlLmh0bWwgYi9MYXlvdXRU ZXN0cy9mYXN0L2Zvcm1zL3JhZGlvLWNoZWNrYm94LXJlc3RvcmUtaW5kZXRlcm1pbmF0ZS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQzODc3YTQKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhZGlvLWNoZWNrYm94LXJlc3RvcmUtaW5k ZXRlcm1pbmF0ZS5odG1sCkBAIC0wLDAgKzEsMTA1IEBACis8aHRtbD4KKzxoZWFkPgorCis8c2Ny aXB0PgorICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICBmdW5jdGlvbiBkaXNwYXRjaEV2ZW50 KHRhcmdldCwgZXZlbnRUeXBlLCBvZmZzZXRYLCBvZmZzZXRZKQorICAgIHsKKyAgICAgIHZhciB0 YXJnZXRSZWN0ID0gdGFyZ2V0LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgdmFyIGV2 ID0gZG9jdW1lbnQuY3JlYXRlRXZlbnQoIk1vdXNlRXZlbnQiKTsKKyAgICAgIGV2LmluaXRNb3Vz ZUV2ZW50KGV2ZW50VHlwZSwgdHJ1ZSwgdHJ1ZSwgd2luZG93LCAxLCAxLCAxLCB0YXJnZXRSZWN0 LmxlZnQgKyBvZmZzZXRYLCB0YXJnZXRSZWN0LnRvcCArIG9mZnNldFksIGZhbHNlLCBmYWxzZSwg ZmFsc2UsIGZhbHNlLCAwLCBkb2N1bWVudCk7CisgICAgICB0YXJnZXQuZGlzcGF0Y2hFdmVudChl dik7CisgICAgfQorCisgICAgZnVuY3Rpb24gbG9nKHMpCisgICAgeworICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVySFRNTCArPSBzICsgJzxicj4nOworICAgIH0K KworICAgIGZ1bmN0aW9uIGRlZmF1bHRQcmV2ZW50aW5nSGFuZGxlcihlKSB7CisgICAgICBlLnBy ZXZlbnREZWZhdWx0KCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVzdHMoKQorICAgIHsK KyAgICAgIHZhciByYWRpbzEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmFkaW8xIik7Cisg ICAgICB2YXIgcmFkaW8yID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJhZGlvMiIpOworCisg ICAgICB2YXIgcmFkaW8zID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJhZGlvMyIpOworICAg ICAgdmFyIHJhZGlvNCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyYWRpbzQiKTsKKworICAg ICAgdmFyIGNoZWNrMSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjaGVjazEiKTsKKyAgICAg IHZhciBjaGVjazIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2hlY2syIik7CisKKyAgICAg IHJhZGlvMS5jaGVja2VkID0gdHJ1ZTsKKworICAgICAgcmFkaW8zLmNoZWNrZWQgPSB0cnVlOwor ICAgICAgcmFkaW8zLmluZGV0ZXJtaW5hdGUgPSB0cnVlOworICAgICAgcmFkaW80LmluZGV0ZXJt aW5hdGUgPSB0cnVlOworCisgICAgICBjaGVjazEuY2hlY2tlZCA9IHRydWU7CisgICAgICBjaGVj azEuaW5kZXRlcm1pbmF0ZSA9IHRydWU7CisKKyAgICAgIGNoZWNrMi5jaGVja2VkID0gZmFsc2U7 CisgICAgICBjaGVjazIuaW5kZXRlcm1pbmF0ZSA9IHRydWU7CisKKyAgICAgIHJhZGlvMy5hZGRF dmVudExpc3RlbmVyKCdjbGljaycsIGRlZmF1bHRQcmV2ZW50aW5nSGFuZGxlciwgZmFsc2UpOwor ICAgICAgcmFkaW80LmFkZEV2ZW50TGlzdGVuZXIoJ2NsaWNrJywgZGVmYXVsdFByZXZlbnRpbmdI YW5kbGVyLCBmYWxzZSk7CisgICAgICBjaGVjazEuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2snLCBk ZWZhdWx0UHJldmVudGluZ0hhbmRsZXIsIGZhbHNlKTsKKyAgICAgIGNoZWNrMi5hZGRFdmVudExp c3RlbmVyKCdjbGljaycsIGRlZmF1bHRQcmV2ZW50aW5nSGFuZGxlciwgZmFsc2UpOworCisgICAg ICAvLyBDbGlja2luZyBzZWxlY3RlZCByYWRpbyBzaG91bGQgbm90IHVuc2VsZWN0IHRoZW0gYm90 aAorICAgICAgZGlzcGF0Y2hFdmVudChyYWRpbzEsICJjbGljayIsIDIsIDIpOworCisgICAgICAv LyBEZWZhdWx0LXByZXZlbnRlZCBjbGljayBzaG91bGQgbm90IGNoYW5nZSBjaGVja2VkIG9yIGlu dGVybWVkaWF0ZSBzdGF0ZQorICAgICAgZGlzcGF0Y2hFdmVudChyYWRpbzMsICJjbGljayIsIDIs IDIpOworICAgICAgZGlzcGF0Y2hFdmVudChyYWRpbzQsICJjbGljayIsIDIsIDIpOworCisgICAg ICAvLyBEZWZhdWx0LXByZXZlbnRlZCBjbGljayBzaG91bGQgbm90IGNoYW5nZSBjaGVja2VkIG9y IGludGVybWVkaWF0ZSBzdGF0ZQorICAgICAgZGlzcGF0Y2hFdmVudChjaGVjazEsICJjbGljayIs IDIsIDIpOworICAgICAgZGlzcGF0Y2hFdmVudChjaGVjazIsICJjbGljayIsIDIsIDIpOworICAg ICAgCisgICAgICBpZiAocmFkaW8xLmNoZWNrZWQpCisgICAgICAgIGxvZygnQ2xpY2sgZGlkIG5v dCB1bnNlbGVjdCBhbGwgcmFkaW8gYnV0dG9uczogUEFTUycpOworICAgICAgZWxzZQorICAgICAg ICBsb2coJ0NsaWNrIHVuc2VsZWN0ZWQgYWxsIHJhZGlvIGJ1dHRvbnM6IEZBSUwnKTsKKworICAg ICAgbG9nKCc8YnI+Q2hlY2tpbmcgd2hldGhlciBkZWZhdWx0LXByZXZlbnRlZCBjbGljayBjbG9i YmVyZWQgaW5kZXRlcm1pbmF0ZSBzdGF0ZTonKQorICAgICAgbG9nKCdPbiBjaGVja2VkIHJhZGlv IGJ1dHRvbjogJyArIChyYWRpbzMuaW5kZXRlcm1pbmF0ZSA/ICdQQVNTJyA6ICdGQUlMJykpOwor ICAgICAgbG9nKCdPbiB1bmNoZWNrZWQgcmFkaW8gYnV0dG9uOiAnICsgKHJhZGlvNC5pbmRldGVy bWluYXRlID8gJ1BBU1MnIDogJ0ZBSUwnKSk7CisgICAgICBsb2coJ09uIGNoZWNrZWQgY2hlY2ti b3g6ICcgKyAoY2hlY2sxLmluZGV0ZXJtaW5hdGUgPyAnUEFTUycgOiAnRkFJTCcpKTsKKyAgICAg IGxvZygnT24gdW5jaGVja2VkIGNoZWNrYm94OiAnICsgKGNoZWNrMi5pbmRldGVybWluYXRlID8g J1BBU1MnIDogJ0ZBSUwnKSk7CisKKyAgICAgIGxvZygnPGJyPkNoZWNraW5nIHdoZXRoZXIgZGVm YXVsdC1wcmV2ZW50ZWQgY2xpY2sgY2xvYmJlcmVkIGNoZWNrZWQgc3RhdGU6JykKKyAgICAgIGxv ZygnT24gY2hlY2tlZCByYWRpbyBidXR0b246ICcgKyAocmFkaW8zLmNoZWNrZWQgPyAnUEFTUycg OiAnRkFJTCcpKTsKKyAgICAgIGxvZygnT24gdW5jaGVja2VkIHJhZGlvIGJ1dHRvbjogJyArICgh cmFkaW80LmNoZWNrZWQgPyAnUEFTUycgOiAnRkFJTCcpKTsKKyAgICAgIGxvZygnT24gY2hlY2tl ZCBjaGVja2JveDogJyArIChjaGVjazEuY2hlY2tlZCA/ICdQQVNTJyA6ICdGQUlMJykpOworICAg ICAgbG9nKCdPbiB1bmNoZWNrZWQgY2hlY2tib3g6ICcgKyAoIWNoZWNrMi5jaGVja2VkID8gJ1BB U1MnIDogJ0ZBSUwnKSk7CisKKyAgICB9Cis8L3NjcmlwdD4KKworPC9oZWFkPgorCis8Ym9keSBv bmxvYWQ9InJ1blRlc3RzKCkiPgorCisgICAgPGZvcm0+CisgICAgICA8aW5wdXQgdHlwZT0icmFk aW8iIG5hbWU9InRlc3QiIGlkPSJyYWRpbzEiIHZhbHVlPSJhIj5BCisgICAgICA8aW5wdXQgdHlw ZT0icmFkaW8iIG5hbWU9InRlc3QiIGlkPSJyYWRpbzIiIHZhbHVlPSJiIj5CCisgICAgPC9mb3Jt PgorCisgICAgPGZvcm0+CisgICAgICA8aW5wdXQgdHlwZT0icmFkaW8iIG5hbWU9InRlc3QyIiBp ZD0icmFkaW8zIiB2YWx1ZT0iYSI+SW50ZXJtZWRpYXRlIEEKKyAgICAgIDxpbnB1dCB0eXBlPSJy YWRpbyIgbmFtZT0idGVzdDIiIGlkPSJyYWRpbzQiIHZhbHVlPSJiIj5JbnRlcm1lZGlhdGUgQgor ICAgIDwvZm9ybT4KKworICAgIDxmb3JtPgorICAgICAgPGlucHV0IHR5cGU9ImNoZWNrYm94IiBu YW1lPSJjaGVjazEiIGlkPSJjaGVjazEiIHZhbHVlPSJhIj5DCisgICAgICA8aW5wdXQgdHlwZT0i Y2hlY2tib3giIG5hbWU9ImNoZWNrMiIgaWQ9ImNoZWNrMiIgdmFsdWU9ImIiPkQKKyAgICA8L2Zv cm0+CisKKyAgICA8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThhZTdiMy4uOWNkYTIyYyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxMC0wMy0xOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYzODcKKyAgICAgICAgUkVHUkVTU0lPTjogQ2Fu ICJ1bmNoZWNrIiByYWRpbyBidXR0b25zIGJ5IGNsaWNraW5nIG9uIHRoZW0KKyAgICAgICAgCisg ICAgICAgIE15IGNoYW5nZSBpbiByNTYxNzQgY2F1c2VkIHJhZGlvIGJ1dHRvbnMgYW5kIGNoZWNr Ym94ZXMgdG8gZ28gZG93biB0aGUgc2FtZSBjb2RlIHBhdGggYnkgdmlydHVlCisgICAgICAgIG9m IGFsbG93c0luZGV0ZXJtaW5hdGUoKSwgYnV0IHRoaXMgYnJva2Ugc2F2ZS9yZXN0b3JlIGJlaGF2 aW9yIG9uIHJhZGlvIGJ1dHRvbnMuCisgICAgICAgIAorICAgICAgICBGaXggYnkgc2F2aW5nIGFu ZCByZXN0b3JpbmcgYm90aCB0aGUgaW50ZXJtZWRpYXRlIGFuZCBjaGVja2VkIHN0YXRlIGZvciBy YWRpbyBidXR0b25zCisgICAgICAgIGFuZCBjaGVja2JveGVzLCBhcyB3ZWxsIGFzIHRoZSAiY3Vy cmVudCByYWRpbyBidXR0b24iIHN0YXRlLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZm9ybXMvcmFk aW8tY2hlY2tib3gtcmVzdG9yZS1pbmRldGVybWluYXRlLmh0bWwKKworICAgICAgICAqIGh0bWwv SFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsaW5nU3Rh dGU6OkV2ZW50SGFuZGxpbmdTdGF0ZSk6IE5ldyBzdHJ1Y3QgdG8gaG9sZCBzdGF0ZSBiZXR3ZWVu IHByZURpc3BhdGNoRXZlbnRIYW5kbGVyKCkKKyAgICAgICAgYW5kIHBvc3REaXNwYXRjaEV2ZW50 SGFuZGxlcigpLgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6cHJlRGlzcGF0 Y2hFdmVudEhhbmRsZXIpOiBTdG9yZSBpbnRlcm1lZGF0ZSBhbmQgY2hlY2tlZCBzdGF0ZQorICAg ICAgICBhbmQgdGhlIGN1cnJlbnQgcmFkaW8gYnV0dG9uLgorICAgICAgICAoV2ViQ29yZTo6SFRN TElucHV0RWxlbWVudDo6cG9zdERpc3BhdGNoRXZlbnRIYW5kbGVyKTogUmVzdG9yZSBzdGF0ZSBh cyBhcHByb3ByaWF0ZS4KKyAgICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQuaDogQWRkIGEg Y29tbWVudCB0byBjbGFyaWZ5IGhvdyAnaW50ZXJtZWRpYXRlJyBpbnRlcmFjdHMgd2l0aCAnY2hl Y2tlZCcsIGFjY29yZGluZworICAgICAgICB0byB0aGUgc3BlYy4KKwogMjAxMC0wMy0xOSAgTGFz emxvIEdvbWJvcyAgPGxhc3psby4xLmdvbWJvc0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTElucHV0 RWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKaW5kZXggZmY5 NzVkNC4uODYxM2JlZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApAQCAtMTk4Nyw2ICsx OTg3LDE2IEBAIGJvb2wgSFRNTElucHV0RWxlbWVudDo6c3RvcmVzVmFsdWVTZXBhcmF0ZUZyb21B dHRyaWJ1dGUoKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RydWN0IEV2ZW50SGFu ZGxpbmdTdGF0ZSB7CisgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IG1fY3VyclJhZGlvOwor ICAgIGJvb2wgbV9pbmRldGVybWluYXRlOworICAgIGJvb2wgbV9jaGVja2VkOworICAgIAorICAg IEV2ZW50SGFuZGxpbmdTdGF0ZShib29sIGluZGV0ZXJtaW5hdGUsIGJvb2wgY2hlY2tlZCkKKyAg ICAgICAgOiBtX2luZGV0ZXJtaW5hdGUoaW5kZXRlcm1pbmF0ZSkKKyAgICAgICAgLCBtX2NoZWNr ZWQoY2hlY2tlZCkgeyB9Cit9OworCiB2b2lkKiBIVE1MSW5wdXRFbGVtZW50OjpwcmVEaXNwYXRj aEV2ZW50SGFuZGxlcihFdmVudCAqZXZ0KQogewogICAgIC8vIHByZXZlbnREZWZhdWx0IG9yICJy ZXR1cm4gZmFsc2UiIGFyZSB1c2VkIHRvIHJldmVyc2UgdGhlIGF1dG9tYXRpYyBjaGVja2luZy9z ZWxlY3Rpb24gd2UgZG8gaGVyZS4KQEAgLTE5OTQsMTcgKzIwMDQsMTYgQEAgdm9pZCogSFRNTElu cHV0RWxlbWVudDo6cHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZlbnQgKmV2dCkKICAgICB2b2lk KiByZXN1bHQgPSAwOyAKICAgICBpZiAoKGlucHV0VHlwZSgpID09IENIRUNLQk9YIHx8IGlucHV0 VHlwZSgpID09IFJBRElPKSAmJiBldnQtPmlzTW91c2VFdmVudCgpCiAgICAgICAgICAgICAmJiBl dnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCAmJiBzdGF0aWNfY2FzdDxNb3Vz ZUV2ZW50Kj4oZXZ0KS0+YnV0dG9uKCkgPT0gTGVmdEJ1dHRvbikgewotICAgICAgICBpZiAoYWxs b3dzSW5kZXRlcm1pbmF0ZSgpKSB7CisgICAgICAgIAorICAgICAgICBFdmVudEhhbmRsaW5nU3Rh dGUqIHN0YXRlID0gbmV3IEV2ZW50SGFuZGxpbmdTdGF0ZShpbmRldGVybWluYXRlKCksIGNoZWNr ZWQoKSk7CisKKyAgICAgICAgaWYgKGlucHV0VHlwZSgpID09IENIRUNLQk9YKSB7CiAgICAgICAg ICAgICAvLyBBcyBhIHdheSB0byBzdG9yZSB0aGUgc3RhdGUsIHdlIHJldHVybiAwIGlmIHdlIHdl cmUgdW5jaGVja2VkLCAxIGlmIHdlIHdlcmUgY2hlY2tlZCwgYW5kIDIgZm9yCiAgICAgICAgICAg ICAvLyBpbmRldGVybWluYXRlLgotICAgICAgICAgICAgaWYgKGluZGV0ZXJtaW5hdGUoKSkgewot ICAgICAgICAgICAgICAgIHJlc3VsdCA9ICh2b2lkKikweDI7CisgICAgICAgICAgICBpZiAoaW5k ZXRlcm1pbmF0ZSgpKQogICAgICAgICAgICAgICAgIHNldEluZGV0ZXJtaW5hdGUoZmFsc2UpOwot ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpZiAoY2hlY2tlZCgpKQotICAg ICAgICAgICAgICAgICAgICByZXN1bHQgPSAodm9pZCopMHgxOworICAgICAgICAgICAgZWxzZQog ICAgICAgICAgICAgICAgIHNldENoZWNrZWQoIWNoZWNrZWQoKSwgdHJ1ZSk7Ci0gICAgICAgICAg ICB9CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBGb3IgcmFkaW8gYnV0dG9ucywg c3RvcmUgdGhlIGN1cnJlbnQgc2VsZWN0ZWQgcmFkaW8gb2JqZWN0LgogICAgICAgICAgICAgLy8g V2UgcmVhbGx5IHdhbnQgcmFkaW8gZ3JvdXBzIHRvIGVuZCB1cCBpbiBzYW5lIHN0YXRlcywgaS5l LiwgdG8gaGF2ZSBzb21ldGhpbmcgY2hlY2tlZC4KQEAgLTIwMTQsMTEgKzIwMjMsMTMgQEAgdm9p ZCogSFRNTElucHV0RWxlbWVudDo6cHJlRGlzcGF0Y2hFdmVudEhhbmRsZXIoRXZlbnQgKmV2dCkK ICAgICAgICAgICAgIGlmIChjdXJyUmFkaW8pIHsKICAgICAgICAgICAgICAgICAvLyBXZSBoYXZl IGEgcmFkaW8gYnV0dG9uIHNlbGVjdGVkIHRoYXQgaXMgbm90IHVzLiAgQ2FjaGUgaXQgaW4gb3Vy IHJlc3VsdCBmaWVsZCBhbmQgcmVmIGl0IHNvCiAgICAgICAgICAgICAgICAgLy8gdGhhdCBpdCBj YW4ndCBiZSBkZXN0cm95ZWQuCi0gICAgICAgICAgICAgICAgY3VyclJhZGlvLT5yZWYoKTsKLSAg ICAgICAgICAgICAgICByZXN1bHQgPSBjdXJyUmFkaW87CisgICAgICAgICAgICAgICAgc3RhdGUt Pm1fY3VyclJhZGlvID0gY3VyclJhZGlvOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYg KGluZGV0ZXJtaW5hdGUoKSkKKyAgICAgICAgICAgICAgICBzZXRJbmRldGVybWluYXRlKGZhbHNl KTsKICAgICAgICAgICAgIHNldENoZWNrZWQodHJ1ZSwgdHJ1ZSk7CiAgICAgICAgIH0KKyAgICAg ICAgcmVzdWx0ID0gc3RhdGU7CiAgICAgfQogICAgIHJldHVybiByZXN1bHQ7CiB9CkBAIC0yMDI3 LDI4ICsyMDM4LDMwIEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6cG9zdERpc3BhdGNoRXZlbnRI YW5kbGVyKEV2ZW50ICpldnQsIHZvaWQqIGRhdGEpCiB7CiAgICAgaWYgKChpbnB1dFR5cGUoKSA9 PSBDSEVDS0JPWCB8fCBpbnB1dFR5cGUoKSA9PSBSQURJTykgJiYgZXZ0LT5pc01vdXNlRXZlbnQo KQogICAgICAgICAgICAgJiYgZXZ0LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmNsaWNrRXZlbnQg JiYgc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2dCktPmJ1dHRvbigpID09IExlZnRCdXR0b24p IHsKLSAgICAgICAgaWYgKGFsbG93c0luZGV0ZXJtaW5hdGUoKSkgewotICAgICAgICAgICAgLy8g UmV2ZXJzZSB0aGUgY2hlY2tpbmcgd2UgZGlkIGluIHByZURpc3BhdGNoLgotICAgICAgICAgICAg aWYgKGV2dC0+ZGVmYXVsdFByZXZlbnRlZCgpIHx8IGV2dC0+ZGVmYXVsdEhhbmRsZWQoKSkgewot ICAgICAgICAgICAgICAgIGlmIChkYXRhID09ICh2b2lkKikweDIpCi0gICAgICAgICAgICAgICAg ICAgIHNldEluZGV0ZXJtaW5hdGUodHJ1ZSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBzZXRDaGVja2VkKGRhdGEpOwotICAgICAgICAgICAgfQotICAgICAgICB9 IGVsc2UgaWYgKGRhdGEpIHsKLSAgICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0ID0g c3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGRhdGEpOwotICAgICAgICAgICAgaWYgKGV2 dC0+ZGVmYXVsdFByZXZlbnRlZCgpIHx8IGV2dC0+ZGVmYXVsdEhhbmRsZWQoKSkgewotICAgICAg ICAgICAgICAgIC8vIFJlc3RvcmUgdGhlIG9yaWdpbmFsIHNlbGVjdGVkIHJhZGlvIGJ1dHRvbiBp ZiBwb3NzaWJsZS4KLSAgICAgICAgICAgICAgICAvLyBNYWtlIHN1cmUgaXQgaXMgc3RpbGwgYSBy YWRpbyBidXR0b24gYW5kIG9ubHkgZG8gdGhlIHJlc3RvcmF0aW9uIGlmIGl0IHN0aWxsCi0gICAg ICAgICAgICAgICAgLy8gYmVsb25ncyB0byBvdXIgZ3JvdXAuCi0KLSAgICAgICAgICAgICAgICBp ZiAoaW5wdXQtPmZvcm0oKSA9PSBmb3JtKCkgJiYgaW5wdXQtPmlucHV0VHlwZSgpID09IFJBRElP ICYmIGlucHV0LT5uYW1lKCkgPT0gbmFtZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIE9r LCB0aGUgb2xkIHJhZGlvIGJ1dHRvbiBpcyBzdGlsbCBpbiBvdXIgZm9ybSBhbmQgaW4gb3VyIGdy b3VwIGFuZCBpcyBzdGlsbCBhIAotICAgICAgICAgICAgICAgICAgICAvLyByYWRpbyBidXR0b24s IHNvIGl0J3Mgc2FmZSB0byByZXN0b3JlIHNlbGVjdGlvbiB0byBpdC4KLSAgICAgICAgICAgICAg ICAgICAgaW5wdXQtPnNldENoZWNrZWQodHJ1ZSk7CisgICAgICAgIAorICAgICAgICBpZiAoRXZl bnRIYW5kbGluZ1N0YXRlKiBzdGF0ZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8RXZlbnRIYW5kbGluZ1N0 YXRlKj4oZGF0YSkpIHsKKyAgICAgICAgICAgIGlmIChpbnB1dFR5cGUoKSA9PSBDSEVDS0JPWCkg eworICAgICAgICAgICAgICAgIC8vIFJldmVyc2UgdGhlIGNoZWNraW5nIHdlIGRpZCBpbiBwcmVE aXNwYXRjaC4KKyAgICAgICAgICAgICAgICBpZiAoZXZ0LT5kZWZhdWx0UHJldmVudGVkKCkgfHwg ZXZ0LT5kZWZhdWx0SGFuZGxlZCgpKSB7CisgICAgICAgICAgICAgICAgICAgIHNldEluZGV0ZXJt aW5hdGUoc3RhdGUtPm1faW5kZXRlcm1pbmF0ZSk7CisgICAgICAgICAgICAgICAgICAgIHNldENo ZWNrZWQoc3RhdGUtPm1fY2hlY2tlZCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IHN0YXRl LT5tX2N1cnJSYWRpby5nZXQoKTsKKyAgICAgICAgICAgICAgICBpZiAoZXZ0LT5kZWZhdWx0UHJl dmVudGVkKCkgfHwgZXZ0LT5kZWZhdWx0SGFuZGxlZCgpKSB7CisgICAgICAgICAgICAgICAgICAg IC8vIFJlc3RvcmUgdGhlIG9yaWdpbmFsIHNlbGVjdGVkIHJhZGlvIGJ1dHRvbiBpZiBwb3NzaWJs ZS4KKyAgICAgICAgICAgICAgICAgICAgLy8gTWFrZSBzdXJlIGl0IGlzIHN0aWxsIGEgcmFkaW8g YnV0dG9uIGFuZCBvbmx5IGRvIHRoZSByZXN0b3JhdGlvbiBpZiBpdCBzdGlsbAorICAgICAgICAg ICAgICAgICAgICAvLyBiZWxvbmdzIHRvIG91ciBncm91cC4KKworICAgICAgICAgICAgICAgICAg ICBpZiAoaW5wdXQgJiYgaW5wdXQtPmZvcm0oKSA9PSBmb3JtKCkgJiYgaW5wdXQtPmlucHV0VHlw ZSgpID09IFJBRElPICYmIGlucHV0LT5uYW1lKCkgPT0gbmFtZSgpKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICAvLyBPaywgdGhlIG9sZCByYWRpbyBidXR0b24gaXMgc3RpbGwgaW4gb3VyIGZv cm0gYW5kIGluIG91ciBncm91cCBhbmQgaXMgc3RpbGwgYSAKKyAgICAgICAgICAgICAgICAgICAg ICAgIC8vIHJhZGlvIGJ1dHRvbiwgc28gaXQncyBzYWZlIHRvIHJlc3RvcmUgc2VsZWN0aW9uIHRv IGl0LgorICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXQtPnNldENoZWNrZWQodHJ1ZSk7Cisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgc2V0SW5kZXRlcm1pbmF0 ZShzdGF0ZS0+bV9pbmRldGVybWluYXRlKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICBpbnB1dC0+ZGVyZWYoKTsKKyAgICAgICAgICAgIGRlbGV0ZSBzdGF0 ZTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIExlZnQgY2xpY2tzIG9uIHJhZGlvIGJ1dHRvbnMg YW5kIGNoZWNrIGJveGVzIGFscmVhZHkgcGVyZm9ybWVkIGRlZmF1bHQgYWN0aW9ucyBpbiBwcmVE aXNwYXRjaEV2ZW50SGFuZGxlcigpLiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmggYi9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCmluZGV4IDcwNGZj MTQuLjdmNzIyM2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgK KysrIGIvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaApAQCAtMTMyLDYgKzEzMiw3IEBA IHB1YmxpYzoKICAgICBib29sIGNoZWNrZWQoKSBjb25zdCB7IHJldHVybiBtX2NoZWNrZWQ7IH0K ICAgICB2b2lkIHNldENoZWNrZWQoYm9vbCwgYm9vbCBzZW5kQ2hhbmdlRXZlbnQgPSBmYWxzZSk7 CiAKKyAgICAvLyAnaW5kZXRlcm1pbmF0ZScgaXMgYSBzdGF0ZSBpbmRlcGVuZGVudCBvZiB0aGUg Y2hlY2tlZCBzdGF0ZSB0aGF0IGNhdXNlcyB0aGUgY29udHJvbCB0byBkcmF3IGluIGEgd2F5IHRo YXQgaGlkZXMgdGhlIGFjdHVhbCBzdGF0ZS4KICAgICBib29sIGFsbG93c0luZGV0ZXJtaW5hdGUo KSBjb25zdCB7IHJldHVybiBpbnB1dFR5cGUoKSA9PSBDSEVDS0JPWCB8fCBpbnB1dFR5cGUoKSA9 PSBSQURJTzsgfQogICAgIGJvb2wgaW5kZXRlcm1pbmF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5k ZXRlcm1pbmF0ZTsgfQogICAgIHZvaWQgc2V0SW5kZXRlcm1pbmF0ZShib29sKTsK