92405 2012-07-26 11:23:45 -0700 [BlackBerry] Improve the logs in Selection Handler. 2012-07-26 15:04:15 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mifenton mifenton tonikitoo webkit.review.bot oldest_to_newest 679559 0 mifenton 2012-07-26 11:23:45 -0700 SSIA. 679611 1 154709 mifenton 2012-07-26 11:53:41 -0700 Created attachment 154709 Patch 679615 2 154709 rwlbuis 2012-07-26 11:56:38 -0700 Comment on attachment 154709 Patch LGTM. 679797 3 154709 webkit.review.bot 2012-07-26 15:04:12 -0700 Comment on attachment 154709 Patch Clearing flags on attachment: 154709 Committed r123797: <http://trac.webkit.org/changeset/123797> 679798 4 webkit.review.bot 2012-07-26 15:04:15 -0700 All reviewed patches have been landed. Closing bug. 154709 2012-07-26 11:53:41 -0700 2012-07-26 15:04:11 -0700 Patch 0002-2012-07-26-Mike-Fenton-mifenton-rim.com.patch text/plain 15055 mifenton RnJvbSBiODU0OTY1MTUwM2JhOGIxNWMwNmE3OGY5NjQ2YWQ3NjdhZDVlMzlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog VGh1LCAyNiBKdWwgMjAxMiAxNDoxOToxNiAtMDQwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSAyMDEy LTA3LTI2ICBNaWtlIEZlbnRvbiAgPG1pZmVudG9uQHJpbS5jb20+CgogICAgICAgIENsZWFuIHVw IHNlbGVjdGlvbiBsb2dnaW5nLCBmaXggcHJpb3JpdHkgYW5kIHN0eWxlCiAgICAgICAgb2YgaGVs cGVyIGZ1bmN0aW9uLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwOgogICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OmNhbmNlbFNlbGVjdGlvbik6CiAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6c2hvdWxkVXBkYXRlU2VsZWN0 aW9uT3JDYXJldEZvclBvaW50KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rp b25IYW5kbGVyOjpzZXRDYXJldFBvc2l0aW9uKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpTZWxlY3Rpb25IYW5kbGVyOjp1cGRhdGVPckhhbmRsZUlucHV0U2VsZWN0aW9uKToKICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpzZXRTZWxlY3Rpb24pOgog ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdE9iamVj dCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0 aW9uUG9zaXRpb25DaGFuZ2VkKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rp b25IYW5kbGVyOjpjYXJldFBvc2l0aW9uQ2hhbmdlZCk6Ci0tLQogU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIyICsrKysrKysrKwogLi4uL2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCAgfCAgIDUwICsrKysr KysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDI1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDQ1MWFjNzEuLjQ1 ODAyM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAy MDEyLTA3LTI2ICBNaWtlIEZlbnRvbiAgPG1pZmVudG9uQHJpbS5jb20+CiAKKyAgICAgICAgW0Js YWNrQmVycnldIEltcHJvdmUgdGhlIGxvZ3MgaW4gU2VsZWN0aW9uIEhhbmRsZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQwNQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIHNlbGVjdGlv biBsb2dnaW5nLCBmaXggcHJpb3JpdHkgYW5kIHN0eWxlCisgICAgICAgIG9mIGhlbHBlciBmdW5j dGlvbi4KKworICAgICAgICBSZXZpZXdlZCBJbnRlcm5hbGx5IGJ5IE5pbWEgR2hhbmF2YXRpYW4u CisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpjYW5jZWxTZWxlY3Rpb24p OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpzaG91bGRV cGRhdGVTZWxlY3Rpb25PckNhcmV0Rm9yUG9pbnQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpzZXRDYXJldFBvc2l0aW9uKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6dXBkYXRlT3JIYW5kbGVJbnB1dFNlbGVj dGlvbik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNl dFNlbGVjdGlvbik6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRs ZXI6OnNlbGVjdE9iamVjdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlv bkhhbmRsZXI6OnNlbGVjdGlvblBvc2l0aW9uQ2hhbmdlZCk6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OmNhcmV0UG9zaXRpb25DaGFuZ2VkKToKKworMjAx Mi0wNy0yNiAgTWlrZSBGZW50b24gIDxtaWZlbnRvbkByaW0uY29tPgorCiAgICAgICAgIFtCbGFj a0JlcnJ5XSBBZGQgdGltaW5nIGxvZ3MgdG8gU2VsZWN0aW9uSGFuZGxlci4KICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNDA0CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIu Y3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFu ZGxlci5jcHAKaW5kZXggNGIyZmQ3Mi4uNzA0NzIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAK QEAgLTUxLDE1ICs1MSwxNSBAQCB1c2luZyBuYW1lc3BhY2UgQmxhY2tCZXJyeTo6UGxhdGZvcm07 CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogI2lmIFNIT1dERUJVR19TRUxFQ1RJT05IQU5E TEVSCi0jZGVmaW5lIERFQlVHX1NFTEVDVElPTihzZXZlcml0eSwgZm9ybWF0LCAuLi4pIGxvZ0Fs d2F5cyhzZXZlcml0eSwgZm9ybWF0LCAjIyBfX1ZBX0FSR1NfXykKKyNkZWZpbmUgU2VsZWN0aW9u TG9nKHNldmVyaXR5LCBmb3JtYXQsIC4uLikgbG9nQWx3YXlzKHNldmVyaXR5LCBmb3JtYXQsICMj IF9fVkFfQVJHU19fKQogI2Vsc2UKLSNkZWZpbmUgREVCVUdfU0VMRUNUSU9OKHNldmVyaXR5LCBm b3JtYXQsIC4uLikKKyNkZWZpbmUgU2VsZWN0aW9uTG9nKHNldmVyaXR5LCBmb3JtYXQsIC4uLikK ICNlbmRpZiAvLyBTSE9XREVCVUdfU0VMRUNUSU9OSEFORExFUgogCiAjaWYgU0hPV0RFQlVHX1NF TEVDVElPTkhBTkRMRVJfVElNSU5HCi0jZGVmaW5lIERFQlVHX1NFTEVDVElPTl9USU1JTkcoc2V2 ZXJpdHksIGZvcm1hdCwgLi4uKSBsb2dBbHdheXMoc2V2ZXJpdHksIGZvcm1hdCwgIyMgX19WQV9B UkdTX18pCisjZGVmaW5lIFNlbGVjdGlvblRpbWluZ0xvZyhzZXZlcml0eSwgZm9ybWF0LCAuLi4p IGxvZ0Fsd2F5cyhzZXZlcml0eSwgZm9ybWF0LCAjIyBfX1ZBX0FSR1NfXykKICNlbHNlCi0jZGVm aW5lIERFQlVHX1NFTEVDVElPTl9USU1JTkcoc2V2ZXJpdHksIGZvcm1hdCwgLi4uKQorI2RlZmlu ZSBTZWxlY3Rpb25UaW1pbmdMb2coc2V2ZXJpdHksIGZvcm1hdCwgLi4uKQogI2VuZGlmIC8vIFNI T1dERUJVR19TRUxFQ1RJT05IQU5ETEVSX1RJTUlORwogCiBuYW1lc3BhY2UgQmxhY2tCZXJyeSB7 CkBAIC04Miw3ICs4Miw3IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6Y2FuY2VsU2VsZWN0aW9u KCkKICAgICBtX3NlbGVjdGlvbkFjdGl2ZSA9IGZhbHNlOwogICAgIG1fbGFzdFNlbGVjdGlvblJl Z2lvbiA9IEludFJlY3RSZWdpb24oKTsKIAotICAgIERFQlVHX1NFTEVDVElPTihMb2dMZXZlbElu Zm8sICJTZWxlY3Rpb25IYW5kbGVyOjpjYW5jZWxTZWxlY3Rpb24iKTsKKyAgICBTZWxlY3Rpb25M b2coTG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6Y2FuY2VsU2VsZWN0aW9uIik7CiAK ICAgICBpZiAobV93ZWJQYWdlLT5tX2lucHV0SGFuZGxlci0+aXNJbnB1dE1vZGUoKSkKICAgICAg ICAgbV93ZWJQYWdlLT5tX2lucHV0SGFuZGxlci0+Y2FuY2VsU2VsZWN0aW9uKCk7CkBAIC0yMTIs NyArMjEyLDcgQEAgYm9vbCBTZWxlY3Rpb25IYW5kbGVyOjpzaG91bGRVcGRhdGVTZWxlY3Rpb25P ckNhcmV0Rm9yUG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG8KICAgICBib29sIGFib3ZlQ2FyZXQg PSBwb2ludC55KCkgPCBjYXJldFJlY3QueSgpOwogICAgIGJvb2wgYmVsb3dDYXJldCA9IHBvaW50 LnkoKSA+PSBjYXJldFJlY3QubWF4WSgpOwogCi0gICAgREVCVUdfU0VMRUNUSU9OKExvZ0xldmVs SW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNob3VsZFVwZGF0ZVNlbGVjdGlvbk9yQ2FyZXRGb3JQ b2ludCBtdWx0aWxpbmUgPSAlcyBhYm92ZSA9ICVzIGJlbG93ID0gJXMgZmlyc3QgbGluZSA9ICVz IGxhc3QgbGluZSA9ICVzIHN0YXJ0ID0gJXMgXG4iCisgICAgU2VsZWN0aW9uTG9nKExvZ0xldmVs SW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNob3VsZFVwZGF0ZVNlbGVjdGlvbk9yQ2FyZXRGb3JQ b2ludCBtdWx0aWxpbmUgPSAlcyBhYm92ZSA9ICVzIGJlbG93ID0gJXMgZmlyc3QgbGluZSA9ICVz IGxhc3QgbGluZSA9ICVzIHN0YXJ0ID0gJXMiCiAgICAgICAgICAgICAsIG1fd2ViUGFnZS0+bV9p bnB1dEhhbmRsZXItPmlzTXVsdGlsaW5lSW5wdXRNb2RlKCkgPyAidHJ1ZSIgOiAiZmFsc2UiLCBh Ym92ZUNhcmV0ID8gInRydWUiIDogImZhbHNlIiwgYmVsb3dDYXJldCA/ICJ0cnVlIiA6ICJmYWxz ZSIKICAgICAgICAgICAgICwgaW5TYW1lTGluZShjdXJyZW50U2VsZWN0aW9uLnZpc2libGVTdGFy dCgpLCBzdGFydE9mRWRpdGFibGVDb250ZW50KGN1cnJlbnRTZWxlY3Rpb24udmlzaWJsZVN0YXJ0 KCkpKSA/ICJ0cnVlIiA6ICJmYWxzZSIKICAgICAgICAgICAgICwgaW5TYW1lTGluZShjdXJyZW50 U2VsZWN0aW9uLnZpc2libGVFbmQoKSwgZW5kT2ZFZGl0YWJsZUNvbnRlbnQoY3VycmVudFNlbGVj dGlvbi52aXNpYmxlRW5kKCkpKSA/ICJ0cnVlIiA6ICJmYWxzZSIKQEAgLTIzNSw3ICsyMzUsNyBA QCB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNldENhcmV0UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQgJnBvc2l0aW9uKQogCiAgICAgbV9jYXJldEFjdGl2ZSA9IHRydWU7CiAKLSAgICBE RUJVR19TRUxFQ1RJT04oTG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6c2V0Q2FyZXRQ b3NpdGlvbiByZXF1ZXN0ZWQgcG9pbnQgJWQsICVkIiwgcG9zaXRpb24ueCgpLCBwb3NpdGlvbi55 KCkpOworICAgIFNlbGVjdGlvbkxvZyhMb2dMZXZlbEluZm8sICJTZWxlY3Rpb25IYW5kbGVyOjpz ZXRDYXJldFBvc2l0aW9uIHJlcXVlc3RlZCBwb2ludCAlZCwgJWQiLCBwb3NpdGlvbi54KCksIHBv c2l0aW9uLnkoKSk7CiAKICAgICBGcmFtZSogZm9jdXNlZEZyYW1lID0gbV93ZWJQYWdlLT5mb2N1 c2VkT3JNYWluRnJhbWUoKTsKICAgICBGcmFtZVNlbGVjdGlvbiogY29udHJvbGxlciA9IGZvY3Vz ZWRGcmFtZS0+c2VsZWN0aW9uKCk7CkBAIC0yNjUsNyArMjY1LDcgQEAgdm9pZCBTZWxlY3Rpb25I YW5kbGVyOjpzZXRDYXJldFBvc2l0aW9uKGNvbnN0IFdlYkNvcmU6OkludFBvaW50ICZwb3NpdGlv bikKIAogICAgIGNvbnRyb2xsZXItPnNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24pOwogCi0gICAg REVCVUdfU0VMRUNUSU9OKExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNldENhcmV0 UG9zaXRpb24gcG9pbnQgdmFsaWQsIGN1cnNvciB1cGRhdGVkIik7CisgICAgU2VsZWN0aW9uTG9n KExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNldENhcmV0UG9zaXRpb24gcG9pbnQg dmFsaWQsIGN1cnNvciB1cGRhdGVkIik7CiB9CiAKIC8vIFRoaXMgZnVuY3Rpb24gbWFrZXMgc3Vy ZSB3ZSBhcmUgbm90IHJlZHVjaW5nIHRoZSBzZWxlY3Rpb24gdG8gYSBjYXJldCBzZWxlY3Rpb24u CkBAIC00MzMsNyArNDMzLDcgQEAgYm9vbCBTZWxlY3Rpb25IYW5kbGVyOjp1cGRhdGVPckhhbmRs ZUlucHV0U2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24mIG5ld1NlbGVjdGkKICAgICBpZiAoIWNo YXJhY3RlcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgREVCVUdfU0VMRUNUSU9OKExv Z0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNldFNlbGVjdGlvbiBtYWtpbmcgc2VsZWN0 aW9uIGNoYW5nZSBhdHRlbXB0IHVzaW5nIGtleSBldmVudCAlZCIsIGNoYXJhY3Rlcik7CisgICAg U2VsZWN0aW9uTG9nKExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnVwZGF0ZU9ySGFu ZGxlSW5wdXRTZWxlY3Rpb24gbWFraW5nIHNlbGVjdGlvbiBjaGFuZ2UgYXR0ZW1wdCB1c2luZyBr ZXkgZXZlbnQgJWQiLCBjaGFyYWN0ZXIpOwogCiAgICAgaWYgKHNob3VsZEV4dGVuZFNlbGVjdGlv bkluRGlyZWN0aW9uKGNvbnRyb2xsZXItPnNlbGVjdGlvbigpLCBjaGFyYWN0ZXIpKQogICAgICAg ICBtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5oYW5kbGVLZXlib2FyZElucHV0KFBsYXRmb3Jt OjpLZXlib2FyZEV2ZW50KGNoYXJhY3RlciwgUGxhdGZvcm06OktleWJvYXJkRXZlbnQ6OktleURv d24sIEtFWU1PRF9TSElGVCkpOwpAQCAtNDU5LDcgKzQ1OSw3IEBAIHZvaWQgU2VsZWN0aW9uSGFu ZGxlcjo6c2V0U2VsZWN0aW9uKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBzdGFydCwgY29uc3Qg V2ViQ29yCiAgICAgbV90aW1lci5zdGFydCgpOwogI2VuZGlmCiAKLSAgICBERUJVR19TRUxFQ1RJ T04oTG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6c2V0U2VsZWN0aW9uIGFkanVzdGVk IHBvaW50cyAlZCwgJWQsICVkLCAlZCIsIHN0YXJ0LngoKSwgc3RhcnQueSgpLCBlbmQueCgpLCBl bmQueSgpKTsKKyAgICBTZWxlY3Rpb25Mb2coTG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxl cjo6c2V0U2VsZWN0aW9uIGFkanVzdGVkIHBvaW50cyAlZCwgJWQsICVkLCAlZCIsIHN0YXJ0Lngo KSwgc3RhcnQueSgpLCBlbmQueCgpLCBlbmQueSgpKTsKIAogICAgIC8vIE5vdGUgdGhhdCBJbnRQ b2ludCgtMSwgLTEpIGlzIGJlaW5nIG91ciBzZW50aW5lbCBzbyBmYXIgZm9yCiAgICAgLy8gY2xp cHBlZCBvdXQgc2VsZWN0aW9uIHN0YXJ0aW5nIG9yIGVuZGluZyBsb2NhdGlvbi4KQEAgLTUzMiwx MiArNTMyLDEyIEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2V0U2VsZWN0aW9uKGNvbnN0IFdl YkNvcmU6OkludFBvaW50JiBzdGFydCwgY29uc3QgV2ViQ29yCiAKICAgICAgICAgY29udHJvbGxl ci0+c2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbik7CiAKLSAgICAgICAgREVCVUdfU0VMRUNUSU9O KExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNldFNlbGVjdGlvbiBzZWxlY3Rpb24g cG9pbnRzIHZhbGlkLCBzZWxlY3Rpb24gdXBkYXRlZFxuIik7CisgICAgICAgIFNlbGVjdGlvbkxv ZyhMb2dMZXZlbEluZm8sICJTZWxlY3Rpb25IYW5kbGVyOjpzZXRTZWxlY3Rpb24gc2VsZWN0aW9u IHBvaW50cyB2YWxpZCwgc2VsZWN0aW9uIHVwZGF0ZWQuIik7CiAgICAgfSBlbHNlIHsKICAgICAg ICAgLy8gUmVxdWVzdGVkIHNlbGVjdGlvbiByZXN1bHRzIGluIGFuIGVtcHR5IHNlbGVjdGlvbiwg c2tpcCB0aGlzIGNoYW5nZS4KICAgICAgICAgc2VsZWN0aW9uUG9zaXRpb25DaGFuZ2VkKCk7CiAK LSAgICAgICAgREVCVUdfU0VMRUNUSU9OKExvZ0xldmVsV2FybiwgIlNlbGVjdGlvbkhhbmRsZXI6 OnNldFNlbGVjdGlvbiBzZWxlY3Rpb24gcG9pbnRzIGludmFsaWQsIHNlbGVjdGlvbiBub3QgdXBk YXRlZFxuIik7CisgICAgICAgIFNlbGVjdGlvbkxvZyhMb2dMZXZlbFdhcm4sICJTZWxlY3Rpb25I YW5kbGVyOjpzZXRTZWxlY3Rpb24gc2VsZWN0aW9uIHBvaW50cyBpbnZhbGlkLCBzZWxlY3Rpb24g bm90IHVwZGF0ZWQuIik7CiAgICAgfQogfQogCkBAIC02MTcsNyArNjE3LDcgQEAgdm9pZCBTZWxl Y3Rpb25IYW5kbGVyOjpzZWxlY3RPYmplY3QoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGxvY2F0 aW9uLCBUZXh0R3JhbnUKICAgICBBU1NFUlQobV93ZWJQYWdlICYmIG1fd2ViUGFnZS0+Zm9jdXNl ZE9yTWFpbkZyYW1lKCkgJiYgbV93ZWJQYWdlLT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+c2VsZWN0 aW9uKCkpOwogICAgIEZyYW1lKiBmb2N1c2VkRnJhbWUgPSBtX3dlYlBhZ2UtPmZvY3VzZWRPck1h aW5GcmFtZSgpOwogCi0gICAgREVCVUdfU0VMRUNUSU9OKExvZ0xldmVsSW5mbywgIlNlbGVjdGlv bkhhbmRsZXI6OnNlbGVjdE9iamVjdCBhZGp1c3RlZCBwb2ludHMgJWQsICVkIiwgbG9jYXRpb24u eCgpLCBsb2NhdGlvbi55KCkpOworICAgIFNlbGVjdGlvbkxvZyhMb2dMZXZlbEluZm8sICJTZWxl Y3Rpb25IYW5kbGVyOjpzZWxlY3RPYmplY3QgYWRqdXN0ZWQgcG9pbnRzICVkLCAlZCIsIGxvY2F0 aW9uLngoKSwgbG9jYXRpb24ueSgpKTsKIAogICAgIFdlYkNvcmU6OkludFBvaW50IHJlbGF0aXZl UG9pbnQgPSBET01TdXBwb3J0Ojpjb252ZXJ0UG9pbnRUb0ZyYW1lKG1fd2ViUGFnZS0+bWFpbkZy YW1lKCksIGZvY3VzZWRGcmFtZSwgbG9jYXRpb24pOwogICAgIFZpc2libGVQb3NpdGlvbiBwb2lu dExvY2F0aW9uKGZvY3VzZWRGcmFtZS0+dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQocmVsYXRpdmVQ b2ludCkpOwpAQCAtNjM2LDcgKzYzNiw3IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0 T2JqZWN0KFRleHRHcmFudWxhcml0eSBncmFudWxhcml0eSkKICAgICBBU1NFUlQobV93ZWJQYWdl LT5mb2N1c2VkT3JNYWluRnJhbWUoKSAmJiBtX3dlYlBhZ2UtPmZvY3VzZWRPck1haW5GcmFtZSgp LT5zZWxlY3Rpb24oKSk7CiAgICAgRnJhbWUqIGZvY3VzZWRGcmFtZSA9IG1fd2ViUGFnZS0+Zm9j dXNlZE9yTWFpbkZyYW1lKCk7CiAKLSAgICBERUJVR19TRUxFQ1RJT04oTG9nTGV2ZWxJbmZvLCAi U2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0T2JqZWN0IHVzaW5nIGN1cnJlbnQgc2VsZWN0aW9uIik7 CisgICAgU2VsZWN0aW9uTG9nKExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVj dE9iamVjdCB1c2luZyBjdXJyZW50IHNlbGVjdGlvbiIpOwogCiAgICAgLy8gVXNlIHRoZSBjdXJy ZW50IHNlbGVjdGlvbiBhcyB0aGUgc2VsZWN0aW9uIHBvaW50LgogICAgIEFTU0VSVChmb2N1c2Vk RnJhbWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb25UeXBlKCkgIT0gVmlzaWJsZVNlbGVjdGlvbjo6 Tm9TZWxlY3Rpb24pOwpAQCAtNjUzLDcgKzY1Myw3IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6 c2VsZWN0T2JqZWN0KE5vZGUqIG5vZGUpCiAgICAgQVNTRVJUKG1fd2ViUGFnZSAmJiBtX3dlYlBh Z2UtPmZvY3VzZWRPck1haW5GcmFtZSgpICYmIG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZyYW1l KCktPnNlbGVjdGlvbigpKTsKICAgICBGcmFtZSogZm9jdXNlZEZyYW1lID0gbV93ZWJQYWdlLT5m b2N1c2VkT3JNYWluRnJhbWUoKTsKIAotICAgIERFQlVHX1NFTEVDVElPTihMb2dMZXZlbEluZm8s ICJTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3ROb2RlIik7CisgICAgU2VsZWN0aW9uTG9nKExvZ0xl dmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdE5vZGUiKTsKIAogICAgIFZpc2libGVT ZWxlY3Rpb24gc2VsZWN0aW9uID0gVmlzaWJsZVNlbGVjdGlvbjo6c2VsZWN0aW9uRnJvbUNvbnRl bnRzT2ZOb2RlKG5vZGUpOwogICAgIGZvY3VzZWRGcmFtZS0+c2VsZWN0aW9uKCktPnNldFNlbGVj dGlvbihzZWxlY3Rpb24pOwpAQCAtODQwLDcgKzg0MCw3IEBAIGJvb2wgU2VsZWN0aW9uSGFuZGxl cjo6aW5wdXROb2RlT3ZlcnJpZGVzVG91Y2goKSBjb25zdAogLy8gc3lzdGVtIGlzIG5vdCBlbnRp cmVseSBXZWJLaXQuCiB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdGlvblBvc2l0aW9uQ2hh bmdlZChib29sIHZpc3VhbENoYW5nZU9ubHkpCiB7Ci0gICAgREVCVUdfU0VMRUNUSU9OKExvZ0xl dmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdGlvblBvc2l0aW9uQ2hhbmdlZCB2aXNp YmxlQ2hhbmdlT25seSA9ICVzIiwgdmlzdWFsQ2hhbmdlT25seSA/ICJ0cnVlIiA6ICJmYWxzZSIp OworICAgIFNlbGVjdGlvbkxvZyhMb2dMZXZlbEluZm8sICJTZWxlY3Rpb25IYW5kbGVyOjpzZWxl Y3Rpb25Qb3NpdGlvbkNoYW5nZWQgdmlzaWJsZUNoYW5nZU9ubHkgPSAlcyIsIHZpc3VhbENoYW5n ZU9ubHkgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKIAogICAgIC8vIFRoaXMgbWV0aG9kIGNhbiBnZXQg Y2FsbGVkIGR1cmluZyBXZWJQYWdlIHNodXRkb3duIHByb2Nlc3MuCiAgICAgLy8gSWYgdGhhdCBp cyB0aGUgY2FzZSwganVzdCBiYWlsIG91dCBzaW5jZSB0aGUgY2xpZW50IGlzIG5vdApAQCAtODY5 LDcgKzg2OSw3IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0aW9uUG9zaXRpb25DaGFu Z2VkKGJvb2wgdmlzdWFsQ2hhbmdlT25seSkKICAgICBlbHNlIGlmICghbV9zZWxlY3Rpb25BY3Rp dmUpCiAgICAgICAgIHJldHVybjsKIAotICAgIERFQlVHX1NFTEVDVElPTl9USU1JTkcoTG9nTGV2 ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0aW9uUG9zaXRpb25DaGFuZ2VkIHN0YXJ0 aW5nIGF0ICVmIiwgbV90aW1lci5lbGFwc2VkKCkpOworICAgIFNlbGVjdGlvblRpbWluZ0xvZyhM b2dMZXZlbEluZm8sICJTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25Qb3NpdGlvbkNoYW5nZWQg c3RhcnRpbmcgYXQgJWYiLCBtX3RpbWVyLmVsYXBzZWQoKSk7CiAKICAgICBXZWJDb3JlOjpJbnRS ZWN0IHN0YXJ0Q2FyZXQ7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBlbmRDYXJldDsKQEAgLTkwMiwx MSArOTAyLDExIEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0aW9uUG9zaXRpb25DaGFu Z2VkKGJvb2wgdmlzdWFsQ2hhbmdlT25seSkKIAogICAgICAgICByZWdpb25Gb3JUZXh0UXVhZHMo cXVhZHMsIHZpc2libGVTZWxlY3Rpb25SZWdpb24pOwogCi0jaWYgU0hPV0RFQlVHX1NFTEVDVElP TkhBTkRMRVIgLy8gRG9uJ3QgcmVseSBqdXN0IG9uIERFQlVHX1NFTEVDVElPTiB0byBhdm9pZCBs b29wLgorI2lmIFNIT1dERUJVR19TRUxFQ1RJT05IQU5ETEVSIC8vIERvbid0IHJlbHkganVzdCBv biBTZWxlY3Rpb25Mb2cgdG8gYXZvaWQgbG9vcC4KICAgICAgICAgZm9yICh1bnNpZ25lZCBpbnQg aSA9IDA7IGkgPCB1bmNsaXBwZWRSZWdpb24ubnVtUmVjdHMoKTsgaSsrKQotICAgICAgICAgICAg REVCVUdfU0VMRUNUSU9OKExvZ0xldmVsQ3JpdGljYWwsICJSZWN0IGxpc3QgLSBVbm1vZGlmaWVk ICMlZCwgKCVkLCAlZCkgKCVkIHggJWQpIiwgaSwgdW5jbGlwcGVkUmVnaW9uLnJlY3RzKClbaV0u eCgpLCB1bmNsaXBwZWRSZWdpb24ucmVjdHMoKVtpXS55KCksIHVuY2xpcHBlZFJlZ2lvbi5yZWN0 cygpW2ldLndpZHRoKCksIHVuY2xpcHBlZFJlZ2lvbi5yZWN0cygpW2ldLmhlaWdodCgpKTsKKyAg ICAgICAgICAgIFNlbGVjdGlvbkxvZyhMb2dMZXZlbEluZm8sICJSZWN0IGxpc3QgLSBVbm1vZGlm aWVkICMlZCwgKCVkLCAlZCkgKCVkIHggJWQpIiwgaSwgdW5jbGlwcGVkUmVnaW9uLnJlY3RzKClb aV0ueCgpLCB1bmNsaXBwZWRSZWdpb24ucmVjdHMoKVtpXS55KCksIHVuY2xpcHBlZFJlZ2lvbi5y ZWN0cygpW2ldLndpZHRoKCksIHVuY2xpcHBlZFJlZ2lvbi5yZWN0cygpW2ldLmhlaWdodCgpKTsK ICAgICAgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7IGkgPCB2aXNpYmxlU2VsZWN0aW9uUmVn aW9uLm51bVJlY3RzKCk7IGkrKykKLSAgICAgICAgICAgIERFQlVHX1NFTEVDVElPTihMb2dMZXZl bENyaXRpY2FsLCAiUmVjdCBsaXN0ICAtIENsaXBwZWQgdG8gVmlzaWJsZSAjJWQsICglZCwgJWQp ICglZCB4ICVkKSIsIGksIHZpc2libGVTZWxlY3Rpb25SZWdpb24ucmVjdHMoKVtpXS54KCksIHZp c2libGVTZWxlY3Rpb25SZWdpb24ucmVjdHMoKVtpXS55KCksIHZpc2libGVTZWxlY3Rpb25SZWdp b24ucmVjdHMoKVtpXS53aWR0aCgpLCB2aXNpYmxlU2VsZWN0aW9uUmVnaW9uLnJlY3RzKClbaV0u aGVpZ2h0KCkpOworICAgICAgICAgICAgU2VsZWN0aW9uTG9nKExvZ0xldmVsSW5mbywgIlJlY3Qg bGlzdCAgLSBDbGlwcGVkIHRvIFZpc2libGUgIyVkLCAoJWQsICVkKSAoJWQgeCAlZCkiLCBpLCB2 aXNpYmxlU2VsZWN0aW9uUmVnaW9uLnJlY3RzKClbaV0ueCgpLCB2aXNpYmxlU2VsZWN0aW9uUmVn aW9uLnJlY3RzKClbaV0ueSgpLCB2aXNpYmxlU2VsZWN0aW9uUmVnaW9uLnJlY3RzKClbaV0ud2lk dGgoKSwgdmlzaWJsZVNlbGVjdGlvblJlZ2lvbi5yZWN0cygpW2ldLmhlaWdodCgpKTsKICNlbmRp ZgogCiAgICAgICAgIGJvb2wgc2hvdWxkQ2FyZUFib3V0UG9zc2libGVDbGlwcGVkT3V0U2VsZWN0 aW9uID0gZnJhbWUgIT0gbV93ZWJQYWdlLT5tYWluRnJhbWUoKSB8fCBtX3dlYlBhZ2UtPm1faW5w dXRIYW5kbGVyLT5pc0lucHV0TW9kZSgpOwpAQCAtOTM1LDIwICs5MzUsMjAgQEAgdm9pZCBTZWxl Y3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25Qb3NpdGlvbkNoYW5nZWQoYm9vbCB2aXN1YWxDaGFuZ2VP bmx5KQogICAgICAgICB9CiAgICAgfQogCi0gICAgREVCVUdfU0VMRUNUSU9OKEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpMb2dMZXZlbEluZm8sICJTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25Qb3Np dGlvbkNoYW5nZWQgU3RhcnQgUmVjdD0oJWQsICVkKSAoJWQgeCAlZCkgRW5kIFJlY3Q9KCVkLCAl ZCkgKCVkIHggJWQpIiwKKyAgICBTZWxlY3Rpb25Mb2coQmxhY2tCZXJyeTo6UGxhdGZvcm06Okxv Z0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdGlvblBvc2l0aW9uQ2hhbmdlZCBT dGFydCBSZWN0PSglZCwgJWQpICglZCB4ICVkKSBFbmQgUmVjdD0oJWQsICVkKSAoJWQgeCAlZCki LAogICAgICAgICAgICAgICAgICAgICBzdGFydENhcmV0LngoKSwgc3RhcnRDYXJldC55KCksIHN0 YXJ0Q2FyZXQud2lkdGgoKSwgc3RhcnRDYXJldC5oZWlnaHQoKSwgZW5kQ2FyZXQueCgpLCBlbmRD YXJldC55KCksIGVuZENhcmV0LndpZHRoKCksIGVuZENhcmV0LmhlaWdodCgpKTsKIAogICAgIGlm IChtX3dlYlBhZ2UtPm1fc2VsZWN0aW9uT3ZlcmxheSkKICAgICAgICAgbV93ZWJQYWdlLT5tX3Nl bGVjdGlvbk92ZXJsYXktPmRyYXcodmlzaWJsZVNlbGVjdGlvblJlZ2lvbik7CiAKICAgICBtX3dl YlBhZ2UtPm1fY2xpZW50LT5ub3RpZnlTZWxlY3Rpb25EZXRhaWxzQ2hhbmdlZChzdGFydENhcmV0 LCBlbmRDYXJldCwgdmlzaWJsZVNlbGVjdGlvblJlZ2lvbiwgaW5wdXROb2RlT3ZlcnJpZGVzVG91 Y2goKSk7Ci0gICAgREVCVUdfU0VMRUNUSU9OX1RJTUlORyhMb2dMZXZlbEluZm8sICJTZWxlY3Rp b25IYW5kbGVyOjpzZWxlY3Rpb25Qb3NpdGlvbkNoYW5nZWQgY29tcGxldGVkIGF0ICVmIiwgbV90 aW1lci5lbGFwc2VkKCkpOworICAgIFNlbGVjdGlvblRpbWluZ0xvZyhMb2dMZXZlbEluZm8sICJT ZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25Qb3NpdGlvbkNoYW5nZWQgY29tcGxldGVkIGF0ICVm IiwgbV90aW1lci5lbGFwc2VkKCkpOwogfQogCiAvLyBOT1RFOiBUaGlzIGZ1bmN0aW9uIGlzIG5v dCBpbiBXZWJLaXQgY29vcmRpbmF0ZXMuCiB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OmNhcmV0UG9z aXRpb25DaGFuZ2VkKCkKIHsKLSAgICBERUJVR19TRUxFQ1RJT04oTG9nTGV2ZWxJbmZvLCAiU2Vs ZWN0aW9uSGFuZGxlcjo6Y2FyZXRQb3NpdGlvbkNoYW5nZWQiKTsKKyAgICBTZWxlY3Rpb25Mb2co TG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6Y2FyZXRQb3NpdGlvbkNoYW5nZWQiKTsK IAogICAgIFdlYkNvcmU6OkludFJlY3QgY2FyZXRMb2NhdGlvbjsKICAgICAvLyBJZiB0aGUgaW5w dXQgZmllbGQgaXMgZW1wdHksIHdlIGFsd2F5cyB0dXJuIG9mZiB0aGUgY2FyZXQuCkBAIC05Nzks NyArOTc5LDcgQEAgdm9pZCBTZWxlY3Rpb25IYW5kbGVyOjpjYXJldFBvc2l0aW9uQ2hhbmdlZCgp CiAKICAgICBtX2NhcmV0QWN0aXZlID0gIWNhcmV0TG9jYXRpb24uaXNFbXB0eSgpOwogCi0gICAg REVCVUdfU0VMRUNUSU9OKExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OmNhcmV0UG9z aXRpb25DaGFuZ2VkIGNhcmV0IFJlY3QgJWQsICVkLCAlZHglZCIsCisgICAgU2VsZWN0aW9uTG9n KExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6OmNhcmV0UG9zaXRpb25DaGFuZ2VkIGNh cmV0IFJlY3QgJWQsICVkLCAlZHglZCIsCiAgICAgICAgICAgICAgICAgICAgICAgICBjYXJldExv Y2F0aW9uLngoKSwgY2FyZXRMb2NhdGlvbi55KCksIGNhcmV0TG9jYXRpb24ud2lkdGgoKSwgY2Fy ZXRMb2NhdGlvbi5oZWlnaHQoKSk7CiAKICAgICBjYXJldExvY2F0aW9uID0gbV93ZWJQYWdlLT5t YXBUb1RyYW5zZm9ybWVkKGNhcmV0TG9jYXRpb24pOwpAQCAtOTk4LDcgKzk5OCw3IEBAIHZvaWQg U2VsZWN0aW9uSGFuZGxlcjo6Y2FyZXRQb3NpdGlvbkNoYW5nZWQoKQogICAgICAgICBtX3dlYlBh Z2UtPmNsaXBUb1RyYW5zZm9ybWVkQ29udGVudHNSZWN0KG5vZGVCb3VuZGluZ0JveCk7CiAgICAg fQogCi0gICAgREVCVUdfU0VMRUNUSU9OKExvZ0xldmVsSW5mbywgIlNlbGVjdGlvbkhhbmRsZXI6 OnNpbmdsZSBsaW5lICVzIHNpbmdsZSBsaW5lIGJvdW5kaW5nIGJveCAlZCwgJWQsICVkeCVkIiwK KyAgICBTZWxlY3Rpb25Mb2coTG9nTGV2ZWxJbmZvLCAiU2VsZWN0aW9uSGFuZGxlcjo6c2luZ2xl IGxpbmUgJXMgc2luZ2xlIGxpbmUgYm91bmRpbmcgYm94ICVkLCAlZCwgJWR4JWQiLAogICAgICAg ICAgICAgICAgICAgICBzaW5nbGVMaW5lSW5wdXQgPyAidHJ1ZSIgOiAiZmFsc2UiLCBub2RlQm91 bmRpbmdCb3gueCgpLCBub2RlQm91bmRpbmdCb3gueSgpLCBub2RlQm91bmRpbmdCb3gud2lkdGgo KSwgbm9kZUJvdW5kaW5nQm94LmhlaWdodCgpKTsKIAogICAgIG1fd2ViUGFnZS0+bV9jbGllbnQt Pm5vdGlmeUNhcmV0Q2hhbmdlZChjYXJldExvY2F0aW9uLCBtX3dlYlBhZ2UtPm1fdG91Y2hFdmVu dEhhbmRsZXItPmxhc3RGYXRGaW5nZXJzUmVzdWx0KCkuaXNUZXh0SW5wdXQoKSAvKiB1c2VyVG91 Y2hUcmlnZ2VyZWQgKi8sIHNpbmdsZUxpbmVJbnB1dCwgbm9kZUJvdW5kaW5nQm94KTsKLS0gCjEu Ny45LjUKCg==