164072 2016-10-27 13:16:43 -0700 RenderMultiColumnFlowThread::processPossibleSpannerDescendant should take RenderObject& instead of RenderObject* 2016-10-27 14:22:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser WebkitBugTracker oldest_to_newest 1245224 0 zalan 2016-10-27 13:16:43 -0700 and change the dependencies too. 1245225 1 293048 zalan 2016-10-27 13:23:15 -0700 Created attachment 293048 Patch 1245257 2 293048 commit-queue 2016-10-27 14:22:25 -0700 Comment on attachment 293048 Patch Clearing flags on attachment: 293048 Committed r208005: <http://trac.webkit.org/changeset/208005> 1245258 3 commit-queue 2016-10-27 14:22:29 -0700 All reviewed patches have been landed. Closing bug. 293048 2016-10-27 13:23:15 -0700 2016-10-27 14:22:25 -0700 Patch bug-164072-20161027131929.patch text/plain 20306 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTYyMGZhYmNiNzcwY2Fl ZjYyZTU1MjJlYWViYjM0NjViNzcwNGM3OS4uMzY2YWY0MWM0NmM2NTk4Zjc4MGU0NGVkMmRlOWRi NzlmNzY5Y2Y1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTEwLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyTXVsdGlDb2x1bW5G bG93VGhyZWFkOjpwcm9jZXNzUG9zc2libGVTcGFubmVyRGVzY2VuZGFudCBzaG91bGQgdGFrZSBS ZW5kZXJPYmplY3QmIGluc3RlYWQgb2YgUmVuZGVyT2JqZWN0KgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0MDcyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHku CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6ZmluZFNldFJlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3JlOjppc1ZhbGlkQ29sdW1uU3Bh bm5lcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OnBy b2Nlc3NQb3NzaWJsZVNwYW5uZXJEZXNjZW5kYW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck11bHRpQ29sdW1uRmxvd1RocmVhZDo6Zmxvd1RocmVhZERlc2NlbmRhbnRJbnNlcnRlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmZpbmRTZXRSZW5k ZXJpbmcpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6cHJlY2VkZXNSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29udGFpbnNSZW5kZXJlckluRmxvd1RocmVhZCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0Lmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyOjpjcmVhdGVBbm9u eW1vdXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vo b2xkZXI6OlJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9i amVjdDo6aW5zZXJ0ZWRJbnRvVHJlZSk6CisKIDIwMTYtMTAtMjYgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBJZ25vcmUgb3V0LW9mLWZsb3cgc2libGluZ3Mgd2hl biBzZWFyY2hpbmcgZm9yIGEgc3Bhbm5lciBjYW5kaWRhdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAppbmRleCA3NDk0ZWI3Njg5YmMzMDA4MTYyNjdmNmNh MTlhMmE0MjBiY2RhNDY0Li4xNzcxOTMxN2JjYjk2ODg1NzZlMzAwM2ZjYjdhZjZlNmIzMTMyZDI0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgKQEAgLTky LDcgKzkyLDcgQEAgcHVibGljOgogICAgIC8vIGxvY2F0aW9uIGluIHRoZSB0cmVlLgogICAgIHZp cnR1YWwgUmVuZGVyT2JqZWN0KiByZXNvbHZlTW92ZWRDaGlsZChSZW5kZXJPYmplY3QqIGNoaWxk KSBjb25zdCB7IHJldHVybiBjaGlsZDsgfQogICAgIC8vIENhbGxlZCB3aGVuIGEgZGVzY2VuZGFu dCBvZiB0aGUgZmxvdyB0aHJlYWQgaGFzIGJlZW4gaW5zZXJ0ZWQuCi0gICAgdmlydHVhbCB2b2lk IGZsb3dUaHJlYWREZXNjZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0KikgeyB9CisgICAgdmly dHVhbCB2b2lkIGZsb3dUaHJlYWREZXNjZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0JikgeyB9 CiAgICAgLy8gQ2FsbGVkIHdoZW4gYSBzaWJsaW5nIG9yIGRlc2NlbmRhbnQgb2YgdGhlIGZsb3cg dGhyZWFkIGlzIGFib3V0IHRvIGJlIHJlbW92ZWQuCiAgICAgdmlydHVhbCB2b2lkIGZsb3dUaHJl YWRSZWxhdGl2ZVdpbGxCZVJlbW92ZWQoUmVuZGVyT2JqZWN0KikgeyB9CiAgICAgLy8gQ2FsbGVk IHdoZW4gYSBkZXNjZW5kYW50IGJveCdzIGxheW91dCBpcyBmaW5pc2hlZCBhbmQgaXQgaGFzIGJl ZW4gcG9zaXRpb25lZCB3aXRoaW4gaXRzIGNvbnRhaW5lci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKaW5kZXgg ZWYxYjU4ZWMzNDM3NGZlY2NjZThkNzg3ZmU5YmFlNmUyMzIyYTg5Ny4uNzFkY2I5M2FlZGM0OWQ4 ODUyYjlmNjZlNmU3ZjNkOThhYjAyZTZjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKQEAgLTEzMyw5ICsx MzMsMTAgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmxheW91dCgpCiAgICAg bV9sYXN0U2V0V29ya2VkT24gPSBudWxscHRyOwogfQogCi1SZW5kZXJNdWx0aUNvbHVtblNldCog UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkOjpmaW5kU2V0UmVuZGVyaW5nKFJlbmRlck9iamVj dCogcmVuZGVyZXIpIGNvbnN0CitzdGF0aWMgUmVuZGVyTXVsdGlDb2x1bW5TZXQqIGZpbmRTZXRS ZW5kZXJpbmcoY29uc3QgUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkJiBmbG93VGhyZWFkLCBj b25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogewotICAgIGZvciAoUmVuZGVyTXVsdGlDb2x1 bW5TZXQqIG11bHRpY29sU2V0ID0gZmlyc3RNdWx0aUNvbHVtblNldCgpOyBtdWx0aWNvbFNldDsg bXVsdGljb2xTZXQgPSBtdWx0aWNvbFNldC0+bmV4dFNpYmxpbmdNdWx0aUNvbHVtblNldCgpKSB7 CisgICAgLy8gRmluZCB0aGUgc2V0IGluc2lkZSB3aGljaCB0aGUgc3BlY2lmaWVkIHJlbmRlcmVy IHdvdWxkIGJlIHJlbmRlcmVkLgorICAgIGZvciAoYXV0byogbXVsdGljb2xTZXQgPSBmbG93VGhy ZWFkLmZpcnN0TXVsdGlDb2x1bW5TZXQoKTsgbXVsdGljb2xTZXQ7IG11bHRpY29sU2V0ID0gbXVs dGljb2xTZXQtPm5leHRTaWJsaW5nTXVsdGlDb2x1bW5TZXQoKSkgewogICAgICAgICBpZiAobXVs dGljb2xTZXQtPmNvbnRhaW5zUmVuZGVyZXJJbkZsb3dUaHJlYWQocmVuZGVyZXIpKQogICAgICAg ICAgICAgcmV0dXJuIG11bHRpY29sU2V0OwogICAgIH0KQEAgLTIzMywzNiArMjM0LDM2IEBAIFJl bmRlck9iamVjdCogUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkOjpyZXNvbHZlTW92ZWRDaGls ZChSZW5kZXJPYmplY3QqIGNoaWxkCiAgICAgcmV0dXJuIGNoaWxkOwogfQogCi1zdGF0aWMgYm9v bCBpc1ZhbGlkQ29sdW1uU3Bhbm5lcihSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQqIGZsb3dU aHJlYWQsIFJlbmRlck9iamVjdCogZGVzY2VuZGFudCkKK3N0YXRpYyBib29sIGlzVmFsaWRDb2x1 bW5TcGFubmVyKGNvbnN0IFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCYgZmxvd1RocmVhZCwg Y29uc3QgUmVuZGVyT2JqZWN0JiBkZXNjZW5kYW50KQogewogICAgIC8vIFdlIGFzc3VtZSB0aGF0 IHdlJ3JlIGluc2lkZSB0aGUgZmxvdyB0aHJlYWQuIFRoaXMgZnVuY3Rpb24gaXMgbm90IHRvIGJl IGNhbGxlZCBvdGhlcndpc2UuCi0gICAgQVNTRVJUKGRlc2NlbmRhbnQtPmlzRGVzY2VuZGFudE9m KGZsb3dUaHJlYWQpKTsKKyAgICBBU1NFUlQoZGVzY2VuZGFudC5pc0Rlc2NlbmRhbnRPZigmZmxv d1RocmVhZCkpOwogCiAgICAgLy8gRmlyc3QgbWFrZSBzdXJlIHRoYXQgdGhlIHJlbmRlcmVyIGl0 c2VsZiBoYXMgdGhlIHJpZ2h0IHByb3BlcnRpZXMgZm9yIGJlY29taW5nIGEgc3Bhbm5lci4KLSAg ICBhdXRvJiBzdHlsZSA9IGRlc2NlbmRhbnQtPnN0eWxlKCk7Ci0gICAgaWYgKHN0eWxlLmNvbHVt blNwYW4oKSAhPSBDb2x1bW5TcGFuQWxsIHx8ICFpczxSZW5kZXJCb3g+KCpkZXNjZW5kYW50KSB8 fCBkZXNjZW5kYW50LT5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisgICAgYXV0 byYgc3R5bGUgPSBkZXNjZW5kYW50LnN0eWxlKCk7CisgICAgaWYgKHN0eWxlLmNvbHVtblNwYW4o KSAhPSBDb2x1bW5TcGFuQWxsIHx8ICFpczxSZW5kZXJCb3g+KGRlc2NlbmRhbnQpIHx8IGRlc2Nl bmRhbnQuaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBSZW5kZXJFbGVtZW50KiBjb250YWluZXIgPSBkZXNjZW5kYW50LT5wYXJl bnQoKTsKKyAgICBSZW5kZXJFbGVtZW50KiBjb250YWluZXIgPSBkZXNjZW5kYW50LnBhcmVudCgp OwogICAgIGlmICghaXM8UmVuZGVyQmxvY2tGbG93PigqY29udGFpbmVyKSB8fCBjb250YWluZXIt PmNoaWxkcmVuSW5saW5lKCkpIHsKICAgICAgICAgLy8gTmVlZHMgdG8gYmUgYmxvY2stbGV2ZWwu CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgCiAgICAgLy8gV2UgbmVlZCB0byBo YXZlIHRoZSBmbG93IHRocmVhZCBhcyB0aGUgY29udGFpbmluZyBibG9jay4gQSBzcGFubmVyIGNh bm5vdCBicmVhayBvdXQgb2YgdGhlIGZsb3cgdGhyZWFkLgotICAgIFJlbmRlckZsb3dUaHJlYWQq IGVuY2xvc2luZ0Zsb3dUaHJlYWQgPSBkZXNjZW5kYW50LT5mbG93VGhyZWFkQ29udGFpbmluZ0Js b2NrKCk7Ci0gICAgaWYgKGVuY2xvc2luZ0Zsb3dUaHJlYWQgIT0gZmxvd1RocmVhZCkKKyAgICBS ZW5kZXJGbG93VGhyZWFkKiBlbmNsb3NpbmdGbG93VGhyZWFkID0gZGVzY2VuZGFudC5mbG93VGhy ZWFkQ29udGFpbmluZ0Jsb2NrKCk7CisgICAgaWYgKGVuY2xvc2luZ0Zsb3dUaHJlYWQgIT0gJmZs b3dUaHJlYWQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFRoaXMgbG9va3MgbGlr ZSBhIHNwYW5uZXIsIGJ1dCBpZiB3ZSdyZSBpbnNpZGUgc29tZXRoaW5nIHVuYnJlYWthYmxlLCBp dCdzIG5vdCB0byBiZSB0cmVhdGVkIGFzIG9uZS4KLSAgICBmb3IgKFJlbmRlckJveCogYW5jZXN0 b3IgPSBkb3duY2FzdDxSZW5kZXJCb3g+KCpkZXNjZW5kYW50KS5jb250YWluaW5nQmxvY2soKTsg YW5jZXN0b3IgJiYgIWlzPFJlbmRlclZpZXc+KCphbmNlc3Rvcik7IGFuY2VzdG9yID0gYW5jZXN0 b3ItPmNvbnRhaW5pbmdCbG9jaygpKSB7CisgICAgZm9yIChhdXRvKiBhbmNlc3RvciA9IGRvd25j YXN0PFJlbmRlckJveD4oZGVzY2VuZGFudCkuY29udGFpbmluZ0Jsb2NrKCk7IGFuY2VzdG9yICYm ICFpczxSZW5kZXJWaWV3PigqYW5jZXN0b3IpOyBhbmNlc3RvciA9IGFuY2VzdG9yLT5jb250YWlu aW5nQmxvY2soKSkgewogICAgICAgICBpZiAoYW5jZXN0b3ItPmlzUmVuZGVyRmxvd1RocmVhZCgp KSB7CiAgICAgICAgICAgICAvLyBEb24ndCBhbGxvdyBhbnkgaW50ZXJ2ZW5pbmcgbm9uLW11bHRp Y29sIGZyYWdtZW50YXRpb24gY29udGV4dHMuIFRoZSBzcGVjIGRvZXNuJ3Qgc2F5CiAgICAgICAg ICAgICAvLyBhbnl0aGluZyBhYm91dCBkaXNhbGxvd2luZyB0aGlzLCBidXQgaXQncyBqdXN0IGdv aW5nIHRvIGJlIHRvbyBjb21wbGljYXRlZCB0bwogICAgICAgICAgICAgLy8gaW1wbGVtZW50IChu b3QgdG8gbWVudGlvbiBzcGVjaWZ5IGJlaGF2aW9yKS4KLSAgICAgICAgICAgIHJldHVybiBhbmNl c3RvciA9PSBmbG93VGhyZWFkOworICAgICAgICAgICAgcmV0dXJuIGFuY2VzdG9yID09ICZmbG93 VGhyZWFkOwogICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChhbmNlc3Rvci0+c3R5bGUoKS5jb2x1 bW5TcGFuKCkgIT0gQ29sdW1uU3BhbkFsbCB8fCAhaXNWYWxpZENvbHVtblNwYW5uZXIoZmxvd1Ro cmVhZCwgYW5jZXN0b3IpKTsKKyAgICAgICAgQVNTRVJUKGFuY2VzdG9yLT5zdHlsZSgpLmNvbHVt blNwYW4oKSAhPSBDb2x1bW5TcGFuQWxsIHx8ICFpc1ZhbGlkQ29sdW1uU3Bhbm5lcihmbG93VGhy ZWFkLCAqYW5jZXN0b3IpKTsKICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc1Vuc3BsaXR0YWJsZUZv clBhZ2luYXRpb24oKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC0yOTQs MjMgKzI5NSwyMyBAQCBzdGF0aWMgUmVuZGVyT2JqZWN0KiBzcGFubmVyUGxhY2Vob2RlckNhbmRp ZGF0ZShjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBjbwogICAgIHJldHVybiBudWxscHRy OwogfQogCi1SZW5kZXJPYmplY3QqIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6cHJvY2Vz c1Bvc3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQoUmVuZGVyT2JqZWN0KiYgc3VidHJlZVJvb3QsIFJl bmRlck9iamVjdCogZGVzY2VuZGFudCkKK1JlbmRlck9iamVjdCogUmVuZGVyTXVsdGlDb2x1bW5G bG93VGhyZWFkOjpwcm9jZXNzUG9zc2libGVTcGFubmVyRGVzY2VuZGFudChSZW5kZXJPYmplY3Qq JiBzdWJ0cmVlUm9vdCwgUmVuZGVyT2JqZWN0JiBkZXNjZW5kYW50KQogewogICAgIFJlbmRlckJs b2NrRmxvdyogbXVsdGljb2xDb250YWluZXIgPSBtdWx0aUNvbHVtbkJsb2NrRmxvdygpOwotICAg IFJlbmRlck9iamVjdCogbmV4dFJlbmRlcmVySW5GbG93VGhyZWFkID0gc3Bhbm5lclBsYWNlaG9k ZXJDYW5kaWRhdGUoKmRlc2NlbmRhbnQsICp0aGlzKTsKKyAgICBSZW5kZXJPYmplY3QqIG5leHRS ZW5kZXJlckluRmxvd1RocmVhZCA9IHNwYW5uZXJQbGFjZWhvZGVyQ2FuZGlkYXRlKGRlc2NlbmRh bnQsICp0aGlzKTsKICAgICBSZW5kZXJPYmplY3QqIGluc2VydEJlZm9yZU11bHRpY29sQ2hpbGQg PSBudWxscHRyOwotICAgIFJlbmRlck9iamVjdCogbmV4dERlc2NlbmRhbnQgPSBkZXNjZW5kYW50 OworICAgIFJlbmRlck9iamVjdCogbmV4dERlc2NlbmRhbnQgPSAmZGVzY2VuZGFudDsKIAotICAg IGlmIChpc1ZhbGlkQ29sdW1uU3Bhbm5lcih0aGlzLCBkZXNjZW5kYW50KSkgeworICAgIGlmIChp c1ZhbGlkQ29sdW1uU3Bhbm5lcigqdGhpcywgZGVzY2VuZGFudCkpIHsKICAgICAgICAgLy8gVGhp cyBpcyBhIHNwYW5uZXIgKGNvbHVtbi1zcGFuOmFsbCkuIFN1Y2ggcmVuZGVyZXJzIGFyZSBtb3Zl ZCBmcm9tIHdoZXJlIHRoZXkgd291bGQKICAgICAgICAgLy8gb3RoZXJ3aXNlIG9jY3VyIGluIHRo ZSByZW5kZXIgdHJlZSB0byBiZWNvbWluZyBhIGRpcmVjdCBjaGlsZCBvZiB0aGUgbXVsdGljb2wg Y29udGFpbmVyLAogICAgICAgICAvLyBzbyB0aGF0IHRoZXkgbGl2ZSBhbW9uZyB0aGUgY29sdW1u IHNldHMuIFRoaXMgc2ltcGxpZmllcyB0aGUgbGF5b3V0IGltcGxlbWVudGF0aW9uLCBhbmQKICAg ICAgICAgLy8gYmFzaWNhbGx5IGp1c3QgcmVsaWVzIG9uIHJlZ3VsYXIgYmxvY2sgbGF5b3V0IGRv bmUgYnkgdGhlIFJlbmRlckJsb2NrRmxvdyB0aGF0CiAgICAgICAgIC8vIGVzdGFibGlzaGVzIHRo ZSBtdWx0aWNvbCBjb250YWluZXIuCi0gICAgICAgIFJlbmRlckJsb2NrRmxvdyogY29udGFpbmVy ID0gZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PihkZXNjZW5kYW50LT5wYXJlbnQoKSk7CisgICAg ICAgIFJlbmRlckJsb2NrRmxvdyogY29udGFpbmVyID0gZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93 PihkZXNjZW5kYW50LnBhcmVudCgpKTsKICAgICAgICAgUmVuZGVyTXVsdGlDb2x1bW5TZXQqIHNl dFRvU3BsaXQgPSBudWxscHRyOwogICAgICAgICBpZiAobmV4dFJlbmRlcmVySW5GbG93VGhyZWFk KSB7Ci0gICAgICAgICAgICBzZXRUb1NwbGl0ID0gZmluZFNldFJlbmRlcmluZyhkZXNjZW5kYW50 KTsKKyAgICAgICAgICAgIHNldFRvU3BsaXQgPSBmaW5kU2V0UmVuZGVyaW5nKCp0aGlzLCBkZXNj ZW5kYW50KTsKICAgICAgICAgICAgIGlmIChzZXRUb1NwbGl0KSB7CiAgICAgICAgICAgICAgICAg c2V0VG9TcGxpdC0+c2V0TmVlZHNMYXlvdXQoKTsKICAgICAgICAgICAgICAgICBpbnNlcnRCZWZv cmVNdWx0aWNvbENoaWxkID0gc2V0VG9TcGxpdC0+bmV4dFNpYmxpbmcoKTsKQEAgLTMyMiwyMCAr MzIzLDIxIEBAIFJlbmRlck9iamVjdCogUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkOjpwcm9j ZXNzUG9zc2libGVTcGFubmVyRGVzY2VuZGFudChSZW5kCiAgICAgICAgIC8vIGNvbnRlbnQgYmVm b3JlIGFuZCBhZnRlciB0aGUgc3Bhbm5lciwgc28gdGhhdCBpdCBiZWNvbWVzIHNlcGFyYXRlIGxp bmUgYm94ZXMuIFNlY29uZGx5LAogICAgICAgICAvLyB0aGlzIHBsYWNlaG9sZGVyIHNlcnZlcyBh cyBhIGJyZWFrIHBvaW50IGZvciBjb2x1bW4gc2V0cywgc28gdGhhdCwgd2hlbiBlbmNvdW50ZXJl ZCwgd2UKICAgICAgICAgLy8gZW5kIGZsb3dpbmcgb25lIGNvbHVtbiBzZXQgYW5kIG1vdmUgdG8g dGhlIG5leHQgb25lLgotICAgICAgICBSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRl ciogcGxhY2Vob2xkZXIgPSBSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlcjo6Y3Jl YXRlQW5vbnltb3VzKHRoaXMsIGRvd25jYXN0PFJlbmRlckJveD4oZGVzY2VuZGFudCksICZjb250 YWluZXItPnN0eWxlKCkpOwotICAgICAgICBjb250YWluZXItPmFkZENoaWxkKHBsYWNlaG9sZGVy LCBkZXNjZW5kYW50LT5uZXh0U2libGluZygpKTsKLSAgICAgICAgY29udGFpbmVyLT5yZW1vdmVD aGlsZCgqZGVzY2VuZGFudCk7CisgICAgICAgIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNl aG9sZGVyKiBwbGFjZWhvbGRlciA9IFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVy OjpjcmVhdGVBbm9ueW1vdXModGhpcywKKyAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4o ZGVzY2VuZGFudCksICZjb250YWluZXItPnN0eWxlKCkpOworICAgICAgICBjb250YWluZXItPmFk ZENoaWxkKHBsYWNlaG9sZGVyLCBkZXNjZW5kYW50Lm5leHRTaWJsaW5nKCkpOworICAgICAgICBj b250YWluZXItPnJlbW92ZUNoaWxkKGRlc2NlbmRhbnQpOwogICAgICAgICAKICAgICAgICAgLy8g VGhpcyBpcyBhIGd1YXJkIHRvIHN0b3AgYW4gYW5jZXN0b3IgZmxvdyB0aHJlYWQgZnJvbSBwcm9j ZXNzaW5nIHRoZSBzcGFubmVyLgogICAgICAgICBnU2hpZnRpbmdTcGFubmVyID0gdHJ1ZTsKLSAg ICAgICAgbXVsdGljb2xDb250YWluZXItPlJlbmRlckJsb2NrOjphZGRDaGlsZChkZXNjZW5kYW50 LCBpbnNlcnRCZWZvcmVNdWx0aWNvbENoaWxkKTsKKyAgICAgICAgbXVsdGljb2xDb250YWluZXIt PlJlbmRlckJsb2NrOjphZGRDaGlsZCgmZGVzY2VuZGFudCwgaW5zZXJ0QmVmb3JlTXVsdGljb2xD aGlsZCk7CiAgICAgICAgIGdTaGlmdGluZ1NwYW5uZXIgPSBmYWxzZTsKICAgICAgICAgCiAgICAg ICAgIC8vIFRoZSBzcGFubmVyIGhhcyBub3cgYmVlbiBtb3ZlZCBvdXQgZnJvbSB0aGUgZmxvdyB0 aHJlYWQsIGJ1dCB3ZSBkb24ndCB3YW50IHRvCiAgICAgICAgIC8vIGV4YW1pbmUgaXRzIGNoaWxk cmVuIGFueXdheS4gVGhleSBhcmUgYWxsIHBhcnQgb2YgdGhlIHNwYW5uZXIgYW5kIHNob3VsZG4n dCB0cmlnZ2VyCiAgICAgICAgIC8vIGNyZWF0aW9uIG9mIGNvbHVtbiBzZXRzIG9yIGFueXRoaW5n IGxpa2UgdGhhdC4gQ29udGludWUgYXQgaXRzIG9yaWdpbmFsIHBvc2l0aW9uIGluCiAgICAgICAg IC8vIHRoZSB0cmVlLCBpLmUuIHdoZXJlIHRoZSBwbGFjZWhvbGRlciB3YXMganVzdCBwdXQuCi0g ICAgICAgIGlmIChzdWJ0cmVlUm9vdCA9PSBkZXNjZW5kYW50KQorICAgICAgICBpZiAoc3VidHJl ZVJvb3QgPT0gJmRlc2NlbmRhbnQpCiAgICAgICAgICAgICBzdWJ0cmVlUm9vdCA9IHBsYWNlaG9s ZGVyOwogICAgICAgICBuZXh0RGVzY2VuZGFudCA9IHBsYWNlaG9sZGVyOwogICAgIH0gZWxzZSB7 CkBAIC0zNzUsMTIgKzM3NywxMiBAQCBSZW5kZXJPYmplY3QqIFJlbmRlck11bHRpQ29sdW1uRmxv d1RocmVhZDo6cHJvY2Vzc1Bvc3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQoUmVuZAogICAgIHJldHVy biBuZXh0RGVzY2VuZGFudDsKIH0KIAotdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6 OmZsb3dUaHJlYWREZXNjZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0KiBkZXNjZW5kYW50KQor dm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmZsb3dUaHJlYWREZXNjZW5kYW50SW5z ZXJ0ZWQoUmVuZGVyT2JqZWN0JiBuZXdEZXNjZW5kYW50KQogewotICAgIGlmIChnU2hpZnRpbmdT cGFubmVyIHx8IG1fYmVpbmdFdmFjdWF0ZWQgfHwgZGVzY2VuZGFudC0+aXNJbkZsb3dSZW5kZXJG bG93VGhyZWFkKCkpCisgICAgaWYgKGdTaGlmdGluZ1NwYW5uZXIgfHwgbV9iZWluZ0V2YWN1YXRl ZCB8fCBuZXdEZXNjZW5kYW50LmlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKQogICAgICAgICBy ZXR1cm47Ci0gICAgUmVuZGVyT2JqZWN0KiBzdWJ0cmVlUm9vdCA9IGRlc2NlbmRhbnQ7Ci0gICAg Zm9yICg7IGRlc2NlbmRhbnQ7IGRlc2NlbmRhbnQgPSAoZGVzY2VuZGFudCA/IGRlc2NlbmRhbnQt Pm5leHRJblByZU9yZGVyKHN1YnRyZWVSb290KSA6IG51bGxwdHIpKSB7CisgICAgUmVuZGVyT2Jq ZWN0KiBzdWJ0cmVlUm9vdCA9ICZuZXdEZXNjZW5kYW50OworICAgIGZvciAoYXV0byogZGVzY2Vu ZGFudCA9ICZuZXdEZXNjZW5kYW50OyBkZXNjZW5kYW50OyBkZXNjZW5kYW50ID0gKGRlc2NlbmRh bnQgPyBkZXNjZW5kYW50LT5uZXh0SW5QcmVPcmRlcihzdWJ0cmVlUm9vdCkgOiBudWxscHRyKSkg ewogICAgICAgICBpZiAoaXM8UmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXI+KCpk ZXNjZW5kYW50KSkgewogICAgICAgICAgICAgLy8gQSBzcGFubmVyJ3MgcGxhY2Vob2xkZXIgaGFz IGJlZW4gaW5zZXJ0ZWQuIFRoZSBhY3R1YWwgc3Bhbm5lciByZW5kZXJlciBpcyBtb3ZlZCBmcm9t CiAgICAgICAgICAgICAvLyB3aGVyZSBpdCB3b3VsZCBvdGhlcndpc2Ugb2NjdXIgKGlmIGl0IHdl cmVuJ3QgYSBzcGFubmVyKSB0byBiZWNvbWluZyBhIHNpYmxpbmcgb2YgdGhlCkBAIC00MDYsNyAr NDA4LDcgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmZsb3dUaHJlYWREZXNj ZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0KiBkZXMKICAgICAgICAgICAgICAgICBpZiAoc3Vi dHJlZVJvb3QgPT0gZGVzY2VuZGFudCkKICAgICAgICAgICAgICAgICAgICAgc3VidHJlZVJvb3Qg PSBzcGFubmVyOwogICAgICAgICAgICAgICAgIC8vIE5vdyB3ZSBwcm9jZXNzIHRoZSBzcGFubmVy LgotICAgICAgICAgICAgICAgIGRlc2NlbmRhbnQgPSBwcm9jZXNzUG9zc2libGVTcGFubmVyRGVz Y2VuZGFudChzdWJ0cmVlUm9vdCwgc3Bhbm5lcik7CisgICAgICAgICAgICAgICAgZGVzY2VuZGFu dCA9IHByb2Nlc3NQb3NzaWJsZVNwYW5uZXJEZXNjZW5kYW50KHN1YnRyZWVSb290LCAqc3Bhbm5l cik7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAKQEAgLTQxNSw4ICs0MTcsNyBAQCB2b2lkIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6 Zmxvd1RocmVhZERlc2NlbmRhbnRJbnNlcnRlZChSZW5kZXJPYmplY3QqIGRlcwogICAgICAgICAg ICAgQVNTRVJUKCFwbGFjZWhvbGRlci5maXJzdENoaWxkKCkpOyAvLyBUaGVyZSBzaG91bGQgYmUg bm8gY2hpbGRyZW4gaGVyZSwgYnV0IGlmIHRoZXJlIGFyZSwgd2Ugb3VnaHQgdG8gc2tpcCB0aGVt LgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIGRl c2NlbmRhbnQgPSBwcm9jZXNzUG9zc2libGVTcGFubmVyRGVzY2VuZGFudChzdWJ0cmVlUm9vdCwg ZGVzY2VuZGFudCk7CisgICAgICAgIGRlc2NlbmRhbnQgPSBwcm9jZXNzUG9zc2libGVTcGFubmVy RGVzY2VuZGFudChzdWJ0cmVlUm9vdCwgKmRlc2NlbmRhbnQpOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVh ZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVh ZC5oCmluZGV4IGNkYzBmNzQzYjkzMzJkODc1MGZjYzcxZGZhODYwYWRmMzgxYzhkYTYuLmVjOTlk Y2U4NzhiZTJmZjk2NjkyYzU3YWU4ZDMyNzc5ZGQzNTI5ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmgKQEAgLTUz LDkgKzUzLDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBsYXlvdXQoKSBvdmVycmlkZTsKIAotICAg IC8vIEZpbmQgdGhlIHNldCBpbnNpZGUgd2hpY2ggdGhlIHNwZWNpZmllZCByZW5kZXJlciB3b3Vs ZCBiZSByZW5kZXJlZC4KLSAgICBSZW5kZXJNdWx0aUNvbHVtblNldCogZmluZFNldFJlbmRlcmlu ZyhSZW5kZXJPYmplY3QqKSBjb25zdDsKLQogICAgIC8vIFBvcHVsYXRlIHRoZSBmbG93IHRocmVh ZCB3aXRoIHdoYXQncyBjdXJyZW50bHkgaXRzIHNpYmxpbmdzLiBDYWxsZWQgd2hlbiBhIHJlZ3Vs YXIgYmxvY2sKICAgICAvLyBiZWNvbWVzIGEgbXVsdGljb2wgY29udGFpbmVyLgogICAgIHZvaWQg cG9wdWxhdGUoKTsKQEAgLTExNiw3ICsxMTMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkUmVn aW9uVG9UaHJlYWQoUmVuZGVyUmVnaW9uKikgb3ZlcnJpZGU7CiAgICAgdm9pZCB3aWxsQmVSZW1v dmVkRnJvbVRyZWUoKSBvdmVycmlkZTsKICAgICBSZW5kZXJPYmplY3QqIHJlc29sdmVNb3ZlZENo aWxkKFJlbmRlck9iamVjdCogY2hpbGQpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZvaWQgZmxvd1Ro cmVhZERlc2NlbmRhbnRJbnNlcnRlZChSZW5kZXJPYmplY3QqKSBvdmVycmlkZTsKKyAgICB2b2lk IGZsb3dUaHJlYWREZXNjZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0Jikgb3ZlcnJpZGU7CiAg ICAgdm9pZCBmbG93VGhyZWFkUmVsYXRpdmVXaWxsQmVSZW1vdmVkKFJlbmRlck9iamVjdCopIG92 ZXJyaWRlOwogICAgIHZvaWQgZmxvd1RocmVhZERlc2NlbmRhbnRCb3hMYWlkT3V0KFJlbmRlckJv eCopIG92ZXJyaWRlOwogICAgIHZvaWQgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5pdCBs b2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYWxUb3AsIExvZ2ljYWxFeHRlbnRDb21wdXRl ZFZhbHVlcyYpIGNvbnN0IG92ZXJyaWRlOwpAQCAtMTI5LDcgKzEyNiw3IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBpc1BhZ2VMb2dpY2FsSGVpZ2h0S25vd24oKSBjb25zdCBvdmVycmlkZTsKIAogICAg IHZvaWQgaGFuZGxlU3Bhbm5lclJlbW92YWwoUmVuZGVyT2JqZWN0KiBzcGFubmVyKTsKLSAgICBS ZW5kZXJPYmplY3QqIHByb2Nlc3NQb3NzaWJsZVNwYW5uZXJEZXNjZW5kYW50KFJlbmRlck9iamVj dComIHN1YnRyZWVSb290LCBSZW5kZXJPYmplY3QqIGRlc2NlbmRhbnQpOworICAgIFJlbmRlck9i amVjdCogcHJvY2Vzc1Bvc3NpYmxlU3Bhbm5lckRlc2NlbmRhbnQoUmVuZGVyT2JqZWN0KiYgc3Vi dHJlZVJvb3QsIFJlbmRlck9iamVjdCYgZGVzY2VuZGFudCk7CiAgICAgCiBwcml2YXRlOgogICAg IHR5cGVkZWYgSGFzaE1hcDxSZW5kZXJCb3gqLCBSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFj ZWhvbGRlcio+IFNwYW5uZXJNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU2V0LmNwcAppbmRleCA4ZWE2ZmVlYWY4NjcyOTkxNTYxZTZhMzljNzdl MDFlY2VmZDJiYWU5Li43ZDJmYjQzNjI4MTU0Yjk0MjU2NmY5OTc4OWNmNTA4ZjUyYjQ5N2FkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5j cHAKQEAgLTkxLDcgKzkxLDcgQEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJNdWx0aUNvbHVtblNldDo6 bGFzdFJlbmRlcmVySW5GbG93VGhyZWFkKCkgY29uc3QKICAgICByZXR1cm4gZmxvd1RocmVhZCgp LT5sYXN0TGVhZkNoaWxkKCk7CiB9CiAKLXN0YXRpYyBib29sIHByZWNlZGVzUmVuZGVyZXIoUmVu ZGVyT2JqZWN0KiByZW5kZXJlciwgUmVuZGVyT2JqZWN0KiBib3VuZGFyeSkKK3N0YXRpYyBib29s IHByZWNlZGVzUmVuZGVyZXIoY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgY29uc3QgUmVu ZGVyT2JqZWN0KiBib3VuZGFyeSkKIHsKICAgICBmb3IgKDsgcmVuZGVyZXI7IHJlbmRlcmVyID0g cmVuZGVyZXItPm5leHRJblByZU9yZGVyKCkpIHsKICAgICAgICAgaWYgKHJlbmRlcmVyID09IGJv dW5kYXJ5KQpAQCAtMTAwLDExICsxMDAsMTEgQEAgc3RhdGljIGJvb2wgcHJlY2VkZXNSZW5kZXJl cihSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBSZW5kZXJPYmplY3QqIGJvdW5kYXJ5KQogICAgIHJl dHVybiBmYWxzZTsKIH0KIAotYm9vbCBSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29udGFpbnNSZW5k ZXJlckluRmxvd1RocmVhZChSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSBjb25zdAorYm9vbCBSZW5k ZXJNdWx0aUNvbHVtblNldDo6Y29udGFpbnNSZW5kZXJlckluRmxvd1RocmVhZChjb25zdCBSZW5k ZXJPYmplY3QmIHJlbmRlcmVyKSBjb25zdAogewogICAgIGlmICghcHJldmlvdXNTaWJsaW5nTXVs dGlDb2x1bW5TZXQoKSAmJiAhbmV4dFNpYmxpbmdNdWx0aUNvbHVtblNldCgpKSB7CiAgICAgICAg IC8vIFRoZXJlIGlzIG9ubHkgb25lIHNldC4gVGhpcyBpcyBlYXN5LCB0aGVuLgotICAgICAgICBy ZXR1cm4gcmVuZGVyZXItPmlzRGVzY2VuZGFudE9mKG1fZmxvd1RocmVhZCk7CisgICAgICAgIHJl dHVybiByZW5kZXJlci5pc0Rlc2NlbmRhbnRPZihtX2Zsb3dUaHJlYWQpOwogICAgIH0KIAogICAg IFJlbmRlck9iamVjdCogZmlyc3RSZW5kZXJlciA9IGZpcnN0UmVuZGVyZXJJbkZsb3dUaHJlYWQo KTsKQEAgLTExMyw3ICsxMTMsNyBAQCBib29sIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb250YWlu c1JlbmRlcmVySW5GbG93VGhyZWFkKFJlbmRlck9iamVjdCogcmVuZGVyZXIpCiAgICAgQVNTRVJU KGxhc3RSZW5kZXJlcik7CiAKICAgICAvLyBUaGlzIGlzIFNMT1chIEJ1dCBsdWNraWx5IHZlcnkg dW5jb21tb24uCi0gICAgcmV0dXJuIHByZWNlZGVzUmVuZGVyZXIoZmlyc3RSZW5kZXJlciwgcmVu ZGVyZXIpICYmIHByZWNlZGVzUmVuZGVyZXIocmVuZGVyZXIsIGxhc3RSZW5kZXJlcik7CisgICAg cmV0dXJuIHByZWNlZGVzUmVuZGVyZXIoZmlyc3RSZW5kZXJlciwgJnJlbmRlcmVyKSAmJiBwcmVj ZWRlc1JlbmRlcmVyKCZyZW5kZXJlciwgbGFzdFJlbmRlcmVyKTsKIH0KIAogdm9pZCBSZW5kZXJN dWx0aUNvbHVtblNldDo6c2V0TG9naWNhbFRvcEluRmxvd1RocmVhZChMYXlvdXRVbml0IGxvZ2lj YWxUb3ApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlD b2x1bW5TZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNl dC5oCmluZGV4IDQxMTU0Nzc1M2Y1ODc0NGIyZmVhNGY2NTcwMGU5ZjA5ZGUzMWQ4ODIuLjdjOTk0 MjM1NWQ4OTcxN2E4ZGZhYjdiYzM2Njc2YzZmNDdlMDBkNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCkBAIC02MCw3ICs2MCw3IEBAIHB1 YmxpYzoKICAgICBSZW5kZXJPYmplY3QqIGxhc3RSZW5kZXJlckluRmxvd1RocmVhZCgpIGNvbnN0 OwogCiAgICAgLy8gUmV0dXJuIHRydWUgaWYgdGhlIHNwZWNpZmllZCByZW5kZXJlciAoZGVzY2Vu ZGFudCBvZiB0aGUgZmxvdyB0aHJlYWQpIGlzIGluc2lkZSB0aGlzIGNvbHVtbiBzZXQuCi0gICAg Ym9vbCBjb250YWluc1JlbmRlcmVySW5GbG93VGhyZWFkKFJlbmRlck9iamVjdCopIGNvbnN0Owor ICAgIGJvb2wgY29udGFpbnNSZW5kZXJlckluRmxvd1RocmVhZChjb25zdCBSZW5kZXJPYmplY3Qm KSBjb25zdDsKIAogICAgIHZvaWQgc2V0TG9naWNhbFRvcEluRmxvd1RocmVhZChMYXlvdXRVbml0 KTsKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3BJbkZsb3dUaHJlYWQoKSBjb25zdCB7IHJldHVy biBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gZmxvd1RocmVhZFBvcnRpb25SZWN0KCkueSgp IDogZmxvd1RocmVhZFBvcnRpb25SZWN0KCkueCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9s ZGVyLmNwcAppbmRleCA5ZGUyZDY4MmFmY2ZiOGQwMzI1NTQzMzJkM2Y3ZGMwZGJhNWU3OWUyLi44 ZmIwZDQwOTg0ZWYwOWIyOTYyNGFhYTcyOWEzMGNjMWQxNDgyNDMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNwYW5u ZXJQbGFjZWhvbGRlci5jcHAKQEAgLTM0LDcgKzM0LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1SZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlciogUmVuZGVyTXVsdGlDb2x1 bW5TcGFubmVyUGxhY2Vob2xkZXI6OmNyZWF0ZUFub255bW91cyhSZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQqIGZsb3dUaHJlYWQsIFJlbmRlckJveCogc3Bhbm5lciwgY29uc3QgUmVuZGVyU3R5 bGUqIHBhcmVudFN0eWxlKQorUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxhY2Vob2xkZXIqIFJl bmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyOjpjcmVhdGVBbm9ueW1vdXMoUmVuZGVy TXVsdGlDb2x1bW5GbG93VGhyZWFkKiBmbG93VGhyZWFkLCBSZW5kZXJCb3gmIHNwYW5uZXIsIGNv bnN0IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSkKIHsKICAgICBhdXRvIG5ld1N0eWxlID0gUmVu ZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkoKnBhcmVudFN0eWxlLCBC TE9DSyk7CiAgICAgbmV3U3R5bGUuc2V0Q2xlYXIoQ0JPVEgpOyAvLyBXZSBkb24ndCB3YW50IGZs b2F0cyBpbiB0aGUgcm93IHByZWNlZGluZyB0aGUgc3Bhbm5lciB0byBjb250aW51ZSBvbiB0aGUg b3RoZXIgc2lkZS4KQEAgLTQzLDkgKzQzLDkgQEAgUmVuZGVyTXVsdGlDb2x1bW5TcGFubmVyUGxh Y2Vob2xkZXIqIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyOjpjcmVhdGUKICAg ICByZXR1cm4gcGxhY2Vob2xkZXI7CiB9CiAKLVJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNl aG9sZGVyOjpSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlcihSZW5kZXJNdWx0aUNv bHVtbkZsb3dUaHJlYWQqIGZsb3dUaHJlYWQsIFJlbmRlckJveCogc3Bhbm5lciwgUmVuZGVyU3R5 bGUmJiBzdHlsZSkKK1JlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyOjpSZW5kZXJN dWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlcihSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQq IGZsb3dUaHJlYWQsIFJlbmRlckJveCYgc3Bhbm5lciwgUmVuZGVyU3R5bGUmJiBzdHlsZSkKICAg ICA6IFJlbmRlckJveChmbG93VGhyZWFkLT5kb2N1bWVudCgpLCBXVEZNb3ZlKHN0eWxlKSwgUmVu ZGVyQm94TW9kZWxPYmplY3RGbGFnKQotICAgICwgbV9zcGFubmVyKHNwYW5uZXIpCisgICAgLCBt X3NwYW5uZXIoJnNwYW5uZXIpCiAgICAgLCBtX2Zsb3dUaHJlYWQoZmxvd1RocmVhZCkKIHsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNw YW5uZXJQbGFjZWhvbGRlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRp Q29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyLmgKaW5kZXggZWI0NjZkOTJlNjRlNzEzOTE2MmE4ZWY0 ZThjZTE1MjYwODEwMDE1Yi4uMzk1NTI5ZTAyOGZkNWRkNjFkZTA2NTIwMTU2OTVhYmZiNGM0ODIw ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1u U3Bhbm5lclBsYWNlaG9sZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyLmgKQEAgLTM4LDEzICszOCwxMyBAQCBjbGFz cyBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ7CiAKIGNsYXNzIFJlbmRlck11bHRpQ29sdW1u U3Bhbm5lclBsYWNlaG9sZGVyIGZpbmFsIDogcHVibGljIFJlbmRlckJveCB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFJlbmRlck11bHRpQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKiBjcmVhdGVBbm9u eW1vdXMoUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkKiwgUmVuZGVyQm94KiBzcGFubmVyLCBj b25zdCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUpOworICAgIHN0YXRpYyBSZW5kZXJNdWx0aUNv bHVtblNwYW5uZXJQbGFjZWhvbGRlciogY3JlYXRlQW5vbnltb3VzKFJlbmRlck11bHRpQ29sdW1u Rmxvd1RocmVhZCosIFJlbmRlckJveCYgc3Bhbm5lciwgY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVu dFN0eWxlKTsKIAogICAgIFJlbmRlckJveCogc3Bhbm5lcigpIGNvbnN0IHsgcmV0dXJuIG1fc3Bh bm5lcjsgfQogICAgIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCogZmxvd1RocmVhZCgpIGNv bnN0IHsgcmV0dXJuIG1fZmxvd1RocmVhZDsgfQogCiBwcml2YXRlOgotICAgIFJlbmRlck11bHRp Q29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZCosIFJl bmRlckJveCogc3Bhbm5lciwgUmVuZGVyU3R5bGUmJik7CisgICAgUmVuZGVyTXVsdGlDb2x1bW5T cGFubmVyUGxhY2Vob2xkZXIoUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkKiwgUmVuZGVyQm94 JiBzcGFubmVyLCBSZW5kZXJTdHlsZSYmKTsKICAgICBib29sIGlzUmVuZGVyTXVsdGlDb2x1bW5T cGFubmVyUGxhY2Vob2xkZXIoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAKICAg ICBib29sIGNhbkhhdmVDaGlsZHJlbigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDUwMmE3NzY1 ZThkM2Y2ZWE4NzQyZDEwYTc5NDgxYzBhMmU5NDRjNmEuLjk5ZWNjNzYxNjRlY2IxNDY4OTZmMzhk ZGM0ZWZiMjcyODc2NWQxNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCkBAIC0xNDIxLDcgKzE0MjEsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6aW5zZXJ0ZWRJ bnRvVHJlZSgpCiAgICAgICAgIHBhcmVudCgpLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCgq dGhpcyk7CiAKICAgICBpZiAoUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCA9IGZsb3dUaHJl YWRDb250YWluaW5nQmxvY2soKSkKLSAgICAgICAgZmxvd1RocmVhZC0+Zmxvd1RocmVhZERlc2Nl bmRhbnRJbnNlcnRlZCh0aGlzKTsKKyAgICAgICAgZmxvd1RocmVhZC0+Zmxvd1RocmVhZERlc2Nl bmRhbnRJbnNlcnRlZCgqdGhpcyk7CiB9CiAKIHZvaWQgUmVuZGVyT2JqZWN0Ojp3aWxsQmVSZW1v dmVkRnJvbVRyZWUoKQo=