108744 2013-02-01 22:32:52 -0800 Clean up the storage of dirty bits on nodes in the scrolling state tree 2013-02-02 13:06:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin jamesr simon.fraser tonikitoo webkit.review.bot oldest_to_newest 823557 0 simon.fraser 2013-02-01 22:32:52 -0800 Clean up the storage of dirty bits on nodes in the scrolling state tree 823563 1 186215 simon.fraser 2013-02-01 22:55:18 -0800 Created attachment 186215 Patch 823581 2 186215 buildbot 2013-02-02 00:05:15 -0800 Comment on attachment 186215 Patch Attachment 186215 did not pass win-ews (win): Output: http://queues.webkit.org/results/16338599 823604 3 186215 buildbot 2013-02-02 00:59:29 -0800 Comment on attachment 186215 Patch Attachment 186215 did not pass win-ews (win): Output: http://queues.webkit.org/results/16343554 823692 4 186215 simon.fraser 2013-02-02 12:58:37 -0800 Comment on attachment 186215 Patch Windows failure is unrelated. 823698 5 186215 webkit.review.bot 2013-02-02 13:06:28 -0800 Comment on attachment 186215 Patch Clearing flags on attachment: 186215 Committed r141704: <http://trac.webkit.org/changeset/141704> 823699 6 webkit.review.bot 2013-02-02 13:06:33 -0800 All reviewed patches have been landed. Closing bug. 186215 2013-02-01 22:55:18 -0800 2013-02-02 13:06:28 -0800 Patch bug-108744-20130201225159.patch text/plain 37903 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkxZDNjZjFmNGU4NDFi M2U0ZjIyOWYzYmFlMDkyMGIxZTk5MDIyMS4uNDhmZjIxNTg3OTU4NTI0MzRlZWU1NGVmNDJiMDE5 ZGJhNzc3MmJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcyIEBACisyMDEzLTAyLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIHRo ZSBzdG9yYWdlIG9mIGRpcnR5IGJpdHMgb24gbm9kZXMgaW4gdGhlIHNjcm9sbGluZyBzdGF0ZSB0 cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg3 NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3Jv bGxpbmdTdGF0ZU5vZGUgYW5kIGl0cyBzdWJjbGFzc2VzIHVzZWQgZGlmZmVyZW50IHRlY2huaXF1 ZXMgZm9yCisgICAgICAgIHRyYWNraW5nIHdoaWNoIHByb3BlcnRpZXMgY2hhbmdlZC4gU2Nyb2xs aW5nU3RhdGVOb2RlIHRyYWNrZWQgaXRzIGxheWVycworICAgICAgICB2aWEgYSBib29sIG1lbWJl ciBhbmQgc29tZSBsYXllci1zcGVjaWZpYyBtZXRob2RzLCBidXQgYWxzbyBoYWQgdmlydHVhbAor ICAgICAgICBtZXRob2RzIHRvIGFsbG93IHN1YmNsYXNzZXMgdG8gdHJhY2sgcHJvcGVydGllcyB2 aWEgYSBiaXQgbWFzay4KKyAgICAgICAgCisgICAgICAgIENsZWFuIHRoaXMgdXAgYnkgaGF2aW5n IHRoZSBiYXNlIGNsYXNzIHN0b3JlIHRoZSBiaXQgbWFzaywgYW5kIHVzZQorICAgICAgICBlbnVt cyB0byBzcGVjaWZ5IGJpdHMgZm9yIHRoZSB2YXJpb3VzIHByb3BlcnRpZXMuIEFsbCBwcm9wZXJ0 aWVzIGFyZSB0aHVzCisgICAgICAgIHRyYWNrZWQgaW4gdGhlIHNhbWUgd2F5LiBCaXRzIGFyZSBy ZWFkIGFuZCB3cml0dGVuIHRocm91Z2ggbm9uLXZpcnR1YWwgbWVtYmVyCisgICAgICAgIGZ1bmN0 aW9ucyBvbiBTY3JvbGxpbmdTdGF0ZU5vZGUuIEFsbCBiaXQgY2hlY2tpbmcgaXMgZG9uZSB2aWEg aGFzQ2hhbmdlZFByb3BlcnR5KCkuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZUZpeGVkTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZUZp eGVkTm9kZTo6U2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUpOiBtX2NoYW5nZWRQcm9wZXJ0aWVzIGlz IG5vdyBvbiB0aGUgYmFzZSBjbGFzcy4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRl Rml4ZWROb2RlOjp1cGRhdGVDb25zdHJhaW50cyk6IFVzZSBzZXRQcm9wZXJ0eUNoYW5nZWQoKQor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRml4ZWROb2RlLmg6IFJlbW92 ZSBvdmVycmlkZXMgdGhhdCBhcmUgbm8gbG9uZ2VyIG5lZWRlZC4KKyAgICAgICAgKiBwYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nU3RhdGVOb2RlOjpTY3JvbGxpbmdTdGF0ZU5vZGUpOiBJbml0aWFsaXplIG1fY2hhbmdlZFBy b3BlcnRpZXMsCisgICAgICAgIG1fc2Nyb2xsTGF5ZXJEaWRDaGFuZ2Ugbm8gbG9uZ2VyIHRyYWNr ZWQgc2VwYXJhdGVseS4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6Y2xv bmVBbmRSZXNldCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2Rl Lmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZU5vZGU6Omhhc0NoYW5nZWRQcm9w ZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6aGFzQ2hhbmdl ZFByb3BlcnR5KTogVGVzdHMgdGhlIGJpdC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0 YXRlTm9kZTo6cmVzZXRDaGFuZ2VkUHJvcGVydGllcyk6IFNldCBhbGwgYml0cyB0byAwLgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpzZXRQcm9wZXJ0eUNoYW5nZWQpOiBT ZXQgdGhlIGJpdC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6Y2hhbmdl ZFByb3BlcnRpZXMpOiBQcml2YXRlIHRvIGRpc2NvdXJhZ2UgaW5jb3JyZWN0IHVzYWdlCisgICAg ICAgIChjaGFuZ2VQcm9wZXJ0aWVzKCkgJiBmb28pLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZSk6IEJh c2UgY2xhc3MgZG9lcyB0aGUgY29weWluZyBub3cuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFZpZXdwb3J0UmVjdCk6IFVzZSBzZXRQcm9wZXJ0eUNo YW5nZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 c2V0Q29udGVudHNTaXplKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6OnNldEZyYW1lU2NhbGVGYWN0b3IpOiBFdGMuCisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldE5vbkZhc3RTY3JvbGxhYmxlUmVn aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0 V2hlZWxFdmVudEhhbmRsZXJDb3VudCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6OnNldFNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5U aHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpz ZXRIb3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldEhhc0VuYWJsZWRI b3Jpem9udGFsU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZTo6c2V0SGFzRW5hYmxlZFZlcnRpY2FsU2Nyb2xsYmFyKToKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0SG9yaXpvbnRhbFNjcm9sbGJh ck1vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpz ZXRWZXJ0aWNhbFNjcm9sbGJhck1vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpzZXRSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFNjcm9sbE9yaWdpbik6Cisg ICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmg6Cisg ICAgICAgIChTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT Y3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OlNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OnVwZGF0ZUNvbnN0cmFpbnRz KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuaDoK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGluZ1RyZWU6OmNvbW1pdE5ld1RyZWVTdGF0ZSk6CisgICAgICAgICogcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnVwZGF0ZSk6CisgICAgICAgICogcGFn ZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1N0YXRlTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGluZ1N0YXRlTm9kZTo6c2V0U2Nyb2xsTGF5ZXIpOgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldENvdW50ZXJTY3JvbGxp bmdMYXllcik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhl ZE5vZGUubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjp1cGRh dGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl TWFjOjp1cGRhdGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl U3RpY2t5Tm9kZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTdGlja3lOb2Rl Ojp1cGRhdGUpOgorCiAyMDEzLTAyLTAxICBSb2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQ2xlYW4gdXAgV2ViQ29yZSBWUzIwMTAgcHJvamVj dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlRml4ZWROb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1N0YXRlRml4ZWROb2RlLmNwcAppbmRleCA5NjAyOGZkOTZmNDE0MmJjMDBkNTNiODQ0NWI1ZjFj N2QyYTk0Zjc4Li5jZWYzY2I0MzZlOGQ2Nzc0OTI4MzYwYmI3ZTcwMjVjZDFlZWE5ZDM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZpeGVk Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVGaXhlZE5vZGUuY3BwCkBAIC00MiwxNCArNDIsMTIgQEAgUGFzc093blB0cjxTY3JvbGxpbmdT dGF0ZUZpeGVkTm9kZT4gU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGU6OmNyZWF0ZShTY3JvbGxpbmdT dGEKIAogU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGU6OlNjcm9sbGluZ1N0YXRlRml4ZWROb2RlKFNj cm9sbGluZ1N0YXRlVHJlZSogdHJlZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKICAgICA6IFNj cm9sbGluZ1N0YXRlTm9kZSh0cmVlLCBub2RlSUQpCi0gICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVz KDApCiB7CiB9CiAKIFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlOjpTY3JvbGxpbmdTdGF0ZUZpeGVk Tm9kZShjb25zdCBTY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZSYgbm9kZSkKICAgICA6IFNjcm9sbGlu Z1N0YXRlTm9kZShub2RlKQogICAgICwgbV9jb25zdHJhaW50cyhGaXhlZFBvc2l0aW9uVmlld3Bv cnRDb25zdHJhaW50cyhub2RlLnZpZXdwb3J0Q29uc3RyYWludHMoKSkpCi0gICAgLCBtX2NoYW5n ZWRQcm9wZXJ0aWVzKG5vZGUuY2hhbmdlZFByb3BlcnRpZXMoKSkKIHsKIH0KIApAQCAtNjgsNyAr NjYsNyBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlOjp1cGRhdGVDb25zdHJhaW50cyhj b25zdCBGaXhlZFBvc2l0aW9uVmlld3BvcnRDb25zdAogICAgICAgICByZXR1cm47CiAKICAgICBt X2NvbnN0cmFpbnRzID0gY29uc3RyYWludHM7Ci0gICAgbV9jaGFuZ2VkUHJvcGVydGllcyA9IFZp ZXdwb3J0Q29uc3RyYWludHM7CisgICAgc2V0UHJvcGVydHlDaGFuZ2VkKFZpZXdwb3J0Q29uc3Ry YWludHMpOwogICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zZXRIYXNDaGFuZ2VkUHJvcGVydGll cyh0cnVlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlRml4ZWROb2RlLmgKaW5kZXggMmJmYjk1MTQ3OGMzNjA5MmY1MDM2ZDU2 MmY5MDY2M2ZhMDg0MDQyNS4uNjFhMmFlYzYzNjY2OGRiMTAxODU1NzNiNWU4ZmNjYWQxOGI2ZDg1 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVGaXhlZE5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZUZpeGVkTm9kZS5oCkBAIC00NSwxMiArNDUsMTAgQEAgcHVibGljOgogCiAgICAgdmly dHVhbCB+U2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUoKTsKIAotICAgIGVudW0gQ2hhbmdlZFByb3Bl cnR5Rm9yRml4ZWQgewotICAgICAgICBWaWV3cG9ydENvbnN0cmFpbnRzID0gMSA8PCAwCisgICAg ZW51bSB7CisgICAgICAgIFZpZXdwb3J0Q29uc3RyYWludHMgPSBOdW1TdGF0ZU5vZGVCaXRzCiAg ICAgfTsKIAotICAgIHZpcnR1YWwgdW5zaWduZWQgY2hhbmdlZFByb3BlcnRpZXMoKSBjb25zdCBP VkVSUklERSB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9Ci0KICAgICB2b2lkIHVwZGF0 ZUNvbnN0cmFpbnRzKGNvbnN0IEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzJik7CiAg ICAgY29uc3QgRml4ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHMmIHZpZXdwb3J0Q29uc3Ry YWludHMoKSBjb25zdCB7IHJldHVybiBtX2NvbnN0cmFpbnRzOyB9CiAKQEAgLTYwLDE0ICs1OCwx MSBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBib29sIGlzRml4ZWROb2RlKCkgT1ZFUlJJREUg eyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdmlydHVhbCBib29sIGhhc0NoYW5nZWRQcm9wZXJ0aWVz KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9jaGFuZ2VkUHJvcGVydGllczsgfQotICAgIHZp cnR1YWwgdm9pZCByZXNldENoYW5nZWRQcm9wZXJ0aWVzKCkgT1ZFUlJJREUgeyBtX2NoYW5nZWRQ cm9wZXJ0aWVzID0gMDsgfQogICAgIHZpcnR1YWwgdm9pZCBzeW5jTGF5ZXJQb3NpdGlvbkZvclZp ZXdwb3J0UmVjdChjb25zdCBMYXlvdXRSZWN0JiB2aWV3cG9ydFJlY3QpIE9WRVJSSURFOwogCiAg ICAgdmlydHVhbCB2b2lkIGR1bXBQcm9wZXJ0aWVzKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50KSBj b25zdCBPVkVSUklERTsKIAogICAgIEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzIG1f Y29uc3RyYWludHM7Ci0gICAgdW5zaWduZWQgbV9jaGFuZ2VkUHJvcGVydGllczsKIH07CiAKIGlu bGluZSBTY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZSogdG9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZShT Y3JvbGxpbmdTdGF0ZU5vZGUqIG5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmNwcAppbmRleCAxY2Q4YTIwMzYwZTMzMzVkNWFk NmE0NGQxOWZkMGM1NzM4MmY2YWY5Li44ZTMyYjQ2MTEyM2UyZjk4OTRlYjM4MjVkNzA1ZDQwMWVi YWMzZTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZU5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlTm9kZS5jcHAKQEAgLTM5LDggKzM5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog U2Nyb2xsaW5nU3RhdGVOb2RlOjpTY3JvbGxpbmdTdGF0ZU5vZGUoU2Nyb2xsaW5nU3RhdGVUcmVl KiBzY3JvbGxpbmdTdGF0ZVRyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAgOiBtX3Nj cm9sbGluZ1N0YXRlVHJlZShzY3JvbGxpbmdTdGF0ZVRyZWUpCiAgICAgLCBtX25vZGVJRChub2Rl SUQpCisgICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVzKDApCiAgICAgLCBtX3BhcmVudCgwKQotICAg ICwgbV9zY3JvbGxMYXllckRpZENoYW5nZShmYWxzZSkKIHsKIH0KIApAQCAtNTAsOCArNTAsOCBA QCBTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxpbmdTdGF0ZVRy ZWUqIHNjcm9sbGluZ1N0YXRlVHJlZSwgUwogU2Nyb2xsaW5nU3RhdGVOb2RlOjpTY3JvbGxpbmdT dGF0ZU5vZGUoY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJiBzdGF0ZU5vZGUpCiAgICAgOiBtX3Nj cm9sbGluZ1N0YXRlVHJlZSgwKQogICAgICwgbV9ub2RlSUQoc3RhdGVOb2RlLnNjcm9sbGluZ05v ZGVJRCgpKQorICAgICwgbV9jaGFuZ2VkUHJvcGVydGllcyhzdGF0ZU5vZGUuY2hhbmdlZFByb3Bl cnRpZXMoKSkKICAgICAsIG1fcGFyZW50KDApCi0gICAgLCBtX3Njcm9sbExheWVyRGlkQ2hhbmdl KHN0YXRlTm9kZS5zY3JvbGxMYXllckRpZENoYW5nZSgpKQogewogICAgIC8vIEZJWE1FOiB3aHkg ZG9lc24ndCB0aGlzIHNldCB0aGUgR3JhcGhpY3NMYXllcj8KICAgICBzZXRTY3JvbGxQbGF0Zm9y bUxheWVyKHN0YXRlTm9kZS5wbGF0Zm9ybVNjcm9sbExheWVyKCkpOwpAQCAtNjYsNyArNjYsNiBA QCBQYXNzT3duUHRyPFNjcm9sbGluZ1N0YXRlTm9kZT4gU2Nyb2xsaW5nU3RhdGVOb2RlOjpjbG9u ZUFuZFJlc2V0KCkKICAgICBPd25QdHI8U2Nyb2xsaW5nU3RhdGVOb2RlPiBjbG9uZSA9IHRoaXMt PmNsb25lKCk7CiAKICAgICAvLyBOb3cgdGhhdCB0aGlzIG5vZGUgaXMgY2xvbmVkLCByZXNldCBv dXIgY2hhbmdlIHByb3BlcnRpZXMuCi0gICAgc2V0U2Nyb2xsTGF5ZXJEaWRDaGFuZ2UoZmFsc2Up OwogICAgIHJlc2V0Q2hhbmdlZFByb3BlcnRpZXMoKTsKIAogICAgIGNsb25lQW5kUmVzZXRDaGls ZHJlbihjbG9uZS5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlTm9kZS5oCmluZGV4IDEyNmQ4OTY0Y2FjNTA4OTZhZTViMTJiOTFkOGJm YTE2OWMwMjA1MzguLmMwMzdjYmIzZjYyNjhlZmRlYTI1MzUxNWFhMGExM2MxYzljZTI5MjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9k ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9k ZS5oCkBAIC01NywxMCArNTcsMTYgQEAgcHVibGljOgogICAgIFBhc3NPd25QdHI8U2Nyb2xsaW5n U3RhdGVOb2RlPiBjbG9uZUFuZFJlc2V0KCk7CiAgICAgdm9pZCBjbG9uZUFuZFJlc2V0Q2hpbGRy ZW4oU2Nyb2xsaW5nU3RhdGVOb2RlKik7CiAKLSAgICB2aXJ0dWFsIGJvb2wgaGFzQ2hhbmdlZFBy b3BlcnRpZXMoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCB1bnNpZ25lZCBjaGFuZ2VkUHJvcGVy dGllcygpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgcmVzZXRDaGFuZ2VkUHJvcGVydGll cygpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0SGFzQ2hhbmdlZFByb3BlcnRpZXMoKSB7IHNl dFNjcm9sbExheWVyRGlkQ2hhbmdlKHRydWUpOyB9CisgICAgZW51bSB7CisgICAgICAgIFNjcm9s bExheWVyID0gMCwKKyAgICAgICAgTnVtU3RhdGVOb2RlQml0cyA9IDEKKyAgICB9OworICAgIHR5 cGVkZWYgdW5zaWduZWQgQ2hhbmdlZFByb3BlcnRpZXM7CisKKyAgICBib29sIGhhc0NoYW5nZWRQ cm9wZXJ0aWVzKCkgY29uc3QgeyByZXR1cm4gbV9jaGFuZ2VkUHJvcGVydGllczsgfQorICAgIGJv b2wgaGFzQ2hhbmdlZFByb3BlcnR5KHVuc2lnbmVkIHByb3BlcnR5Qml0KSB7IHJldHVybiBtX2No YW5nZWRQcm9wZXJ0aWVzICYgKDEgPDwgcHJvcGVydHlCaXQpOyB9CisgICAgdm9pZCByZXNldENo YW5nZWRQcm9wZXJ0aWVzKCkgeyBtX2NoYW5nZWRQcm9wZXJ0aWVzID0gMDsgfQorICAgIHZvaWQg c2V0UHJvcGVydHlDaGFuZ2VkKHVuc2lnbmVkIHByb3BlcnR5Qml0KSB7IG1fY2hhbmdlZFByb3Bl cnRpZXMgfD0gKDEgPDwgcHJvcGVydHlCaXQpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgc3luY0xh eWVyUG9zaXRpb25Gb3JWaWV3cG9ydFJlY3QoY29uc3QgTGF5b3V0UmVjdCYgLyp2aWV3cG9ydFJl Y3QqLykgeyB9CiAKQEAgLTY5LDkgKzc1LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2Nyb2xs TGF5ZXIoR3JhcGhpY3NMYXllciopOwogICAgIHZvaWQgc2V0U2Nyb2xsUGxhdGZvcm1MYXllcihQ bGF0Zm9ybUxheWVyKik7CiAKLSAgICBib29sIHNjcm9sbExheWVyRGlkQ2hhbmdlKCkgY29uc3Qg eyByZXR1cm4gbV9zY3JvbGxMYXllckRpZENoYW5nZTsgfQotICAgIHZvaWQgc2V0U2Nyb2xsTGF5 ZXJEaWRDaGFuZ2UoYm9vbCBzY3JvbGxMYXllckRpZENoYW5nZSkgeyBtX3Njcm9sbExheWVyRGlk Q2hhbmdlID0gc2Nyb2xsTGF5ZXJEaWRDaGFuZ2U7IH0KLQogICAgIFNjcm9sbGluZ1N0YXRlVHJl ZSogc2Nyb2xsaW5nU3RhdGVUcmVlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxpbmdTdGF0ZVRy ZWU7IH0KICAgICB2b2lkIHNldFNjcm9sbGluZ1N0YXRlVHJlZShTY3JvbGxpbmdTdGF0ZVRyZWUq IHRyZWUpIHsgbV9zY3JvbGxpbmdTdGF0ZVRyZWUgPSB0cmVlOyB9CiAKQEAgLTk4LDE0ICsxMDEs MTQgQEAgcHJpdmF0ZToKICAgICB2b2lkIGR1bXAoVGV4dFN0cmVhbSYsIGludCBpbmRlbnQpIGNv bnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGR1bXBQcm9wZXJ0aWVzKFRleHRTdHJlYW0mLCBpbnQg aW5kZW50KSBjb25zdCA9IDA7CisgICAgQ2hhbmdlZFByb3BlcnRpZXMgY2hhbmdlZFByb3BlcnRp ZXMoKSBjb25zdCB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9CiAKICAgICBTY3JvbGxp bmdOb2RlSUQgbV9ub2RlSUQ7CisgICAgQ2hhbmdlZFByb3BlcnRpZXMgbV9jaGFuZ2VkUHJvcGVy dGllczsKIAogICAgIFNjcm9sbGluZ1N0YXRlTm9kZSogbV9wYXJlbnQ7CiAgICAgT3duUHRyPFZl Y3RvcjxPd25QdHI8U2Nyb2xsaW5nU3RhdGVOb2RlPiA+ID4gbV9jaGlsZHJlbjsKIAotICAgIGJv b2wgbV9zY3JvbGxMYXllckRpZENoYW5nZTsKLQogI2lmIFBMQVRGT1JNKE1BQykKICAgICBSZXRh aW5QdHI8UGxhdGZvcm1MYXllcj4gbV9wbGF0Zm9ybVNjcm9sbExheWVyOwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCA5ZGU5OGJiZGMwMDIxNTA2M2YwMmFjM2ZmOTNkYzk4 OGQ1YWE1ZjRkLi4yNjliNmM4YzAwZGFmMGY3YzA4MTQ2ODZiYWZiZWY5YmQyMjZlMGVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTQxLDcgKzQxLDYgQEAgUGFzc093blB0cjxTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+IFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Y3Jl YXRlKFNjcm8KIAogU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiBzdGF0ZVRyZWUsIFNjcm9sbGluZ05vZGVJ RCBub2RlSUQpCiAgICAgOiBTY3JvbGxpbmdTdGF0ZU5vZGUoc3RhdGVUcmVlLCBub2RlSUQpCi0g ICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVzKDApCiAgICAgLCBtX2NvdW50ZXJTY3JvbGxpbmdMYXll cigwKQogICAgICwgbV9mcmFtZVNjYWxlRmFjdG9yKDEpCiAgICAgLCBtX3doZWVsRXZlbnRIYW5k bGVyQ291bnQoMCkKQEAgLTUxLDcgKzUwLDYgQEAgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2Rl OjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiBzdGEKICAg ICAsIG1faGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXIoZmFsc2UpCiAgICAgLCBtX2hhc0Vu YWJsZWRWZXJ0aWNhbFNjcm9sbGJhcihmYWxzZSkKICAgICAsIG1fcmVxdWVzdGVkU2Nyb2xsUG9z aXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKGZhbHNlKQotICAgICwgbV9jb3VudGVy U2Nyb2xsaW5nTGF5ZXJEaWRDaGFuZ2UoZmFsc2UpCiAgICAgLCBtX2hvcml6b250YWxTY3JvbGxi YXJNb2RlKFNjcm9sbGJhckF1dG8pCiAgICAgLCBtX3ZlcnRpY2FsU2Nyb2xsYmFyTW9kZShTY3Jv bGxiYXJBdXRvKQogewpAQCAtNTksNyArNTcsNiBAQCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05v ZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHN0YQog CiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZShjb25zdCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUmIHN0YXRlTm9kZSkKICAgICA6IFNj cm9sbGluZ1N0YXRlTm9kZShzdGF0ZU5vZGUpCi0gICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVzKHN0 YXRlTm9kZS5jaGFuZ2VkUHJvcGVydGllcygpKQogICAgICwgbV92aWV3cG9ydFJlY3Qoc3RhdGVO b2RlLnZpZXdwb3J0UmVjdCgpKQogICAgICwgbV9jb250ZW50c1NpemUoc3RhdGVOb2RlLmNvbnRl bnRzU2l6ZSgpKQogICAgICwgbV9mcmFtZVNjYWxlRmFjdG9yKHN0YXRlTm9kZS5mcmFtZVNjYWxl RmFjdG9yKCkpCkBAIC03MSw3ICs2OCw2IEBAIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKGNvbnN0IFNjcm9sbGluZ1N0YXRlU2NyCiAgICAg LCBtX2hhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyKHN0YXRlTm9kZS5oYXNFbmFibGVkSG9y aXpvbnRhbFNjcm9sbGJhcigpKQogICAgICwgbV9oYXNFbmFibGVkVmVydGljYWxTY3JvbGxiYXIo c3RhdGVOb2RlLmhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhcigpKQogICAgICwgbV9yZXF1ZXN0 ZWRTY3JvbGxQb3NpdGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoc3RhdGVOb2RlLnJl cXVlc3RlZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbCgpKQotICAg ICwgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXJEaWRDaGFuZ2Uoc3RhdGVOb2RlLmNvdW50ZXJTY3Jv bGxpbmdMYXllckRpZENoYW5nZSgpKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsYmFyTW9kZShz dGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhck1vZGUoKSkKICAgICAsIG1fdmVydGljYWxTY3Jv bGxiYXJNb2RlKHN0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKSkKICAgICAsIG1fcmVx dWVzdGVkU2Nyb2xsUG9zaXRpb24oc3RhdGVOb2RlLnJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uKCkp CkBAIC05NSw3ICs5MSw3IEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpzZXRW aWV3cG9ydFJlY3QoY29uc3QgSW50UmVjdCYgdmlld3BvcnRSZWN0KQogICAgICAgICByZXR1cm47 CiAKICAgICBtX3ZpZXdwb3J0UmVjdCA9IHZpZXdwb3J0UmVjdDsKLSAgICBtX2NoYW5nZWRQcm9w ZXJ0aWVzIHw9IFZpZXdwb3J0UmVjdDsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoVmlld3BvcnRS ZWN0KTsKICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0SGFzQ2hhbmdlZFByb3BlcnRpZXMo dHJ1ZSk7CiB9CiAKQEAgLTEwNSw3ICsxMDEsNyBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlU2Nyb2xs aW5nTm9kZTo6c2V0Q29udGVudHNTaXplKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgbV9jb250ZW50c1NpemUgPSBjb250ZW50c1NpemU7Ci0gICAg bV9jaGFuZ2VkUHJvcGVydGllcyB8PSBDb250ZW50c1NpemU7CisgICAgc2V0UHJvcGVydHlDaGFu Z2VkKENvbnRlbnRzU2l6ZSk7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldEhhc0NoYW5n ZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0xMTYsNyArMTEyLDcgQEAgdm9pZCBTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldEZyYW1lU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGVGYWN0 b3IpCiAKICAgICBtX2ZyYW1lU2NhbGVGYWN0b3IgPSBzY2FsZUZhY3RvcjsKIAotICAgIG1fY2hh bmdlZFByb3BlcnRpZXMgfD0gRnJhbWVTY2FsZUZhY3RvcjsKKyAgICBzZXRQcm9wZXJ0eUNoYW5n ZWQoRnJhbWVTY2FsZUZhY3Rvcik7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldEhhc0No YW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0xMjYsNyArMTIyLDcgQEAgdm9pZCBTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKGNvbnN0 IFJlZ2lvbiYgbm9uRmEKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9ub25GYXN0U2Nyb2xsYWJs ZVJlZ2lvbiA9IG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uOwotICAgIG1fY2hhbmdlZFByb3BlcnRp ZXMgfD0gTm9uRmFzdFNjcm9sbGFibGVSZWdpb247CisgICAgc2V0UHJvcGVydHlDaGFuZ2VkKE5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uKTsKICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0SGFz Q2hhbmdlZFByb3BlcnRpZXModHJ1ZSk7CiB9CiAKQEAgLTEzNiw3ICsxMzIsNyBAQCB2b2lkIFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0V2hlZWxFdmVudEhhbmRsZXJDb3VudCh1bnNp Z25lZCB3aGVlbEV2ZW50SAogICAgICAgICByZXR1cm47CiAKICAgICBtX3doZWVsRXZlbnRIYW5k bGVyQ291bnQgPSB3aGVlbEV2ZW50SGFuZGxlckNvdW50OwotICAgIG1fY2hhbmdlZFByb3BlcnRp ZXMgfD0gV2hlZWxFdmVudEhhbmRsZXJDb3VudDsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoV2hl ZWxFdmVudEhhbmRsZXJDb3VudCk7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldEhhc0No YW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0xNDYsNyArMTQyLDcgQEAgdm9pZCBTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRp b25Pbk1haW5UaHJlYWQKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zaG91bGRVcGRhdGVTY3Jv bGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkID0gcmVhc29uczsKLSAgICBtX2NoYW5nZWRQcm9w ZXJ0aWVzIHw9IFNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQ7Cisg ICAgc2V0UHJvcGVydHlDaGFuZ2VkKFNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1h aW5UaHJlYWQpOwogICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zZXRIYXNDaGFuZ2VkUHJvcGVy dGllcyh0cnVlKTsKIH0KIApAQCAtMTU2LDcgKzE1Miw3IEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlOjpzZXRIb3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eShTY3JvbGxFbGFzdGlj aXR5CiAgICAgICAgIHJldHVybjsKIAogICAgIG1faG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkg PSBob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eTsKLSAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzIHw9 IEhvcml6b250YWxTY3JvbGxFbGFzdGljaXR5OworICAgIHNldFByb3BlcnR5Q2hhbmdlZChIb3Jp em9udGFsU2Nyb2xsRWxhc3RpY2l0eSk7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldEhh c0NoYW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0xNjYsNyArMTYyLDcgQEAgdm9pZCBT Y3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eShT Y3JvbGxFbGFzdGljaXR5IHYKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV92ZXJ0aWNhbFNjcm9s bEVsYXN0aWNpdHkgPSB2ZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHk7Ci0gICAgbV9jaGFuZ2VkUHJv cGVydGllcyB8PSBWZXJ0aWNhbFNjcm9sbEVsYXN0aWNpdHk7CisgICAgc2V0UHJvcGVydHlDaGFu Z2VkKFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSk7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUt PnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0xNzYsNyArMTcyLDcgQEAg dm9pZCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldEhhc0VuYWJsZWRIb3Jpem9udGFs U2Nyb2xsYmFyKGJvb2wgaGFzRW5hYmwKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9oYXNFbmFi bGVkSG9yaXpvbnRhbFNjcm9sbGJhciA9IGhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyOwot ICAgIG1fY2hhbmdlZFByb3BlcnRpZXMgfD0gSGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXI7 CisgICAgc2V0UHJvcGVydHlDaGFuZ2VkKEhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyKTsK ICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0SGFzQ2hhbmdlZFByb3BlcnRpZXModHJ1ZSk7 CiB9CiAKQEAgLTE4Niw3ICsxODIsNyBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZTo6c2V0SGFzRW5hYmxlZFZlcnRpY2FsU2Nyb2xsYmFyKGJvb2wgaGFzRW5hYmxlZAogICAgICAg ICByZXR1cm47CiAKICAgICBtX2hhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhciA9IGhhc0VuYWJs ZWRWZXJ0aWNhbFNjcm9sbGJhcjsKLSAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzIHw9IEhhc0VuYWJs ZWRWZXJ0aWNhbFNjcm9sbGJhcjsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoSGFzRW5hYmxlZFZl cnRpY2FsU2Nyb2xsYmFyKTsKICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0SGFzQ2hhbmdl ZFByb3BlcnRpZXModHJ1ZSk7CiB9CiAKQEAgLTE5Niw3ICsxOTIsNyBAQCB2b2lkIFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0SG9yaXpvbnRhbFNjcm9sbGJhck1vZGUoU2Nyb2xsYmFy TW9kZSBob3JpegogICAgICAgICByZXR1cm47CiAKICAgICBtX2hvcml6b250YWxTY3JvbGxiYXJN b2RlID0gaG9yaXpvbnRhbFNjcm9sbGJhck1vZGU7Ci0gICAgbV9jaGFuZ2VkUHJvcGVydGllcyB8 PSBIb3Jpem9udGFsU2Nyb2xsYmFyTW9kZTsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoSG9yaXpv bnRhbFNjcm9sbGJhck1vZGUpOwogICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zZXRIYXNDaGFu Z2VkUHJvcGVydGllcyh0cnVlKTsKIH0KIApAQCAtMjA2LDcgKzIwMiw3IEBAIHZvaWQgU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpzZXRWZXJ0aWNhbFNjcm9sbGJhck1vZGUoU2Nyb2xsYmFy TW9kZSB2ZXJ0aWNhCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fdmVydGljYWxTY3JvbGxiYXJN b2RlID0gdmVydGljYWxTY3JvbGxiYXJNb2RlOwotICAgIG1fY2hhbmdlZFByb3BlcnRpZXMgfD0g VmVydGljYWxTY3JvbGxiYXJNb2RlOworICAgIHNldFByb3BlcnR5Q2hhbmdlZChWZXJ0aWNhbFNj cm9sbGJhck1vZGUpOwogICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zZXRIYXNDaGFuZ2VkUHJv cGVydGllcyh0cnVlKTsKIH0KIApAQCAtMjE0LDcgKzIxMCw3IEBAIHZvaWQgU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpzZXRSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2lu dCYgcmVxCiB7CiAgICAgbV9yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbiA9IHJlcXVlc3RlZFNjcm9s bFBvc2l0aW9uOwogICAgIG1fcmVxdWVzdGVkU2Nyb2xsUG9zaXRpb25SZXByZXNlbnRzUHJvZ3Jh bW1hdGljU2Nyb2xsID0gcmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbDsKLSAgICBtX2NoYW5n ZWRQcm9wZXJ0aWVzIHw9IFJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uOworICAgIHNldFByb3BlcnR5 Q2hhbmdlZChSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbik7CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRy ZWUtPnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCkBAIC0yMjQsNyArMjIwLDcg QEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldFNjcm9sbE9yaWdpbihjb25z dCBJbnRQb2ludCYgc2Nyb2xsT3JpZ2luKQogICAgICAgICByZXR1cm47CiAKICAgICBtX3Njcm9s bE9yaWdpbiA9IHNjcm9sbE9yaWdpbjsKLSAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzIHw9IFNjcm9s bE9yaWdpbjsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoU2Nyb2xsT3JpZ2luKTsKICAgICBtX3Nj cm9sbGluZ1N0YXRlVHJlZS0+c2V0SGFzQ2hhbmdlZFByb3BlcnRpZXModHJ1ZSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlLmgKaW5kZXggMDQ4MjczZWY2ZjI0ZmUwNWI3YzU4NWZhYWUwZDk5NDMy NTViZmNmMy4uMjhkMjMzMDY0YzYyMmMwZjA3Zjc5MTk3YzczOWFiZDU3YTVmZGRhNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlLmgKQEAgLTQ2LDI5ICs0NiwyNSBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB+U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKCk7CiAKICAgICBlbnVtIENoYW5nZWRQcm9w ZXJ0eSB7Ci0gICAgICAgIFZpZXdwb3J0UmVjdCA9IDEgPDwgMCwKLSAgICAgICAgQ29udGVudHNT aXplID0gMSA8PCAxLAotICAgICAgICBGcmFtZVNjYWxlRmFjdG9yID0gMSA8PCAyLAotICAgICAg ICBOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiA9IDEgPDwgMywKLSAgICAgICAgV2hlZWxFdmVudEhh bmRsZXJDb3VudCA9IDEgPDwgNCwKLSAgICAgICAgU2hvdWxkVXBkYXRlU2Nyb2xsTGF5ZXJQb3Np dGlvbk9uTWFpblRocmVhZCA9IDEgPDwgNSwKLSAgICAgICAgSG9yaXpvbnRhbFNjcm9sbEVsYXN0 aWNpdHkgPSAxIDw8IDYsCi0gICAgICAgIFZlcnRpY2FsU2Nyb2xsRWxhc3RpY2l0eSA9IDEgPDwg NywKLSAgICAgICAgSGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXIgPSAxIDw8IDgsCi0gICAg ICAgIEhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJhciA9IDEgPDwgOSwKLSAgICAgICAgSG9yaXpv bnRhbFNjcm9sbGJhck1vZGUgPSAxIDw8IDEwLAotICAgICAgICBWZXJ0aWNhbFNjcm9sbGJhck1v ZGUgPSAxIDw8IDExLAotICAgICAgICBTY3JvbGxPcmlnaW4gPSAxIDw8IDEyLAotICAgICAgICBS ZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbiA9IDEgPDwgMTMsCi0gICAgICAgIENvdW50ZXJTY3JvbGxp bmdMYXllciA9IDEgPDwgMTQsCisgICAgICAgIFZpZXdwb3J0UmVjdCA9IE51bVN0YXRlTm9kZUJp dHMsCisgICAgICAgIENvbnRlbnRzU2l6ZSwKKyAgICAgICAgRnJhbWVTY2FsZUZhY3RvciwKKyAg ICAgICAgTm9uRmFzdFNjcm9sbGFibGVSZWdpb24sCisgICAgICAgIFdoZWVsRXZlbnRIYW5kbGVy Q291bnQsCisgICAgICAgIFNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJl YWQsCisgICAgICAgIEhvcml6b250YWxTY3JvbGxFbGFzdGljaXR5LAorICAgICAgICBWZXJ0aWNh bFNjcm9sbEVsYXN0aWNpdHksCisgICAgICAgIEhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFy LAorICAgICAgICBIYXNFbmFibGVkVmVydGljYWxTY3JvbGxiYXIsCisgICAgICAgIEhvcml6b250 YWxTY3JvbGxiYXJNb2RlLAorICAgICAgICBWZXJ0aWNhbFNjcm9sbGJhck1vZGUsCisgICAgICAg IFNjcm9sbE9yaWdpbiwKKyAgICAgICAgUmVxdWVzdGVkU2Nyb2xsUG9zaXRpb24sCisgICAgICAg IENvdW50ZXJTY3JvbGxpbmdMYXllcgogICAgIH07CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNTY3Jv bGxpbmdOb2RlKCkgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdmlydHVhbCBib29s IGhhc0NoYW5nZWRQcm9wZXJ0aWVzKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9jaGFuZ2Vk UHJvcGVydGllczsgfQotICAgIHZpcnR1YWwgdW5zaWduZWQgY2hhbmdlZFByb3BlcnRpZXMoKSBj b25zdCBPVkVSUklERSB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9Ci0gICAgdmlydHVh bCB2b2lkIHJlc2V0Q2hhbmdlZFByb3BlcnRpZXMoKSBPVkVSUklERSB7IG1fY2hhbmdlZFByb3Bl cnRpZXMgPSAwOyB9Ci0KICAgICBjb25zdCBJbnRSZWN0JiB2aWV3cG9ydFJlY3QoKSBjb25zdCB7 IHJldHVybiBtX3ZpZXdwb3J0UmVjdDsgfQogICAgIHZvaWQgc2V0Vmlld3BvcnRSZWN0KGNvbnN0 IEludFJlY3QmKTsKIApAQCAtMTE2LDggKzExMiw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENv dW50ZXJTY3JvbGxpbmdMYXllcihHcmFwaGljc0xheWVyKik7CiAgICAgUGxhdGZvcm1MYXllciog Y291bnRlclNjcm9sbGluZ1BsYXRmb3JtTGF5ZXIoKSBjb25zdDsKIAotICAgIGJvb2wgY291bnRl clNjcm9sbGluZ0xheWVyRGlkQ2hhbmdlKCkgY29uc3QgeyByZXR1cm4gbV9jb3VudGVyU2Nyb2xs aW5nTGF5ZXJEaWRDaGFuZ2U7IH0KLQogICAgIGJvb2wgcmVxdWVzdGVkU2Nyb2xsUG9zaXRpb25S ZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0ZWRT Y3JvbGxQb3NpdGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGw7IH0KIAogICAgIHZpcnR1 YWwgdm9pZCBkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiwgaW50IGluZGVudCkgY29uc3QgT1ZF UlJJREU7CkBAIC0xMjYsOCArMTIwLDYgQEAgcHJpdmF0ZToKICAgICBTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiwgU2Nyb2xsaW5nTm9kZUlEKTsKICAgICBT Y3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoY29uc3QgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlJik7CiAKLSAgICB1bnNpZ25lZCBtX2NoYW5nZWRQcm9wZXJ0aWVzOwotCiAgICAgR3JhcGhp Y3NMYXllciogbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXI7CiAjaWYgUExBVEZPUk0oTUFDKQogICAg IFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX2NvdW50ZXJTY3JvbGxpbmdQbGF0Zm9ybUxheWVy OwpAQCAtMTUwLDcgKzE0Miw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc0VuYWJsZWRIb3Jp em9udGFsU2Nyb2xsYmFyOwogICAgIGJvb2wgbV9oYXNFbmFibGVkVmVydGljYWxTY3JvbGxiYXI7 CiAgICAgYm9vbCBtX3JlcXVlc3RlZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRp Y1Njcm9sbDsKLSAgICBib29sIG1fY291bnRlclNjcm9sbGluZ0xheWVyRGlkQ2hhbmdlOwogCiAg ICAgU2Nyb2xsYmFyTW9kZSBtX2hvcml6b250YWxTY3JvbGxiYXJNb2RlOwogICAgIFNjcm9sbGJh ck1vZGUgbV92ZXJ0aWNhbFNjcm9sbGJhck1vZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlLmNwcAppbmRleCBi NDQ4OGJlODZmMjA4MWJlOTQ2OGUxY2EyZTY2ZGJmNDNmYjA5ZDQwLi5kMjhhYjhiZWVlYWM4NmJk YTZmOWM1YmM1NGJlOWFiNzUzYzdkZjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHAKQEAgLTQyLDE0 ICs0MiwxMiBAQCBQYXNzT3duUHRyPFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZT4gU2Nyb2xsaW5n U3RhdGVTdGlja3lOb2RlOjpjcmVhdGUoU2Nyb2xsaW5nUwogCiBTY3JvbGxpbmdTdGF0ZVN0aWNr eU5vZGU6OlNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHRyZWUs IFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAgOiBTY3JvbGxpbmdTdGF0ZU5vZGUodHJlZSwg bm9kZUlEKQotICAgICwgbV9jaGFuZ2VkUHJvcGVydGllcygwKQogewogfQogCiBTY3JvbGxpbmdT dGF0ZVN0aWNreU5vZGU6OlNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZShjb25zdCBTY3JvbGxpbmdT dGF0ZVN0aWNreU5vZGUmIG5vZGUpCiAgICAgOiBTY3JvbGxpbmdTdGF0ZU5vZGUobm9kZSkKICAg ICAsIG1fY29uc3RyYWludHMoU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzKG5vZGUu dmlld3BvcnRDb25zdHJhaW50cygpKSkKLSAgICAsIG1fY2hhbmdlZFByb3BlcnRpZXMobm9kZS5j aGFuZ2VkUHJvcGVydGllcygpKQogewogfQogCkBAIC02OCw3ICs2Niw3IEBAIHZvaWQgU2Nyb2xs aW5nU3RhdGVTdGlja3lOb2RlOjp1cGRhdGVDb25zdHJhaW50cyhjb25zdCBTdGlja3lQb3NpdGlv blZpZXdwb3J0Q29uCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fY29uc3RyYWludHMgPSBjb25z dHJhaW50czsKLSAgICBtX2NoYW5nZWRQcm9wZXJ0aWVzID0gVmlld3BvcnRDb25zdHJhaW50czsK KyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoVmlld3BvcnRDb25zdHJhaW50cyk7CiAgICAgbV9zY3Jv bGxpbmdTdGF0ZVRyZWUtPnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNr eU5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3Rp Y2t5Tm9kZS5oCmluZGV4IDZmOGIyMjU0YjlhZGY1ZDVhYjEzMWUxNmYyOWEyMzI4Y2U0NmNjMGUu LmIyY2Y3NTQ5NGI4MTkxNGNmM2I5M2E4YmZiYWEyMWM1ODlhMjgzN2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9k ZS5oCkBAIC00NSwxMiArNDUsMTAgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+U2Nyb2xsaW5n U3RhdGVTdGlja3lOb2RlKCk7CiAKLSAgICBlbnVtIENoYW5nZWRQcm9wZXJ0eUZvclN0aWNreSB7 Ci0gICAgICAgIFZpZXdwb3J0Q29uc3RyYWludHMgPSAxIDw8IDAKKyAgICBlbnVtIHsKKyAgICAg ICAgVmlld3BvcnRDb25zdHJhaW50cyA9IE51bVN0YXRlTm9kZUJpdHMKICAgICB9OwogCi0gICAg dmlydHVhbCB1bnNpZ25lZCBjaGFuZ2VkUHJvcGVydGllcygpIGNvbnN0IE9WRVJSSURFIHsgcmV0 dXJuIG1fY2hhbmdlZFByb3BlcnRpZXM7IH0KLQogICAgIHZvaWQgdXBkYXRlQ29uc3RyYWludHMo Y29uc3QgU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzJik7CiAgICAgY29uc3QgU3Rp Y2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzJiB2aWV3cG9ydENvbnN0cmFpbnRzKCkgY29u c3QgeyByZXR1cm4gbV9jb25zdHJhaW50czsgfQogCkBAIC02MCwxNCArNTgsMTEgQEAgcHJpdmF0 ZToKIAogICAgIHZpcnR1YWwgYm9vbCBpc1N0aWNreU5vZGUoKSBPVkVSUklERSB7IHJldHVybiB0 cnVlOyB9CiAKLSAgICB2aXJ0dWFsIGJvb2wgaGFzQ2hhbmdlZFByb3BlcnRpZXMoKSBjb25zdCBP VkVSUklERSB7IHJldHVybiBtX2NoYW5nZWRQcm9wZXJ0aWVzOyB9Ci0gICAgdmlydHVhbCB2b2lk IHJlc2V0Q2hhbmdlZFByb3BlcnRpZXMoKSBPVkVSUklERSB7IG1fY2hhbmdlZFByb3BlcnRpZXMg PSAwOyB9CiAgICAgdmlydHVhbCB2b2lkIHN5bmNMYXllclBvc2l0aW9uRm9yVmlld3BvcnRSZWN0 KGNvbnN0IExheW91dFJlY3QmIHZpZXdwb3J0UmVjdCkgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFs IHZvaWQgZHVtcFByb3BlcnRpZXMoVGV4dFN0cmVhbSYsIGludCBpbmRlbnQpIGNvbnN0IE9WRVJS SURFOwogCiAgICAgU3RpY2t5UG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzIG1fY29uc3RyYWlu dHM7Ci0gICAgdW5zaWduZWQgbV9jaGFuZ2VkUHJvcGVydGllczsKIH07CiAKIGlubGluZSBTY3Jv bGxpbmdTdGF0ZVN0aWNreU5vZGUqIHRvU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlKFNjcm9sbGlu Z1N0YXRlTm9kZSogbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZS5jcHAKaW5kZXggNTI2N2NmMzQ4YWMzZmYxYTFjYTVhNmM2YmY2M2UxZGU5ZjFj Y2QwZS4uZDRlMjEwY2YwZmExNzVmZmRkZTE1Yjc5YWUwZDI4NGVjYWE1ZjU4ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAKQEAgLTEyOCwy MSArMTI4LDIyIEBAIHZvaWQgU2Nyb2xsaW5nVHJlZTo6Y29tbWl0TmV3VHJlZVN0YXRlKFBhc3NP d25QdHI8U2Nyb2xsaW5nU3RhdGVUcmVlPiBzY3JvbGxpbmdTCiB7CiAgICAgQVNTRVJUKFNjcm9s bGluZ1RocmVhZDo6aXNDdXJyZW50VGhyZWFkKCkpOwogCi0gICAgaWYgKHNjcm9sbGluZ1N0YXRl VHJlZS0+cm9vdFN0YXRlTm9kZSgpLT5jaGFuZ2VkUHJvcGVydGllcygpICYgKFNjcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZTo6V2hlZWxFdmVudEhhbmRsZXJDb3VudCB8IFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24pIHx8IHNjcm9sbGluZ1N0YXRl VHJlZS0+cm9vdFN0YXRlTm9kZSgpLT5zY3JvbGxMYXllckRpZENoYW5nZSgpKSB7CisgICAgU2Ny b2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKiByb290Tm9kZSA9IHNjcm9sbGluZ1N0YXRlVHJlZS0+ cm9vdFN0YXRlTm9kZSgpOworICAgIGlmIChyb290Tm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6V2hlZWxFdmVudEhhbmRsZXJDb3VudCkgfHwgcm9v dE5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6Ok5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uKSB8fCByb290Tm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNj cm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsTGF5ZXIpKSB7CiAgICAgICAgIE11dGV4TG9ja2VyIGxv Y2sobV9tdXRleCk7CiAKLSAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRl Tm9kZSgpLT5zY3JvbGxMYXllckRpZENoYW5nZSgpKQorICAgICAgICBpZiAocm9vdE5vZGUtPmhh c0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKICAgICAg ICAgICAgIG1fbWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24gPSBJbnRQb2ludCgpOwotICAgICAgICBp ZiAoc2Nyb2xsaW5nU3RhdGVUcmVlLT5yb290U3RhdGVOb2RlKCktPmNoYW5nZWRQcm9wZXJ0aWVz KCkgJiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OldoZWVsRXZlbnRIYW5kbGVyQ291bnQp CisgICAgICAgIGlmIChyb290Tm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6V2hlZWxFdmVudEhhbmRsZXJDb3VudCkpCiAgICAgICAgICAgICBtX2hh c1doZWVsRXZlbnRIYW5kbGVycyA9IHNjcm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgp LT53aGVlbEV2ZW50SGFuZGxlckNvdW50KCk7Ci0gICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZVRy ZWUtPnJvb3RTdGF0ZU5vZGUoKS0+Y2hhbmdlZFByb3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24pCisgICAgICAgIGlmIChyb290 Tm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Tm9u RmFzdFNjcm9sbGFibGVSZWdpb24pKQogICAgICAgICAgICAgbV9ub25GYXN0U2Nyb2xsYWJsZVJl Z2lvbiA9IHNjcm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpLT5ub25GYXN0U2Nyb2xs YWJsZVJlZ2lvbigpOwogICAgIH0KICAgICAKLSAgICBUZW1wb3JhcnlDaGFuZ2U8Ym9vbD4gY2hh bmdlSGFuZGxpbmdQcm9ncmFtbWF0aWNTY3JvbGwobV9pc0hhbmRsaW5nUHJvZ3JhbW1hdGljU2Ny b2xsLCBzY3JvbGxpbmdTdGF0ZVRyZWUtPnJvb3RTdGF0ZU5vZGUoKS0+cmVxdWVzdGVkU2Nyb2xs UG9zaXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKCkpOworICAgIFRlbXBvcmFyeUNo YW5nZTxib29sPiBjaGFuZ2VIYW5kbGluZ1Byb2dyYW1tYXRpY1Njcm9sbChtX2lzSGFuZGxpbmdQ cm9ncmFtbWF0aWNTY3JvbGwsIHJvb3ROb2RlLT5yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvblJlcHJl c2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSk7CiAKICAgICByZW1vdmVEZXN0cm95ZWROb2Rlcyhz Y3JvbGxpbmdTdGF0ZVRyZWUuZ2V0KCkpOwotICAgIHVwZGF0ZVRyZWVGcm9tU3RhdGVOb2RlKHNj cm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpKTsKKyAgICB1cGRhdGVUcmVlRnJvbVN0 YXRlTm9kZShyb290Tm9kZSk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZTo6dXBkYXRlVHJlZUZy b21TdGF0ZU5vZGUoU2Nyb2xsaW5nU3RhdGVOb2RlKiBzdGF0ZU5vZGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZS5jcHAKaW5kZXggN2U2MDgwMzY2Y2RkY2U4OTVhZDdlNGVkN2YwNTI1MjRiMzM3MmZkNC4u MjQxODAyZWYzODY4MzAyZTA5YjA1NjNmOWY5Njg5NjZkZmIyMzY1OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxp bmdOb2RlLmNwcApAQCAtNTMsMzcgKzUzLDM3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGU6OnVwZGF0ZShTY3JvbGxpbmdTdGF0ZU5vZGUqIHN0YXRlTm9kZSkKIHsKICAgICBTY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUqIHN0YXRlID0gdG9TY3JvbGxpbmdTdGF0ZVNjcm9sbGlu Z05vZGUoc3RhdGVOb2RlKTsKIAotICAgIGlmIChzdGF0ZS0+Y2hhbmdlZFByb3BlcnRpZXMoKSAm IFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Vmlld3BvcnRSZWN0KQorICAgIGlmIChzdGF0 ZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Vmlld3Bv cnRSZWN0KSkKICAgICAgICAgbV92aWV3cG9ydFJlY3QgPSBzdGF0ZS0+dmlld3BvcnRSZWN0KCk7 CiAKLSAgICBpZiAoc3RhdGUtPmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiBTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGU6OkNvbnRlbnRzU2l6ZSkKKyAgICBpZiAoc3RhdGUtPmhhc0NoYW5nZWRQcm9w ZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OkNvbnRlbnRzU2l6ZSkpCiAgICAgICAg IG1fY29udGVudHNTaXplID0gc3RhdGUtPmNvbnRlbnRzU2l6ZSgpOwogCi0gICAgaWYgKHN0YXRl LT5jaGFuZ2VkUHJvcGVydGllcygpICYgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpGcmFt ZVNjYWxlRmFjdG9yKQorICAgIGlmIChzdGF0ZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTo6RnJhbWVTY2FsZUZhY3RvcikpCiAgICAgICAgIG1fZnJhbWVT Y2FsZUZhY3RvciA9IHN0YXRlLT5mcmFtZVNjYWxlRmFjdG9yKCk7CiAKLSAgICBpZiAoc3RhdGUt PmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNob3Vs ZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQpCisgICAgaWYgKHN0YXRlLT5o YXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTaG91bGRVcGRh dGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkKSkKICAgICAgICAgbV9zaG91bGRVcGRh dGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkID0gc3RhdGUtPnNob3VsZFVwZGF0ZVNj cm9sbExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQoKTsKIAotICAgIGlmIChzdGF0ZS0+Y2hhbmdl ZFByb3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6SG9yaXpvbnRhbFNj cm9sbEVsYXN0aWNpdHkpCisgICAgaWYgKHN0YXRlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eSkpCiAgICAg ICAgIG1faG9yaXpvbnRhbFNjcm9sbEVsYXN0aWNpdHkgPSBzdGF0ZS0+aG9yaXpvbnRhbFNjcm9s bEVsYXN0aWNpdHkoKTsKIAotICAgIGlmIChzdGF0ZS0+Y2hhbmdlZFByb3BlcnRpZXMoKSAmIFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxFbGFzdGljaXR5KQorICAg IGlmIChzdGF0ZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZTo6VmVydGljYWxTY3JvbGxFbGFzdGljaXR5KSkKICAgICAgICAgbV92ZXJ0aWNhbFNjcm9sbEVs YXN0aWNpdHkgPSBzdGF0ZS0+dmVydGljYWxTY3JvbGxFbGFzdGljaXR5KCk7CiAKLSAgICBpZiAo c3RhdGUtPmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6 Okhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyKQorICAgIGlmIChzdGF0ZS0+aGFzQ2hhbmdl ZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6SGFzRW5hYmxlZEhvcml6b250 YWxTY3JvbGxiYXIpKQogICAgICAgICBtX2hhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyID0g c3RhdGUtPmhhc0VuYWJsZWRIb3Jpem9udGFsU2Nyb2xsYmFyKCk7CiAKLSAgICBpZiAoc3RhdGUt PmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6Okhhc0Vu YWJsZWRWZXJ0aWNhbFNjcm9sbGJhcikKKyAgICBpZiAoc3RhdGUtPmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6Okhhc0VuYWJsZWRWZXJ0aWNhbFNjcm9sbGJh cikpCiAgICAgICAgIG1faGFzRW5hYmxlZFZlcnRpY2FsU2Nyb2xsYmFyID0gc3RhdGUtPmhhc0Vu YWJsZWRWZXJ0aWNhbFNjcm9sbGJhcigpOwogCi0gICAgaWYgKHN0YXRlLT5jaGFuZ2VkUHJvcGVy dGllcygpICYgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsYmFy TW9kZSkKKyAgICBpZiAoc3RhdGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGU6Okhvcml6b250YWxTY3JvbGxiYXJNb2RlKSkKICAgICAgICAgbV9ob3Jpem9u dGFsU2Nyb2xsYmFyTW9kZSA9IHN0YXRlLT5ob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpOwogCi0g ICAgaWYgKHN0YXRlLT5jaGFuZ2VkUHJvcGVydGllcygpICYgU2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlOjpWZXJ0aWNhbFNjcm9sbGJhck1vZGUpCisgICAgaWYgKHN0YXRlLT5oYXNDaGFuZ2Vk UHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpWZXJ0aWNhbFNjcm9sbGJhck1v ZGUpKQogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyTW9kZSA9IHN0YXRlLT52ZXJ0aWNhbFNj cm9sbGJhck1vZGUoKTsKIAotICAgIGlmIChzdGF0ZS0+Y2hhbmdlZFByb3BlcnRpZXMoKSAmIFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsT3JpZ2luKQorICAgIGlmIChzdGF0ZS0+ aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsT3Jp Z2luKSkKICAgICAgICAgbV9zY3JvbGxPcmlnaW4gPSBzdGF0ZS0+c2Nyb2xsT3JpZ2luKCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdTdGF0ZU5vZGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nU3RhdGVOb2RlTWFjLm1tCmluZGV4IDlhMTZkNjI2ZGQzOTdkZWQwMDcyZDZhMWQyMzRl ODQzZDk4YjI5YTUuLjExMjYzMDIzYTExZmM2Y2ZmZjAzNjAxNDI0NjMzMDAwZGIzNmU0MGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdTdGF0 ZU5vZGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1N0YXRlTm9kZU1hYy5tbQpAQCAtNTMsNyArNTMsNyBAQCB2b2lkIFNjcm9sbGluZ1N0YXRl Tm9kZTo6c2V0U2Nyb2xsTGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllcikKICAgICBt X3BsYXRmb3JtU2Nyb2xsTGF5ZXIgPSBwbGF0Zm9ybVNjcm9sbExheWVyOwogICAgIG1fZ3JhcGhp Y3NMYXllciA9IGdyYXBoaWNzTGF5ZXI7CiAKLSAgICBtX3Njcm9sbExheWVyRGlkQ2hhbmdlID0g dHJ1ZTsKKyAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoU2Nyb2xsTGF5ZXIpOwogICAgIG1fc2Nyb2xs aW5nU3RhdGVUcmVlLT5zZXRIYXNDaGFuZ2VkUHJvcGVydGllcyh0cnVlKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggYjkwYmJiYjA0ZmU1N2Y3YThjNDE1 OWE3ZTAzOWM0ZmVkOWY5MjFmOS4uODlmZWRlOTM3MzZlYjFiNzM1NzEzZWNjZTUzZWIxNWNiYjZh NmRkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlTWFjLm1tCkBAIC00Nyw3ICs0 Nyw3IEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpzZXRDb3VudGVyU2Nyb2xs aW5nTGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGhpCiAgICAgbV9jb3VudGVyU2Nyb2xsaW5nUGxh dGZvcm1MYXllciA9IHBsYXRmb3JtU2Nyb2xsTGF5ZXI7CiAgICAgbV9jb3VudGVyU2Nyb2xsaW5n TGF5ZXIgPSBncmFwaGljc0xheWVyOwogCi0gICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXJEaWRD aGFuZ2UgPSB0cnVlOworICAgIHNldFByb3BlcnR5Q2hhbmdlZChDb3VudGVyU2Nyb2xsaW5nTGF5 ZXIpOwogICAgIGlmIChtX3Njcm9sbGluZ1N0YXRlVHJlZSkKICAgICAgICAgbV9zY3JvbGxpbmdT dGF0ZVRyZWUtPnNldEhhc0NoYW5nZWRQcm9wZXJ0aWVzKHRydWUpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVk Tm9kZS5tbQppbmRleCA0MjNmZDMwZTJhOTI2YjQ5Mzk5YmM0NWJjOWY1ZGZlNDMwOGJlZmZlLi42 ZmY0YWQ3ZWEyZmRlYjRiNGU0MjU5MWFkNTU3ODE0MWVjM2E2ODZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZpeGVk Tm9kZS5tbQpAQCAtNDksMTMgKzQ5LDEzIEBAIFNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6On5TY3Jv bGxpbmdUcmVlRml4ZWROb2RlKCkKIAogdm9pZCBTY3JvbGxpbmdUcmVlRml4ZWROb2RlOjp1cGRh dGUoU2Nyb2xsaW5nU3RhdGVOb2RlKiBzdGF0ZU5vZGUpCiB7Ci0gICAgU2Nyb2xsaW5nU3RhdGVG aXhlZE5vZGUqIHN0YXRlID0gdG9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZShzdGF0ZU5vZGUpOwor ICAgIFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlKiBmaXhlZFN0YXRlTm9kZSA9IHRvU2Nyb2xsaW5n U3RhdGVGaXhlZE5vZGUoc3RhdGVOb2RlKTsKIAotICAgIGlmIChzdGF0ZS0+c2Nyb2xsTGF5ZXJE aWRDaGFuZ2UoKSkKLSAgICAgICAgbV9sYXllciA9IHN0YXRlLT5wbGF0Zm9ybVNjcm9sbExheWVy KCk7CisgICAgaWYgKGZpeGVkU3RhdGVOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5n U3RhdGVOb2RlOjpTY3JvbGxMYXllcikpCisgICAgICAgIG1fbGF5ZXIgPSBmaXhlZFN0YXRlTm9k ZS0+cGxhdGZvcm1TY3JvbGxMYXllcigpOwogCi0gICAgaWYgKHN0YXRlTm9kZS0+Y2hhbmdlZFBy b3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlOjpWaWV3cG9ydENvbnN0cmFpbnRz KQotICAgICAgICBtX2NvbnN0cmFpbnRzID0gc3RhdGUtPnZpZXdwb3J0Q29uc3RyYWludHMoKTsK KyAgICBpZiAoc3RhdGVOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGaXhl ZE5vZGU6OlZpZXdwb3J0Q29uc3RyYWludHMpKQorICAgICAgICBtX2NvbnN0cmFpbnRzID0gZml4 ZWRTdGF0ZU5vZGUtPnZpZXdwb3J0Q29uc3RyYWludHMoKTsKIH0KIAogc3RhdGljIGlubGluZSBD R1BvaW50IG9wZXJhdG9yKihDR1BvaW50JiBhLCBjb25zdCBDR1NpemUmIGIpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5n VHJlZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggNjYzYzczNDFiNjhmOGJhZjkxMWY0NjIwZjYx ZjE3MmU1OWQwYjI5MS4uMGEzNTk3NzVhNjI4ZmI4NWEzODhmMTU0OThhMGFlMzVhMWRkNjU3NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5tbQpAQCAtNjgsMjggKzY4LDI4IEBA IFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjOjp+U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGVNYWMoKQogdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYzo6dXBkYXRlKFNjcm9s bGluZ1N0YXRlTm9kZSogc3RhdGVOb2RlKQogewogICAgIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlOjp1cGRhdGUoc3RhdGVOb2RlKTsKLSAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUq IHN0YXRlID0gdG9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3RhdGVOb2RlKTsKKyAgICBT Y3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUqIHNjcm9sbGluZ1N0YXRlTm9kZSA9IHRvU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlKHN0YXRlTm9kZSk7CiAKLSAgICBpZiAoc3RhdGUtPnNjcm9s bExheWVyRGlkQ2hhbmdlKCkpCi0gICAgICAgIG1fc2Nyb2xsTGF5ZXIgPSBzdGF0ZS0+cGxhdGZv cm1TY3JvbGxMYXllcigpOworICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUtPmhhc0NoYW5nZWRQ cm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKKyAgICAgICAgbV9zY3Jv bGxMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS0+cGxhdGZvcm1TY3JvbGxMYXllcigpOwogCi0g ICAgaWYgKHN0YXRlLT5jb3VudGVyU2Nyb2xsaW5nTGF5ZXJEaWRDaGFuZ2UoKSkKLSAgICAgICAg bV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIgPSBzdGF0ZS0+Y291bnRlclNjcm9sbGluZ1BsYXRmb3Jt TGF5ZXIoKTsKKyAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHko U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIpKQorICAg ICAgICBtX2NvdW50ZXJTY3JvbGxpbmdMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS0+Y291bnRl clNjcm9sbGluZ1BsYXRmb3JtTGF5ZXIoKTsKIAotICAgIGlmIChzdGF0ZS0+Y2hhbmdlZFByb3Bl cnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6UmVxdWVzdGVkU2Nyb2xsUG9z aXRpb24pCi0gICAgICAgIHNldFNjcm9sbFBvc2l0aW9uKHN0YXRlLT5yZXF1ZXN0ZWRTY3JvbGxQ b3NpdGlvbigpKTsKKyAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLT5oYXNDaGFuZ2VkUHJvcGVy dHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbikp CisgICAgICAgIHNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ1N0YXRlTm9kZS0+cmVxdWVzdGVk U2Nyb2xsUG9zaXRpb24oKSk7CiAKLSAgICBpZiAoc3RhdGUtPnNjcm9sbExheWVyRGlkQ2hhbmdl KCkgfHwgc3RhdGUtPmNoYW5nZWRQcm9wZXJ0aWVzKCkgJiAoU2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlOjpDb250ZW50c1NpemUgfCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlZpZXdw b3J0UmVjdCkpCisgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5 KFNjcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsTGF5ZXIpIHx8IHNjcm9sbGluZ1N0YXRlTm9kZS0+ aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Q29udGVudHNT aXplKSB8fCBzY3JvbGxpbmdTdGF0ZU5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZVNjcm9sbGluZ05vZGU6OlZpZXdwb3J0UmVjdCkpCiAgICAgICAgIHVwZGF0ZU1haW5GcmFt ZVBpblN0YXRlKHNjcm9sbFBvc2l0aW9uKCkpOwogCi0gICAgaWYgKChzdGF0ZS0+Y2hhbmdlZFBy b3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2hvdWxkVXBkYXRlU2Ny b2xsTGF5ZXJQb3NpdGlvbk9uTWFpblRocmVhZCkpIHsKKyAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTaG91 bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkKSkgewogICAgICAgICB1bnNp Z25lZCBtYWluVGhyZWFkU2Nyb2xsaW5nUmVhc29ucyA9IHRoaXMtPnNob3VsZFVwZGF0ZVNjcm9s bExheWVyUG9zaXRpb25Pbk1haW5UaHJlYWQoKTsKIAogICAgICAgICBpZiAobWFpblRocmVhZFNj cm9sbGluZ1JlYXNvbnMpIHsKICAgICAgICAgICAgIC8vIFdlJ3JlIHRyYW5zaXRpb25pbmcgdG8g dGhlIHNsb3cgInVwZGF0ZSBzY3JvbGwgbGF5ZXIgcG9zaXRpb24gb24gdGhlIG1haW4gdGhyZWFk IiBtb2RlLgogICAgICAgICAgICAgLy8gSW5pdGlhbGl6ZSB0aGUgcHJvYmFibGUgbWFpbiB0aHJl YWQgc2Nyb2xsIHBvc2l0aW9uIHdpdGggdGhlIGN1cnJlbnQgc2Nyb2xsIGxheWVyIHBvc2l0aW9u LgotICAgICAgICAgICAgaWYgKHN0YXRlLT5jaGFuZ2VkUHJvcGVydGllcygpICYgU2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlOjpSZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbikKLSAgICAgICAgICAg ICAgICBtX3Byb2JhYmxlTWFpblRocmVhZFNjcm9sbFBvc2l0aW9uID0gc3RhdGUtPnJlcXVlc3Rl ZFNjcm9sbFBvc2l0aW9uKCk7CisgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLT5o YXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpSZXF1ZXN0ZWRT Y3JvbGxQb3NpdGlvbikpCisgICAgICAgICAgICAgICAgbV9wcm9iYWJsZU1haW5UaHJlYWRTY3Jv bGxQb3NpdGlvbiA9IHNjcm9sbGluZ1N0YXRlTm9kZS0+cmVxdWVzdGVkU2Nyb2xsUG9zaXRpb24o KTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIENHUG9pbnQgc2Nyb2xsTGF5 ZXJQb3NpdGlvbiA9IG1fc2Nyb2xsTGF5ZXIuZ2V0KCkucG9zaXRpb247CiAgICAgICAgICAgICAg ICAgbV9wcm9iYWJsZU1haW5UaHJlYWRTY3JvbGxQb3NpdGlvbiA9IEludFBvaW50KC1zY3JvbGxM YXllclBvc2l0aW9uLngsIC1zY3JvbGxMYXllclBvc2l0aW9uLnkpOwpAQCAtMTAwLDkgKzEwMCw5 IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWM6OnVwZGF0ZShTY3JvbGxpbmdT dGF0ZU5vZGUqIHN0YXRlTm9kZSkKICAgICAgICAgICAgIGxvZ1RocmVhZGVkU2Nyb2xsaW5nTW9k ZShtYWluVGhyZWFkU2Nyb2xsaW5nUmVhc29ucyk7CiAgICAgfQogCi0gICAgaWYgKChzdGF0ZS0+ Y2hhbmdlZFByb3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6V2hlZWxF dmVudEhhbmRsZXJDb3VudCkpIHsKKyAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLT5oYXNDaGFu Z2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpXaGVlbEV2ZW50SGFuZGxl ckNvdW50KSkgewogICAgICAgICBpZiAoc2Nyb2xsaW5nVHJlZSgpLT5zY3JvbGxpbmdQZXJmb3Jt YW5jZUxvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgICAgICBsb2dXaGVlbEV2ZW50SGFuZGxlckNv dW50Q2hhbmdlZChzdGF0ZS0+d2hlZWxFdmVudEhhbmRsZXJDb3VudCgpKTsKKyAgICAgICAgICAg IGxvZ1doZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKHNjcm9sbGluZ1N0YXRlTm9kZS0+d2hl ZWxFdmVudEhhbmRsZXJDb3VudCgpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5t bQppbmRleCAwNjkwNTE0NDgzY2U2YzM4NDU1YzdlOWY3NmZhMDI4YmRiZDBkN2U1Li41MWEzMmJj MTVjNjNkYzU0NDkyYzYxNDNkNjY2NGY2YjRlZWY0YzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTdGlja3lOb2Rl Lm1tCkBAIC00OSwxMyArNDksMTMgQEAgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6On5TY3JvbGxp bmdUcmVlU3RpY2t5Tm9kZSgpCiAKIHZvaWQgU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGU6OnVwZGF0 ZShTY3JvbGxpbmdTdGF0ZU5vZGUqIHN0YXRlTm9kZSkKIHsKLSAgICBTY3JvbGxpbmdTdGF0ZVN0 aWNreU5vZGUqIHN0YXRlID0gdG9TY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUoc3RhdGVOb2RlKTsK KyAgICBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUqIHN0aWNreVN0YXRlTm9kZSA9IHRvU2Nyb2xs aW5nU3RhdGVTdGlja3lOb2RlKHN0YXRlTm9kZSk7CiAKLSAgICBpZiAoc3RhdGUtPnNjcm9sbExh eWVyRGlkQ2hhbmdlKCkpCi0gICAgICAgIG1fbGF5ZXIgPSBzdGF0ZS0+cGxhdGZvcm1TY3JvbGxM YXllcigpOworICAgIGlmIChzdGlja3lTdGF0ZU5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3Jv bGxpbmdTdGF0ZU5vZGU6OlNjcm9sbExheWVyKSkKKyAgICAgICAgbV9sYXllciA9IHN0aWNreVN0 YXRlTm9kZS0+cGxhdGZvcm1TY3JvbGxMYXllcigpOwogCi0gICAgaWYgKHN0YXRlTm9kZS0+Y2hh bmdlZFByb3BlcnRpZXMoKSAmIFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZTo6Vmlld3BvcnRDb25z dHJhaW50cykKLSAgICAgICAgbV9jb25zdHJhaW50cyA9IHN0YXRlLT52aWV3cG9ydENvbnN0cmFp bnRzKCk7CisgICAgaWYgKHN0YXRlTm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0 YXRlU3RpY2t5Tm9kZTo6Vmlld3BvcnRDb25zdHJhaW50cykpCisgICAgICAgIG1fY29uc3RyYWlu dHMgPSBzdGlja3lTdGF0ZU5vZGUtPnZpZXdwb3J0Q29uc3RyYWludHMoKTsKIH0KIAogc3RhdGlj IGlubGluZSBDR1BvaW50IG9wZXJhdG9yKihDR1BvaW50JiBhLCBjb25zdCBDR1NpemUmIGIpCg==