110721 2013-02-24 21:35:09 -0800 Fix style errors in WebCore/editing/{htmlediting,markup,visible_units}.* 2013-02-25 01:44:07 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109781 1 tkent tkent mifenton rniwa webkit.review.bot oldest_to_newest 840698 0 tkent 2013-02-24 21:35:09 -0800 Fix style errors in WebCore/editing/{htmlediting,markup,visible_units}.* 840699 1 189997 tkent 2013-02-24 21:37:32 -0800 Created attachment 189997 Patch 840725 2 189997 webkit.review.bot 2013-02-24 23:29:16 -0800 Comment on attachment 189997 Patch Rejecting attachment 189997 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 189997, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: -conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 54>At revision 13692. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Updating OpenSource fatal: read error: Connection reset by peer Died at Tools/Scripts/update-webkit line 151. Full output: http://queues.webkit.org/results/16667066 840798 3 189997 webkit.review.bot 2013-02-25 01:44:04 -0800 Comment on attachment 189997 Patch Clearing flags on attachment: 189997 Committed r143893: <http://trac.webkit.org/changeset/143893> 840799 4 webkit.review.bot 2013-02-25 01:44:07 -0800 All reviewed patches have been landed. Closing bug. 189997 2013-02-24 21:37:32 -0800 2013-02-25 01:44:04 -0800 Patch bug-110721-20130225143347.patch text/plain 20086 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIxMWFhMWEyNjNhYWNi ZDgyNDIyODJlZDYxZjRiYWMyZjZhZWFmZC4uYTY0M2E2ZGFhNWQyNzkwNjkxYzllYjJiOTk4YjU2 MzQ3NzU3OTMwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEzLTAyLTI0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggc3R5bGUgZXJyb3Jz IGluIFdlYkNvcmUvZWRpdGluZy97aHRtbGVkaXRpbmcsbWFya3VwLHZpc2libGVfdW5pdHN9LioK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDcyMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gVGhpcyBzaG91bGQgbm90IG1ha2UgYW55IGJhaGV2aW9yIGNoYW5nZXMuCisKKyAgICAg ICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxvd2VzdEVk aXRhYmxlQW5jZXN0b3IpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpp c1NwZWNpYWxFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmVuY2xvc2luZ0xpc3RDaGlsZCk6 CisgICAgICAgIChXZWJDb3JlOjpjYW5NZXJnZUxpc3RzKToKKyAgICAgICAgKFdlYkNvcmU6OnRh YlNwYW5Ob2RlKToKKyAgICAgICAgKFdlYkNvcmU6OmlzTm9kZVJlbmRlcmVkKToKKyAgICAgICAg KFdlYkNvcmU6OmNhcmV0TWF4T2Zmc2V0KToKKyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5n Lmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrdXBBY2N1bXVsYXRvcjo6YXBwZW5kRWxlbWVudCk6 CisgICAgICAgICogZWRpdGluZy9tYXJrdXAuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIGVkaXRpbmcvdmlzaWJsZV91bml0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmV2aW91 c1Jvb3RJbmxpbmVCb3hDYW5kaWRhdGVQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpuZXh0 Um9vdElubGluZUJveENhbmRpZGF0ZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OndvcmRC cmVha0l0ZXJhdG9yRm9yTWluT2Zmc2V0Qm91bmRhcnkpOgorICAgICAgICAoV2ViQ29yZTo6cHJl dmlvdXNCb3VuZGFyeSk6CisgICAgICAgIChXZWJDb3JlOjplbmRPZkxpbmUpOgorICAgICAgICAo V2ViQ29yZTo6cHJldmlvdXNMaW5lUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6bmV4dExp bmVQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpuZXh0U2VudGVuY2VQb3NpdGlvbkJvdW5k YXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OnN0YXJ0T2ZQYXJhZ3JhcGgpOgorICAgICAgICAoV2Vi Q29yZTo6ZW5kT2ZQYXJhZ3JhcGgpOgorCiAyMDEzLTAyLTI0ICBFcmljIENhcmxzb24gIDxlcmlj LmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIGNsZWFudXAgTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uIGFuZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCmluZGV4IDY1MzgyNjhhYTdjZGE5YWIzNzkxMjZl Yzg3MTgxNzQyZWU1MWM5YmUuLjI0ZWI2ZWFmZTU5ZjE0ZjhjMzU5ODcyMWMyMzMxYjUxMzVmM2Fj YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCkBAIC0zNCwxOCArMzQs MTggQEAKICNpbmNsdWRlICJIVE1MQlJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTERpdkVsZW1l bnQuaCIKICNpbmNsdWRlICJIVE1MRWxlbWVudEZhY3RvcnkuaCIKLSNpbmNsdWRlICJIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxJbnRlcmNoYW5nZS5oIgogI2lu Y2x1ZGUgIkhUTUxMSUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKLSNpbmNsdWRl ICJIVE1MT2JqZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxPTGlzdEVsZW1lbnQuaCIKKyNp bmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxQYXJhZ3JhcGhFbGVt ZW50LmgiCisjaW5jbHVkZSAiSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MVUxpc3RFbGVtZW50LmgiCiAjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgogI2luY2x1 ZGUgIlBvc2l0aW9uSXRlcmF0b3IuaCIKLSNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNs dWRlICJSYW5nZS5oIgorI2luY2x1ZGUgIlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlNoYWRv d1Jvb3QuaCIKICNpbmNsdWRlICJUZXh0LmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCkBA IC0xMzMsNyArMTMzLDcgQEAgTm9kZSogbG93ZXN0RWRpdGFibGVBbmNlc3RvcihOb2RlKiBub2Rl KQogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCi0gICAgTm9kZSAqbG93 ZXN0Um9vdCA9IDA7CisgICAgTm9kZSogbG93ZXN0Um9vdCA9IDA7CiAgICAgd2hpbGUgKG5vZGUp IHsKICAgICAgICAgaWYgKG5vZGUtPnJlbmRlcmVySXNFZGl0YWJsZSgpKQogICAgICAgICAgICAg cmV0dXJuIG5vZGUtPnJvb3RFZGl0YWJsZUVsZW1lbnQoKTsKQEAgLTMxNSw3ICszMTUsNyBAQCBi b29sIGlzSW5saW5lKGNvbnN0IE5vZGUqIG5vZGUpCiB9CiAKIC8vIEZJWE1FOiBEZXBsb3kgdGhp cyBpbiBhbGwgb2YgdGhlIHBsYWNlcyB3aGVyZSBlbmNsb3NpbmdCbG9ja0Zsb3cvZW5jbG9zaW5n QmxvY2tGbG93T3JUYWJsZUVsZW1lbnQgYXJlIHVzZWQuCi0vLyBGSVhNRTogUGFzcyBhIHBvc2l0 aW9uIHRvIHRoaXMgZnVuY3Rpb24uICBUaGUgZW5jbG9zaW5nIGJsb2NrIG9mIFt0YWJsZSwgeF0g Zm9yIGV4YW1wbGUsIHNob3VsZCBiZSB0aGUgCisvLyBGSVhNRTogUGFzcyBhIHBvc2l0aW9uIHRv IHRoaXMgZnVuY3Rpb24uIFRoZSBlbmNsb3NpbmcgYmxvY2sgb2YgW3RhYmxlLCB4XSBmb3IgZXhh bXBsZSwgc2hvdWxkIGJlIHRoZSAKIC8vIGJsb2NrIHRoYXQgY29udGFpbnMgdGhlIHRhYmxlIGFu ZCBub3QgdGhlIHRhYmxlLCBhbmQgdGhpcyBmdW5jdGlvbiBzaG91bGQgYmUgdGhlIG9ubHkgb25l IHJlc3BvbnNpYmxlIGZvciAKIC8vIGtub3dpbmcgYWJvdXQgdGhlc2Uga2luZHMgb2Ygc3BlY2lh bCBjYXNlcy4KIEVsZW1lbnQqIGVuY2xvc2luZ0Jsb2NrKE5vZGUqIG5vZGUsIEVkaXRpbmdCb3Vu ZGFyeUNyb3NzaW5nUnVsZSBydWxlKQpAQCAtMzM0LDggKzMzNCw4IEBAIFRleHREaXJlY3Rpb24g ZGlyZWN0aW9uT2ZFbmNsb3NpbmdCbG9jayhjb25zdCBQb3NpdGlvbiYgcG9zaXRpb24pCiB9CiAK IC8vIFRoaXMgbWV0aG9kIGlzIHVzZWQgdG8gY3JlYXRlIHBvc2l0aW9ucyBpbiB0aGUgRE9NLiBJ dCByZXR1cm5zIHRoZSBtYXhpbXVtIHZhbGlkIG9mZnNldAotLy8gaW4gYSBub2RlLiAgSXQgcmV0 dXJucyAxIGZvciBzb21lIGVsZW1lbnRzIGV2ZW4gdGhvdWdoIHRoZXkgZG8gbm90IGhhdmUgY2hp bGRyZW4sIHdoaWNoCi0vLyBjcmVhdGVzIHRlY2huaWNhbGx5IGludmFsaWQgRE9NIFBvc2l0aW9u cy4gIEJlIHN1cmUgdG8gY2FsbCBwYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQKKy8vIGluIGEgbm9k ZS4gSXQgcmV0dXJucyAxIGZvciBzb21lIGVsZW1lbnRzIGV2ZW4gdGhvdWdoIHRoZXkgZG8gbm90 IGhhdmUgY2hpbGRyZW4sIHdoaWNoCisvLyBjcmVhdGVzIHRlY2huaWNhbGx5IGludmFsaWQgRE9N IFBvc2l0aW9ucy4gQmUgc3VyZSB0byBjYWxsIHBhcmVudEFuY2hvcmVkRXF1aXZhbGVudAogLy8g b24gYSBQb3NpdGlvbiBiZWZvcmUgdXNpbmcgaXQgdG8gY3JlYXRlIGEgRE9NIFJhbmdlLCBvciBh biBleGNlcHRpb24gd2lsbCBiZSB0aHJvd24uCiBpbnQgbGFzdE9mZnNldEZvckVkaXRpbmcoY29u c3QgTm9kZSogbm9kZSkKIHsKQEAgLTQwNCw3ICs0MDQsNyBAQCBib29sIGlzU3BlY2lhbEVsZW1l bnQoY29uc3QgTm9kZSAqbikKICAgICBpZiAobi0+aXNMaW5rKCkpCiAgICAgICAgIHJldHVybiB0 cnVlOwogCi0gICAgUmVuZGVyT2JqZWN0ICpyZW5kZXJlciA9IG4tPnJlbmRlcmVyKCk7CisgICAg UmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG4tPnJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJl cikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAKQEAgLTcwNiw3ICs3MDYsNyBAQCBO b2RlKiBlbmNsb3NpbmdMaXN0Q2hpbGQoTm9kZSAqbm9kZSkKIHsKICAgICBpZiAoIW5vZGUpCiAg ICAgICAgIHJldHVybiAwOwotICAgIC8vIENoZWNrIGZvciBhIGxpc3QgaXRlbSBlbGVtZW50LCBv ciBmb3IgYSBub2RlIHdob3NlIHBhcmVudCBpcyBhIGxpc3QgZWxlbWVudC4gIFN1Y2ggYSBub2Rl CisgICAgLy8gQ2hlY2sgZm9yIGEgbGlzdCBpdGVtIGVsZW1lbnQsIG9yIGZvciBhIG5vZGUgd2hv c2UgcGFyZW50IGlzIGEgbGlzdCBlbGVtZW50LiBTdWNoIGEgbm9kZQogICAgIC8vIHdpbGwgYXBw ZWFyIHZpc3VhbGx5IGFzIGEgbGlzdCBpdGVtIChidXQgd2l0aG91dCBhIGxpc3QgbWFya2VyKQog ICAgIE5vZGUqIHJvb3QgPSBoaWdoZXN0RWRpdGFibGVSb290KGZpcnN0UG9zaXRpb25Jbk9yQmVm b3JlTm9kZShub2RlKSk7CiAgICAgCkBAIC03ODUsOSArNzg1LDkgQEAgYm9vbCBjYW5NZXJnZUxp c3RzKEVsZW1lbnQqIGZpcnN0TGlzdCwgRWxlbWVudCogc2Vjb25kTGlzdCkKICAgICBpZiAoIWZp cnN0TGlzdCB8fCAhc2Vjb25kTGlzdCB8fCAhZmlyc3RMaXN0LT5pc0hUTUxFbGVtZW50KCkgfHwg IXNlY29uZExpc3QtPmlzSFRNTEVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgcmV0dXJuIGZpcnN0TGlzdC0+aGFzVGFnTmFtZShzZWNvbmRMaXN0LT50YWdRTmFtZSgpKS8v IG1ha2Ugc3VyZSB0aGUgbGlzdCB0eXBlcyBtYXRjaCAob2wgdnMuIHVsKQorICAgIHJldHVybiBm aXJzdExpc3QtPmhhc1RhZ05hbWUoc2Vjb25kTGlzdC0+dGFnUU5hbWUoKSkgLy8gbWFrZSBzdXJl IHRoZSBsaXN0IHR5cGVzIG1hdGNoIChvbCB2cy4gdWwpCiAgICAgJiYgZmlyc3RMaXN0LT5yZW5k ZXJlcklzRWRpdGFibGUoKSAmJiBzZWNvbmRMaXN0LT5yZW5kZXJlcklzRWRpdGFibGUoKSAvLyBi b3RoIGxpc3RzIGFyZSBlZGl0YWJsZQotICAgICYmIGZpcnN0TGlzdC0+cm9vdEVkaXRhYmxlRWxl bWVudCgpID09IHNlY29uZExpc3QtPnJvb3RFZGl0YWJsZUVsZW1lbnQoKS8vIGRvbid0IGNyb3Nz IGVkaXRpbmcgYm91bmRhcmllcworICAgICYmIGZpcnN0TGlzdC0+cm9vdEVkaXRhYmxlRWxlbWVu dCgpID09IHNlY29uZExpc3QtPnJvb3RFZGl0YWJsZUVsZW1lbnQoKSAvLyBkb24ndCBjcm9zcyBl ZGl0aW5nIGJvdW5kYXJpZXMKICAgICAmJiBpc1Zpc2libHlBZGphY2VudChwb3NpdGlvbkluUGFy ZW50QWZ0ZXJOb2RlKGZpcnN0TGlzdCksIHBvc2l0aW9uSW5QYXJlbnRCZWZvcmVOb2RlKHNlY29u ZExpc3QpKTsKICAgICAvLyBNYWtlIHN1cmUgdGhlcmUgaXMgbm8gdmlzaWJsZSBjb250ZW50IGJl dHdlZW4gdGhpcyBsaSBhbmQgdGhlIHByZXZpb3VzIGxpc3QKIH0KQEAgLTkwNiw3ICs5MDYsNyBA QCBib29sIGlzVGFiU3BhblRleHROb2RlKGNvbnN0IE5vZGUgKm5vZGUpCiAgICAgcmV0dXJuIG5v ZGUgJiYgbm9kZS0+aXNUZXh0Tm9kZSgpICYmIG5vZGUtPnBhcmVudE5vZGUoKSAmJiBpc1RhYlNw YW5Ob2RlKG5vZGUtPnBhcmVudE5vZGUoKSk7CiB9CiAKLU5vZGUgKnRhYlNwYW5Ob2RlKGNvbnN0 IE5vZGUgKm5vZGUpCitOb2RlKiB0YWJTcGFuTm9kZShjb25zdCBOb2RlICpub2RlKQogewogICAg IHJldHVybiBpc1RhYlNwYW5UZXh0Tm9kZShub2RlKSA/IG5vZGUtPnBhcmVudE5vZGUoKSA6IDA7 CiB9CkBAIC05NTgsNyArOTU4LDcgQEAgYm9vbCBpc05vZGVSZW5kZXJlZChjb25zdCBOb2RlICpu b2RlKQogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgUmVuZGVy T2JqZWN0ICpyZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2JqZWN0KiBy ZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCkBAIC0xMDI3LDcgKzEwMjcsNyBAQCBpbnQgY2FyZXRNYXhPZmZzZXQo Y29uc3QgTm9kZSogbikKICAgICAvLyBGb3IgcmVuZGVyZWQgdGV4dCBub2RlcywgcmV0dXJuIHRo ZSBsYXN0IHBvc2l0aW9uIHRoYXQgYSBjYXJldCBjb3VsZCBvY2N1cHkuCiAgICAgaWYgKG4tPmlz VGV4dE5vZGUoKSAmJiBuLT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm4gbi0+cmVuZGVyZXIo KS0+Y2FyZXRNYXhPZmZzZXQoKTsKLSAgICAvLyBGb3IgY29udGFpbmVycyByZXR1cm4gdGhlIG51 bWJlciBvZiBjaGlsZHJlbi4gIEZvciBvdGhlcnMgZG8gdGhlIHNhbWUgYXMgYWJvdmUuCisgICAg Ly8gRm9yIGNvbnRhaW5lcnMgcmV0dXJuIHRoZSBudW1iZXIgb2YgY2hpbGRyZW4uIEZvciBvdGhl cnMgZG8gdGhlIHNhbWUgYXMgYWJvdmUuCiAgICAgcmV0dXJuIGxhc3RPZmZzZXRGb3JFZGl0aW5n KG4pOwogfQogCkBAIC0xMDg5LDcgKzEwODksNiBAQCBWaXNpYmxlU2VsZWN0aW9uIHNlbGVjdGlv bkZvclBhcmFncmFwaEl0ZXJhdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvcmlnaW5hbAog Ly8gb3BlcnRpb24gaXMgdW5yZWxpYWJsZS4gVGV4dEl0ZXJhdG9yJ3MgVGV4dEl0ZXJhdG9yRW1p dHNDaGFyYWN0ZXJzQmV0d2VlbkFsbFZpc2libGVQb3NpdGlvbnMgbW9kZSBuZWVkcyB0byBiZSBm aXhlZCwgCiAvLyBvciB0aGVzZSBmdW5jdGlvbnMgbmVlZCB0byBiZSBjaGFuZ2VkIHRvIGl0ZXJh dGUgdXNpbmcgYWN0dWFsIFZpc2libGVQb3NpdGlvbnMuCiAvLyBGSVhNRTogRGVwbG95IHRoZXNl IGZ1bmN0aW9ucyBldmVyeXdoZXJlIHRoYXQgVGV4dEl0ZXJhdG9ycyBhcmUgdXNlZCB0byBjb252 ZXJ0IGJldHdlZW4gVmlzaWJsZVBvc2l0aW9ucyBhbmQgaW5kaWNlcy4KLSAKIGludCBpbmRleEZv clZpc2libGVQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24mIHZpc2libGVQb3NpdGlvbiwg UmVmUHRyPENvbnRhaW5lck5vZGU+JiBzY29wZSkKIHsKICAgICBpZiAodmlzaWJsZVBvc2l0aW9u LmlzTnVsbCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGlu Zy5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oCmluZGV4IDg4YzZiYjAw MjM5YWViNjg4MmM0ZWQyNGYwYzI4OGFiNTNmOGJiYzMuLmZhNjMyNTQ3NjhhMTIyOGY0M2ZhMWI2 NGQwMDk1YmMyMzg1ZjdiYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRt bGVkaXRpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgKQEAg LTEyOCw5ICsxMjgsOSBAQCBQb3NpdGlvbiBuZXh0VmlzdWFsbHlEaXN0aW5jdENhbmRpZGF0ZShj b25zdCBQb3NpdGlvbiYpOwogUG9zaXRpb24gcHJldmlvdXNWaXN1YWxseURpc3RpbmN0Q2FuZGlk YXRlKGNvbnN0IFBvc2l0aW9uJik7CiAKIFBvc2l0aW9uIHBvc2l0aW9uT3V0c2lkZVRhYlNwYW4o Y29uc3QgUG9zaXRpb24mKTsKLVBvc2l0aW9uIHBvc2l0aW9uQmVmb3JlQ29udGFpbmluZ1NwZWNp YWxFbGVtZW50KGNvbnN0IFBvc2l0aW9uJiwgTm9kZSoqIGNvbnRhaW5pbmdTcGVjaWFsRWxlbWVu dD0wKTsKLVBvc2l0aW9uIHBvc2l0aW9uQWZ0ZXJDb250YWluaW5nU3BlY2lhbEVsZW1lbnQoY29u c3QgUG9zaXRpb24mLCBOb2RlKiogY29udGFpbmluZ1NwZWNpYWxFbGVtZW50PTApOwotUG9zaXRp b24gcG9zaXRpb25PdXRzaWRlQ29udGFpbmluZ1NwZWNpYWxFbGVtZW50KGNvbnN0IFBvc2l0aW9u JiwgTm9kZSoqIGNvbnRhaW5pbmdTcGVjaWFsRWxlbWVudD0wKTsKK1Bvc2l0aW9uIHBvc2l0aW9u QmVmb3JlQ29udGFpbmluZ1NwZWNpYWxFbGVtZW50KGNvbnN0IFBvc2l0aW9uJiwgTm9kZSoqIGNv bnRhaW5pbmdTcGVjaWFsRWxlbWVudCA9IDApOworUG9zaXRpb24gcG9zaXRpb25BZnRlckNvbnRh aW5pbmdTcGVjaWFsRWxlbWVudChjb25zdCBQb3NpdGlvbiYsIE5vZGUqKiBjb250YWluaW5nU3Bl Y2lhbEVsZW1lbnQgPSAwKTsKK1Bvc2l0aW9uIHBvc2l0aW9uT3V0c2lkZUNvbnRhaW5pbmdTcGVj aWFsRWxlbWVudChjb25zdCBQb3NpdGlvbiYsIE5vZGUqKiBjb250YWluaW5nU3BlY2lhbEVsZW1l bnQgPSAwKTsKIAogaW5saW5lIFBvc2l0aW9uIGZpcnN0UG9zaXRpb25Jbk9yQmVmb3JlTm9kZShO b2RlKiBub2RlKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAu Y3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCmluZGV4IDU5ZGI0MmFmNmMx N2IxNzI0YjA1M2VhOTE3MjAzZjUzNmI0N2Q3MDIuLmQzMjc3YzM2NjY2NjdhM2RhNjI5MmE3YTc5 YTUxN2VlMTU0MTJjNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3Vw LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKQEAgLTI5Miw3ICsy OTIsNyBAQCB2b2lkIFN0eWxlZE1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRFbGVtZW50KFN0cmlu Z0J1aWxkZXImIG91dCwgRWxlbWVudCogZWxlbWVudAogICAgIGNvbnN0IHVuc2lnbmVkIGxlbmd0 aCA9IGVsZW1lbnQtPmhhc0F0dHJpYnV0ZXMoKSA/IGVsZW1lbnQtPmF0dHJpYnV0ZUNvdW50KCkg OiAwOwogICAgIGNvbnN0IGJvb2wgc2hvdWxkQW5ub3RhdGVPckZvcmNlSW5saW5lID0gZWxlbWVu dC0+aXNIVE1MRWxlbWVudCgpICYmIChzaG91bGRBbm5vdGF0ZSgpIHx8IGFkZERpc3BsYXlJbmxp bmUpOwogICAgIGNvbnN0IGJvb2wgc2hvdWxkT3ZlcnJpZGVTdHlsZUF0dHIgPSBzaG91bGRBbm5v dGF0ZU9yRm9yY2VJbmxpbmUgfHwgc2hvdWxkQXBwbHlXcmFwcGluZ1N0eWxlKGVsZW1lbnQpOwot ICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKICAgICAgICAgY29uc3QgQXR0cmli dXRlKiBhdHRyaWJ1dGUgPSBlbGVtZW50LT5hdHRyaWJ1dGVJdGVtKGkpOwogICAgICAgICAvLyBX ZSdsbCBoYW5kbGUgdGhlIHN0eWxlIGF0dHJpYnV0ZSBzZXBhcmF0ZWx5LCBiZWxvdy4KICAgICAg ICAgaWYgKGF0dHJpYnV0ZS0+bmFtZSgpID09IHN0eWxlQXR0ciAmJiBzaG91bGRPdmVycmlkZVN0 eWxlQXR0cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmggYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5oCmluZGV4IGNhMjBjOWFjZjRhODU0MDM0OWFm MTViNGQ4NjcxZGViNjY1ZGI4YzkuLjgzMzUwZjE0MTFhZjhkZmVjM2ExNDhmYzE1MDgxNTBlZTY1 MjExODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmgKKysrIGIv U291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuaApAQCAtMzMsNDMgKzMzLDQ0IEBACiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotICAgIGNsYXNzIENvbnRhaW5lck5vZGU7Ci0gICAgY2xhc3Mg RG9jdW1lbnQ7Ci0gICAgY2xhc3MgRG9jdW1lbnRGcmFnbWVudDsKLSAgICBjbGFzcyBFbGVtZW50 OwotICAgIGNsYXNzIEhUTUxFbGVtZW50OwotICAgIGNsYXNzIEtVUkw7Ci0gICAgY2xhc3MgTm9k ZTsKLSAgICBjbGFzcyBRdWFsaWZpZWROYW1lOwotICAgIGNsYXNzIFJhbmdlOworY2xhc3MgQ29u dGFpbmVyTm9kZTsKK2NsYXNzIERvY3VtZW50OworY2xhc3MgRG9jdW1lbnRGcmFnbWVudDsKK2Ns YXNzIEVsZW1lbnQ7CitjbGFzcyBIVE1MRWxlbWVudDsKK2NsYXNzIEtVUkw7CitjbGFzcyBOb2Rl OworY2xhc3MgUXVhbGlmaWVkTmFtZTsKK2NsYXNzIFJhbmdlOwogCi0gICAgdHlwZWRlZiBpbnQg RXhjZXB0aW9uQ29kZTsKK3R5cGVkZWYgaW50IEV4Y2VwdGlvbkNvZGU7CiAKLSAgICBlbnVtIEVD aGlsZHJlbk9ubHkgeyBJbmNsdWRlTm9kZSwgQ2hpbGRyZW5Pbmx5IH07Ci0gICAgZW51bSBFQWJz b2x1dGVVUkxzIHsgRG9Ob3RSZXNvbHZlVVJMcywgUmVzb2x2ZUFsbFVSTHMsIFJlc29sdmVOb25M b2NhbFVSTHMgfTsKK2VudW0gRUNoaWxkcmVuT25seSB7IEluY2x1ZGVOb2RlLCBDaGlsZHJlbk9u bHkgfTsKK2VudW0gRUFic29sdXRlVVJMcyB7IERvTm90UmVzb2x2ZVVSTHMsIFJlc29sdmVBbGxV UkxzLCBSZXNvbHZlTm9uTG9jYWxVUkxzIH07CiAKLSAgICBQYXNzUmVmUHRyPERvY3VtZW50RnJh Z21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbVRleHQoUmFuZ2UqIGNvbnRleHQsIGNvbnN0IFN0cmlu ZyYgdGV4dCk7Ci0gICAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVu dEZyb21NYXJrdXAoRG9jdW1lbnQqLCBjb25zdCBTdHJpbmcmIG1hcmt1cCwgY29uc3QgU3RyaW5n JiBiYXNlVVJMLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gPSBBbGxvd1NjcmlwdGluZ0Nv bnRlbnQpOwotICAgIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRG cm9tTWFya3VwV2l0aENvbnRleHQoRG9jdW1lbnQqLCBjb25zdCBTdHJpbmcmIG1hcmt1cCwgdW5z aWduZWQgZnJhZ21lbnRTdGFydCwgdW5zaWduZWQgZnJhZ21lbnRFbmQsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uKTsKLSAgICBQYXNzUmVmUHRyPERv Y3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbU5vZGVzKERvY3VtZW50KiwgY29uc3Qg VmVjdG9yPE5vZGUqPiYpOwotICAgIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRl RnJhZ21lbnRGb3JJbm5lck91dGVySFRNTChjb25zdCBTdHJpbmcmLCBFbGVtZW50KiwgRnJhZ21l bnRTY3JpcHRpbmdQZXJtaXNzaW9uLCBFeGNlcHRpb25Db2RlJik7Ci0gICAgUGFzc1JlZlB0cjxE b2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZvclRyYW5zZm9ybVRvRnJhZ21lbnQoY29u c3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBzb3VyY2VNSU1FVHlwZSwgRG9jdW1lbnQqIG91dHB1 dERvYyk7Ci0gICAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVDb250ZXh0dWFs RnJhZ21lbnQoY29uc3QgU3RyaW5nJiwgSFRNTEVsZW1lbnQqLCBGcmFnbWVudFNjcmlwdGluZ1Bl cm1pc3Npb24sIEV4Y2VwdGlvbkNvZGUmKTsKK1Bhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4g Y3JlYXRlRnJhZ21lbnRGcm9tVGV4dChSYW5nZSogY29udGV4dCwgY29uc3QgU3RyaW5nJiB0ZXh0 KTsKK1Bhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3Vw KERvY3VtZW50KiwgY29uc3QgU3RyaW5nJiBtYXJrdXAsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg RnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uID0gQWxsb3dTY3JpcHRpbmdDb250ZW50KTsKK1Bh c3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwV2l0aENv bnRleHQoRG9jdW1lbnQqLCBjb25zdCBTdHJpbmcmIG1hcmt1cCwgdW5zaWduZWQgZnJhZ21lbnRT dGFydCwgdW5zaWduZWQgZnJhZ21lbnRFbmQsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgRnJhZ21l bnRTY3JpcHRpbmdQZXJtaXNzaW9uKTsKK1Bhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3Jl YXRlRnJhZ21lbnRGcm9tTm9kZXMoRG9jdW1lbnQqLCBjb25zdCBWZWN0b3I8Tm9kZSo+Jik7CitQ YXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50Rm9ySW5uZXJPdXRlckhU TUwoY29uc3QgU3RyaW5nJiwgRWxlbWVudCosIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiwg RXhjZXB0aW9uQ29kZSYpOworUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFn bWVudEZvclRyYW5zZm9ybVRvRnJhZ21lbnQoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBz b3VyY2VNSU1FVHlwZSwgRG9jdW1lbnQqIG91dHB1dERvYyk7CitQYXNzUmVmUHRyPERvY3VtZW50 RnJhZ21lbnQ+IGNyZWF0ZUNvbnRleHR1YWxGcmFnbWVudChjb25zdCBTdHJpbmcmLCBIVE1MRWxl bWVudCosIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiwgRXhjZXB0aW9uQ29kZSYpOwogCi0g ICAgYm9vbCBpc1BsYWluVGV4dE1hcmt1cChOb2RlICpub2RlKTsKK2Jvb2wgaXNQbGFpblRleHRN YXJrdXAoTm9kZSopOwogCi0gICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgdXNlZCBieSBIVE1MRWxl bWVudCAmIFNoYWRvd1Jvb3QgdG8gcmVwbGFjZSB0aGUgY2hpbGRyZW4gd2l0aCByZXNwZWN0ZWQg ZnJhZ21lbnQvdGV4dC4KLSAgICB2b2lkIHJlcGxhY2VDaGlsZHJlbldpdGhGcmFnbWVudChDb250 YWluZXJOb2RlKiwgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdtZW50PiwgRXhjZXB0aW9uQ29kZSYp OwotICAgIHZvaWQgcmVwbGFjZUNoaWxkcmVuV2l0aFRleHQoQ29udGFpbmVyTm9kZSosIGNvbnN0 IFN0cmluZyYsIEV4Y2VwdGlvbkNvZGUmKTsKKy8vIFRoZXNlIG1ldGhvZHMgYXJlIHVzZWQgYnkg SFRNTEVsZW1lbnQgJiBTaGFkb3dSb290IHRvIHJlcGxhY2UgdGhlCisvLyBjaGlsZHJlbiB3aXRo IHJlc3BlY3RlZCBmcmFnbWVudC90ZXh0Lgordm9pZCByZXBsYWNlQ2hpbGRyZW5XaXRoRnJhZ21l bnQoQ29udGFpbmVyTm9kZSosIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4sIEV4Y2VwdGlv bkNvZGUmKTsKK3ZvaWQgcmVwbGFjZUNoaWxkcmVuV2l0aFRleHQoQ29udGFpbmVyTm9kZSosIGNv bnN0IFN0cmluZyYsIEV4Y2VwdGlvbkNvZGUmKTsKIAotICAgIFN0cmluZyBjcmVhdGVNYXJrdXAo Y29uc3QgUmFuZ2UqLAotICAgICAgICBWZWN0b3I8Tm9kZSo+KiA9IDAsIEVBbm5vdGF0ZUZvcklu dGVyY2hhbmdlID0gRG9Ob3RBbm5vdGF0ZUZvckludGVyY2hhbmdlLCBib29sIGNvbnZlcnRCbG9j a3NUb0lubGluZXMgPSBmYWxzZSwgRUFic29sdXRlVVJMcyA9IERvTm90UmVzb2x2ZVVSTHMpOwot ICAgIFN0cmluZyBjcmVhdGVNYXJrdXAoY29uc3QgTm9kZSosIEVDaGlsZHJlbk9ubHkgPSBJbmNs dWRlTm9kZSwgVmVjdG9yPE5vZGUqPiogPSAwLCBFQWJzb2x1dGVVUkxzID0gRG9Ob3RSZXNvbHZl VVJMcywgVmVjdG9yPFF1YWxpZmllZE5hbWU+KiB0YWdOYW1lc1RvU2tpcCA9IDApOwotICAgIAot ICAgIFN0cmluZyBjcmVhdGVGdWxsTWFya3VwKGNvbnN0IE5vZGUqKTsKLSAgICBTdHJpbmcgY3Jl YXRlRnVsbE1hcmt1cChjb25zdCBSYW5nZSopOworU3RyaW5nIGNyZWF0ZU1hcmt1cChjb25zdCBS YW5nZSosIFZlY3RvcjxOb2RlKj4qID0gMCwgRUFubm90YXRlRm9ySW50ZXJjaGFuZ2UgPSBEb05v dEFubm90YXRlRm9ySW50ZXJjaGFuZ2UsIGJvb2wgY29udmVydEJsb2Nrc1RvSW5saW5lcyA9IGZh bHNlLCBFQWJzb2x1dGVVUkxzID0gRG9Ob3RSZXNvbHZlVVJMcyk7CitTdHJpbmcgY3JlYXRlTWFy a3VwKGNvbnN0IE5vZGUqLCBFQ2hpbGRyZW5Pbmx5ID0gSW5jbHVkZU5vZGUsIFZlY3RvcjxOb2Rl Kj4qID0gMCwgRUFic29sdXRlVVJMcyA9IERvTm90UmVzb2x2ZVVSTHMsIFZlY3RvcjxRdWFsaWZp ZWROYW1lPiogdGFnTmFtZXNUb1NraXAgPSAwKTsKKworU3RyaW5nIGNyZWF0ZUZ1bGxNYXJrdXAo Y29uc3QgTm9kZSopOworU3RyaW5nIGNyZWF0ZUZ1bGxNYXJrdXAoY29uc3QgUmFuZ2UqKTsKKwor U3RyaW5nIHVybFRvTWFya3VwKGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHRpdGxlKTsKIAot ICAgIFN0cmluZyB1cmxUb01hcmt1cChjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiB0aXRsZSk7 CiB9CiAKICNlbmRpZiAvLyBtYXJrdXBfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRp dGluZy92aXNpYmxlX3VuaXRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvdmlzaWJsZV91 bml0cy5jcHAKaW5kZXggOGFmNjhlNzQ0ZWY1Mzk1ZDAyMjg0NDgzOTk1Njc2M2ZhZDZiNjg4NC4u YmFhMjA2NTZlYTZiNWQ5OWI0ZTJjNGU2NTRmYjQzOTIyYzhiYzVkMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCkBAIC04Myw3ICs4Myw3IEBAIHN0YXRpYyBQb3Np dGlvbiBwcmV2aW91c1Jvb3RJbmxpbmVCb3hDYW5kaWRhdGVQb3NpdGlvbihOb2RlKiBub2RlLCBj b25zdCBWaXNpYmxlCiAKICAgICB3aGlsZSAocHJldmlvdXNOb2RlICYmIGluU2FtZUxpbmUoZmly c3RQb3NpdGlvbkluT3JCZWZvcmVOb2RlKHByZXZpb3VzTm9kZSksIHZpc2libGVQb3NpdGlvbikp CiAgICAgICAgIHByZXZpb3VzTm9kZSA9IHByZXZpb3VzTGVhZldpdGhTYW1lRWRpdGFiaWxpdHko cHJldmlvdXNOb2RlLCBlZGl0YWJsZVR5cGUpOwotICAKKwogICAgIHdoaWxlIChwcmV2aW91c05v ZGUgJiYgIXByZXZpb3VzTm9kZS0+aXNTaGFkb3dSb290KCkpIHsKICAgICAgICAgaWYgKGhpZ2hl c3RFZGl0YWJsZVJvb3QoZmlyc3RQb3NpdGlvbkluT3JCZWZvcmVOb2RlKHByZXZpb3VzTm9kZSks IGVkaXRhYmxlVHlwZSkgIT0gaGlnaGVzdFJvb3QpCiAgICAgICAgICAgICBicmVhazsKQEAgLTEw NSw3ICsxMDUsNyBAQCBzdGF0aWMgUG9zaXRpb24gbmV4dFJvb3RJbmxpbmVCb3hDYW5kaWRhdGVQ b3NpdGlvbihOb2RlKiBub2RlLCBjb25zdCBWaXNpYmxlUG9zaQogICAgIE5vZGUqIG5leHROb2Rl ID0gbmV4dExlYWZXaXRoU2FtZUVkaXRhYmlsaXR5KG5vZGUsIGVkaXRhYmxlVHlwZSk7CiAgICAg d2hpbGUgKG5leHROb2RlICYmIGluU2FtZUxpbmUoZmlyc3RQb3NpdGlvbkluT3JCZWZvcmVOb2Rl KG5leHROb2RlKSwgdmlzaWJsZVBvc2l0aW9uKSkKICAgICAgICAgbmV4dE5vZGUgPSBuZXh0TGVh ZldpdGhTYW1lRWRpdGFiaWxpdHkobmV4dE5vZGUsIENvbnRlbnRJc0VkaXRhYmxlKTsKLSAgCisK ICAgICB3aGlsZSAobmV4dE5vZGUgJiYgIW5leHROb2RlLT5pc1NoYWRvd1Jvb3QoKSkgewogICAg ICAgICBpZiAoaGlnaGVzdEVkaXRhYmxlUm9vdChmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUo bmV4dE5vZGUpLCBlZGl0YWJsZVR5cGUpICE9IGhpZ2hlc3RSb290KQogICAgICAgICAgICAgYnJl YWs7CkBAIC0yODMsNyArMjgzLDcgQEAgc3RhdGljIGNvbnN0IElubGluZVRleHRCb3gqIGxvZ2lj YWxseU5leHRCb3goY29uc3QgVmlzaWJsZVBvc2l0aW9uJiB2aXNpYmxlUG9zaXQKIH0KIAogc3Rh dGljIFRleHRCcmVha0l0ZXJhdG9yKiB3b3JkQnJlYWtJdGVyYXRvckZvck1pbk9mZnNldEJvdW5k YXJ5KGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlzaWJsZVBvc2l0aW9uLCBjb25zdCBJbmxpbmVU ZXh0Qm94KiB0ZXh0Qm94LAotICAgICBpbnQmIHByZXZpb3VzQm94TGVuZ3RoLCBib29sJiBwcmV2 aW91c0JveEluRGlmZmVyZW50QmxvY2ssIFZlY3RvcjxVQ2hhciwgMTAyND4mIHN0cmluZywgQ2Fj aGVkTG9naWNhbGx5T3JkZXJlZExlYWZCb3hlcyYgbGVhZkJveGVzKQorICAgIGludCYgcHJldmlv dXNCb3hMZW5ndGgsIGJvb2wmIHByZXZpb3VzQm94SW5EaWZmZXJlbnRCbG9jaywgVmVjdG9yPFVD aGFyLCAxMDI0PiYgc3RyaW5nLCBDYWNoZWRMb2dpY2FsbHlPcmRlcmVkTGVhZkJveGVzJiBsZWFm Qm94ZXMpCiB7CiAgICAgcHJldmlvdXNCb3hJbkRpZmZlcmVudEJsb2NrID0gZmFsc2U7CiAKQEAg LTQ5OSw3ICs0OTksNyBAQCBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIHByZXZpb3VzQm91bmRhcnko Y29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjLCBCb3VuZGFyeVNlYXJjaAogICAgICAgICAgICAgc3Ry aW5nLnByZXBlbmQoaXRlcmF0b3JTdHJpbmcuY2hhcmFjdGVycygpLCBpdGVyYXRvclN0cmluZy5s ZW5ndGgoKSk7CiAgICAgICAgIH0KICAgICAgICAgbmV4dCA9IHNlYXJjaEZ1bmN0aW9uKHN0cmlu Zy5kYXRhKCksIHN0cmluZy5zaXplKCksIHN0cmluZy5zaXplKCkgLSBzdWZmaXhMZW5ndGgsIE1h eUhhdmVNb3JlQ29udGV4dCwgbmVlZE1vcmVDb250ZXh0KTsKLSAgICAgICAgaWYgKG5leHQgIT0g MCkKKyAgICAgICAgaWYgKG5leHQpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgaXQuYWR2 YW5jZSgpOwogICAgIH0KQEAgLTg2Niw4ICs4NjYsOCBAQCBzdGF0aWMgVmlzaWJsZVBvc2l0aW9u IGVuZE9mTGluZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMsIExpbmVFbmRwb2ludENvbXB1dGF0 aQogICAgICAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcih2aXNQb3Mp OwogICAgIH0KIAotICAgIC8vIE1ha2Ugc3VyZSB0aGUgZW5kIG9mIGxpbmUgaXMgYXQgdGhlIHNh bWUgbGluZSBhcyB0aGUgZ2l2ZW4gaW5wdXQgcG9zaXRpb24uICBFbHNlIHVzZSB0aGUgcHJldmlv dXMgcG9zaXRpb24gdG8gCi0gICAgLy8gb2J0YWluIGVuZCBvZiBsaW5lLiAgVGhpcyBjb25kaXRp b24gaGFwcGVucyB3aGVuIHRoZSBpbnB1dCBwb3NpdGlvbiBpcyBiZWZvcmUgdGhlIHNwYWNlIGNo YXJhY3RlciBhdCB0aGUgZW5kIAorICAgIC8vIE1ha2Ugc3VyZSB0aGUgZW5kIG9mIGxpbmUgaXMg YXQgdGhlIHNhbWUgbGluZSBhcyB0aGUgZ2l2ZW4gaW5wdXQgcG9zaXRpb24uIEVsc2UgdXNlIHRo ZSBwcmV2aW91cyBwb3NpdGlvbiB0byAKKyAgICAvLyBvYnRhaW4gZW5kIG9mIGxpbmUuIFRoaXMg Y29uZGl0aW9uIGhhcHBlbnMgd2hlbiB0aGUgaW5wdXQgcG9zaXRpb24gaXMgYmVmb3JlIHRoZSBz cGFjZSBjaGFyYWN0ZXIgYXQgdGhlIGVuZCAKICAgICAvLyBvZiBhIHNvZnQtd3JhcHBlZCBub24t ZWRpdGFibGUgbGluZS4gSW4gdGhpcyBzY2VuYXJpbywgZW5kUG9zaXRpb25Gb3JMaW5lIHdvdWxk IGluY29ycmVjdGx5IGhhbmQgYmFjayBhIHBvc2l0aW9uCiAgICAgLy8gaW4gdGhlIG5leHQgbGlu ZSBpbnN0ZWFkLiBUaGlzIGZpeCBpcyB0byBhY2NvdW50IGZvciB0aGUgZGlzY3JlcGFuY3kgYmV0 d2VlbiBsaW5lcyB3aXRoIHdlYmtpdC1saW5lLWJyZWFrOmFmdGVyLXdoaXRlLXNwYWNlIHN0eWxl CiAgICAgLy8gdmVyc3VzIGxpbmVzIHdpdGhvdXQgdGhhdCBzdHlsZSwgd2hpY2ggd291bGQgYnJl YWsgYmVmb3JlIGEgc3BhY2UgYnkgZGVmYXVsdC4gCkBAIC05MzEsMTEgKzkzMSwxMSBAQCBWaXNp YmxlUG9zaXRpb24gcHJldmlvdXNMaW5lUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZ2 aXNpYmxlUG9zaXRpb24sIGludAogICAgIAogICAgIG5vZGUtPmRvY3VtZW50KCktPnVwZGF0ZUxh eW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogICAgIAotICAgIFJlbmRlck9iamVjdCAq cmVuZGVyZXIgPSBub2RlLT5yZW5kZXJlcigpOworICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIg PSBub2RlLT5yZW5kZXJlcigpOwogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBW aXNpYmxlUG9zaXRpb24oKTsKIAotICAgIFJvb3RJbmxpbmVCb3ggKnJvb3QgPSAwOworICAgIFJv b3RJbmxpbmVCb3gqIHJvb3QgPSAwOwogICAgIElubGluZUJveCogYm94OwogICAgIGludCBpZ25v cmVkQ2FyZXRPZmZzZXQ7CiAgICAgdmlzaWJsZVBvc2l0aW9uLmdldElubGluZUJveEFuZE9mZnNl dChib3gsIGlnbm9yZWRDYXJldE9mZnNldCk7CkBAIC05ODYsMTEgKzk4NiwxMSBAQCBWaXNpYmxl UG9zaXRpb24gbmV4dExpbmVQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24gJnZpc2libGVQ b3NpdGlvbiwgaW50IGxpbgogICAgIAogICAgIG5vZGUtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91 dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCi0gICAgUmVuZGVyT2JqZWN0ICpyZW5kZXJl ciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUt PnJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuIFZpc2libGVQ b3NpdGlvbigpOwogCi0gICAgUm9vdElubGluZUJveCAqcm9vdCA9IDA7CisgICAgUm9vdElubGlu ZUJveCogcm9vdCA9IDA7CiAgICAgSW5saW5lQm94KiBib3g7CiAgICAgaW50IGlnbm9yZWRDYXJl dE9mZnNldDsKICAgICB2aXNpYmxlUG9zaXRpb24uZ2V0SW5saW5lQm94QW5kT2Zmc2V0KGJveCwg aWdub3JlZENhcmV0T2Zmc2V0KTsKQEAgLTEwNzYsNyArMTA3Niw3IEBAIFZpc2libGVQb3NpdGlv biBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZjKQogCiBz dGF0aWMgdW5zaWduZWQgbmV4dFNlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeShjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgdW5zaWduZWQgbGVuZ3RoLCB1bnNpZ25lZCwgQm91bmRhcnlTZWFyY2hDb250 ZXh0QXZhaWxhYmlsaXR5LCBib29sJikKIHsKLSAgICAvLyBGSVhNRTogVGhpcyBpcyBpZGVudGlj YWwgdG8gZW5kU2VudGVuY2VCb3VuZGFyeS4gIFRoaXMgaXNuJ3QgcmlnaHQsIGl0IG5lZWRzIHRv IAorICAgIC8vIEZJWE1FOiBUaGlzIGlzIGlkZW50aWNhbCB0byBlbmRTZW50ZW5jZUJvdW5kYXJ5 LiBUaGlzIGlzbid0IHJpZ2h0LCBpdCBuZWVkcyB0byAKICAgICAvLyBtb3ZlIHRvIHRoZSBlcXVp dmxhbnQgcG9zaXRpb24gaW4gdGhlIGZvbGxvd2luZyBzZW50ZW5jZS4KICAgICBUZXh0QnJlYWtJ dGVyYXRvciogaXRlcmF0b3IgPSBzZW50ZW5jZUJyZWFrSXRlcmF0b3IoY2hhcmFjdGVycywgbGVu Z3RoKTsKICAgICByZXR1cm4gdGV4dEJyZWFrRm9sbG93aW5nKGl0ZXJhdG9yLCAwKTsKQEAgLTEx MjAsMTIgKzExMjAsMTIgQEAgVmlzaWJsZVBvc2l0aW9uIHN0YXJ0T2ZQYXJhZ3JhcGgoY29uc3Qg VmlzaWJsZVBvc2l0aW9uJiBjLCBFZGl0aW5nQm91bmRhcnlDcm9zc2kKICAgICAgICAgICAgIGlm ICghbiB8fCAhbi0+aXNEZXNjZW5kYW50T2YoaGlnaGVzdFJvb3QpKQogICAgICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIFJlbmRlck9iamVjdCAqciA9IG4tPnJlbmRlcmVy KCk7CisgICAgICAgIFJlbmRlck9iamVjdCogciA9IG4tPnJlbmRlcmVyKCk7CiAgICAgICAgIGlm ICghcikgewogICAgICAgICAgICAgbiA9IE5vZGVUcmF2ZXJzYWw6OnByZXZpb3VzUG9zdE9yZGVy KG4sIHN0YXJ0QmxvY2spOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAg ICAgUmVuZGVyU3R5bGUgKnN0eWxlID0gci0+c3R5bGUoKTsKKyAgICAgICAgUmVuZGVyU3R5bGUq IHN0eWxlID0gci0+c3R5bGUoKTsKICAgICAgICAgaWYgKHN0eWxlLT52aXNpYmlsaXR5KCkgIT0g VklTSUJMRSkgewogICAgICAgICAgICAgbiA9IE5vZGVUcmF2ZXJzYWw6OnByZXZpb3VzUG9zdE9y ZGVyKG4sIHN0YXJ0QmxvY2spOwogICAgICAgICAgICAgY29udGludWU7CkBAIC0xMjAxLDEyICsx MjAxLDEyIEBAIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaChjb25zdCBWaXNpYmxlUG9z aXRpb24gJmMsIEVkaXRpbmdCb3VuZGFyeUNyb3NzaW5nCiAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KIAotICAgICAgICBSZW5kZXJPYmplY3QgKnIgPSBuLT5yZW5kZXJlcigpOwor ICAgICAgICBSZW5kZXJPYmplY3QqIHIgPSBuLT5yZW5kZXJlcigpOwogICAgICAgICBpZiAoIXIp IHsKICAgICAgICAgICAgIG4gPSBOb2RlVHJhdmVyc2FsOjpuZXh0KG4sIHN0YXlJbnNpZGVCbG9j ayk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBSZW5kZXJTdHls ZSAqc3R5bGUgPSByLT5zdHlsZSgpOworICAgICAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSByLT5z dHlsZSgpOwogICAgICAgICBpZiAoc3R5bGUtPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxFKSB7CiAg ICAgICAgICAgICBuID0gTm9kZVRyYXZlcnNhbDo6bmV4dChuLCBzdGF5SW5zaWRlQmxvY2spOwog ICAgICAgICAgICAgY29udGludWU7Cg==