193121 2019-01-03 12:49:20 -0800 Bring back presentingApplicationPID 2019-01-04 11:02:09 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin achristensen commit-queue webkit-bug-importer oldest_to_newest 1491492 0 krollin 2019-01-03 12:49:20 -0800 Bug 192961 removes presentingApplicationPID from NetworkProcessCreationParameters because it was (a) stored in some global state, the use of which is being minimized, and (b) it was largely unused. However, it was actually still being used in some useful logging in order to tie together child processes with their parent process. Re-introduce this value to NetworkProcessCreationParameters so that we can log it. But, this time, just use it locally instead of storing it in some global state for later retrieval. Make a similar change to WebContentProcess for consistency purposes. 1491493 1 webkit-bug-importer 2019-01-03 12:49:35 -0800 <rdar://problem/47031634> 1491506 2 krollin 2019-01-03 13:28:15 -0800 Actually, it sounds like the plans are for a Network Process to possibly have different parents, not necessarily just the one that actually created it. Therefore, instead of establishing a parent PID just once at startup, pass it in on every resource load request. 1491542 3 358287 krollin 2019-01-03 16:22:39 -0800 Created attachment 358287 Patch 1491559 4 358292 krollin 2019-01-03 17:04:04 -0800 Created attachment 358292 Fix windows build. 1491561 5 358293 krollin 2019-01-03 17:16:16 -0800 Created attachment 358293 Oh, let's be generous ... fix *all* the builds. 1491712 6 358293 achristensen 2019-01-04 10:23:54 -0800 Comment on attachment 358293 Oh, let's be generous ... fix *all* the builds. View in context: https://bugs.webkit.org/attachment.cgi?id=358293&action=review > Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:271 > + loadParameters.parentPID = getCurrentProcessID(); This would be the pid of the WebProcess. Is this what you wanted? presentingApplicationPID would be the pid of the UIProcess. 1491722 7 krollin 2019-01-04 10:32:44 -0800 Oh, right. 1491727 8 358334 krollin 2019-01-04 10:42:18 -0800 Created attachment 358334 Patch 1491740 9 358334 commit-queue 2019-01-04 11:02:08 -0800 Comment on attachment 358334 Patch Clearing flags on attachment: 358334 Committed r239622: <https://trac.webkit.org/changeset/239622> 1491741 10 commit-queue 2019-01-04 11:02:09 -0800 All reviewed patches have been landed. Closing bug. 358287 2019-01-03 16:22:39 -0800 2019-01-03 17:04:03 -0800 Patch bug-193121-20190103162238.patch text/plain 10479 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0ODM1YmE0MmI2Y2ZkNmZk YzQ3MWRiMzk4OWQxYThlNGYyMTZhZjkuLjU3MjFmZGM0ZTcxZTUyN2JkMWYwODY0MDI3YzRhNWNj ZDI0YjZlM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMDEtMDMgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEJyaW5nIGJhY2sgcGFyZW50IHBy b2Nlc3NJRCBmb3IgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzAzMTYzND4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTkyOTYx IHJlbW92ZXMgcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEIGZyb20KKyAgICAgICAgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgYmVjYXVzZSBpdCB3YXMgKGEpIHN0b3JlZCBpbiBzb21l CisgICAgICAgIGdsb2JhbCBzdGF0ZSwgdGhlIHVzZSBvZiB3aGljaCBpcyBiZWluZyBtaW5pbWl6 ZWQsIGFuZCAoYikgaXQgd2FzCisgICAgICAgIGxhcmdlbHkgdW51c2VkLiBIb3dldmVyLCBpdCB3 YXMgYWN0dWFsbHkgc3RpbGwgYmVpbmcgdXNlZCBpbiBzb21lCisgICAgICAgIHVzZWZ1bCBsb2dn aW5nIGluIG9yZGVyIHRvIHRpZSB0b2dldGhlciBjaGlsZCBwcm9jZXNzZXMgd2l0aCB0aGVpcgor ICAgICAgICBwYXJlbnQgcHJvY2Vzcy4gUmUtaW50cm9kdWNlIHRoaXMgdmFsdWUgaW4gTmV0d29y a0xvYWRQYXJhbWV0ZXJzIHNvCisgICAgICAgIHRoYXQgd2UgY2FuIGxvZyBpdC4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MpOgorICAg ICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNs eSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyk6CisKIDIw MTktMDEtMDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGxvZ2ljIGhhbmRsaW5nIEROVCBoZWFkZXIgZHVyaW5nIHJlZGlyZWN0cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgK aW5kZXggY2ZjNGI1MjdmMGQxZjcyZjNkODY4NTgzZjlkNDhiODczZGUzNTFjZS4uY2QzMTg5Yjc5 ZTY1ZGRjMTNiMGM4YmUyMjdjY2U1NjRkMTZkYjBlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oCkBAIC0zOSw2ICszOSw3 IEBAIGNsYXNzIE5ldHdvcmtMb2FkUGFyYW1ldGVycyB7CiBwdWJsaWM6CiAgICAgdWludDY0X3Qg d2ViUGFnZUlEIHsgMCB9OwogICAgIHVpbnQ2NF90IHdlYkZyYW1lSUQgeyAwIH07CisgICAgcGlk X3QgcGFyZW50UElEIHsgMCB9OwogICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCB7IFBBTDo6 U2Vzc2lvbklEOjplbXB0eVNlc3Npb25JRCgpIH07CiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0IHJlcXVlc3Q7CiAgICAgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IGNvbnRlbnRT bmlmZmluZ1BvbGljeSB7IFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeTo6U25pZmZDb250 ZW50IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4IDgwYjcwYWFhYjIyNzkxMDdj ZTBiZGE2N2E2ZWNhMjEwNzVhMmJlZGEuLmNmZTU4ZTFjZTlmN2IyZTIzZmU4N2VjNzBhYWU2YjNi NDljOWM1OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCkBAIC0zNiw2ICszNiw3IEBA IHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXIm IGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBpZGVudGlmaWVyOwogICAgIGVuY29kZXIg PDwgd2ViUGFnZUlEOwogICAgIGVuY29kZXIgPDwgd2ViRnJhbWVJRDsKKyAgICBlbmNvZGVyIDw8 IHBhcmVudFBJRDsKICAgICBlbmNvZGVyIDw8IHNlc3Npb25JRDsKICAgICBlbmNvZGVyIDw8IHJl cXVlc3Q7CiAKQEAgLTExMyw2ICsxMTQsOSBAQCBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrUmVzb3VyYwogICAg IGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LndlYkZyYW1lSUQpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5wYXJlbnRQSUQpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zZXNz aW9uSUQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCA5N2YxMzk2 Yzg1MDViYThiZjJlN2Q0ZDdmMTQzOTg3NzNhNTg5MmQ3Li5iODUyNDVhOTMyZDQwODc4ZjdkNzBm MTcxMTY4YzVmNDllOWYwMzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9p ZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0KCkKICAgICBtX25ldHdvcmtBY3Rpdml0eVRy YWNrZXIgPSBtX2Nvbm5lY3Rpb24tPnN0YXJ0VHJhY2tpbmdSZXNvdXJjZUxvYWQobV9wYXJhbWV0 ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCks IHNlc3Npb25JRCgpKTsKIAogICAgIGlmIChtX2RlZmVyc0xvYWRpbmcpIHsKLSAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IExvYWRpbmcgaXMgZGVmZXJyZWQgKHBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1 NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkKSIsIG1fcGFyYW1l dGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRl bnRpZmllciwgaXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91cygpKTsKKyAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IExvYWRpbmcgaXMgZGVmZXJyZWQgKHBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1 NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkLCBwYXJlbnRQSUQg PSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwg bV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMo KSwgbV9wYXJhbWV0ZXJzLnBhcmVudFBJRCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAg LTE4MiwxNyArMTgyLDE4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCiAg ICAgICAgIG1fbmV0d29ya0xvYWRDaGVja2VyLT5jaGVjayhSZXNvdXJjZVJlcXVlc3QgeyBvcmln aW5hbFJlcXVlc3QoKSB9LCB0aGlzLCBbdGhpc10gKGF1dG8mJiByZXN1bHQpIHsKICAgICAgICAg ICAgIFdURjo6c3dpdGNoT24ocmVzdWx0LAogICAgICAgICAgICAgICAgIFt0aGlzXSAoUmVzb3Vy Y2VFcnJvciYgZXJyb3IpIHsKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgic3RhcnQ6IGVycm9yIGNoZWNraW5nIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJ RCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNl ID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwgcGFyZW50UElEID0gJWQsIGVycm9yLmRvbWFpbiA9 ICV7cHVibGljfXMsIGVycm9yLmNvZGUgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBt X3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHRoaXMtPmlz TWFpblJlc291cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSwgbV9wYXJhbWV0ZXJzLnBhcmVu dFBJRCwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3IuZXJyb3JDb2RlKCkpOwog ICAgICAgICAgICAgICAgICAgICBpZiAoIWVycm9yLmlzQ2FuY2VsbGF0aW9uKCkpCiAgICAgICAg ICAgICAgICAgICAgICAgICB0aGlzLT5kaWRGYWlsTG9hZGluZyhlcnJvcik7CiAgICAgICAgICAg ICAgICAgfSwKICAgICAgICAgICAgICAgICBbdGhpc10gKE5ldHdvcmtMb2FkQ2hlY2tlcjo6UmVk aXJlY3Rpb25UcmlwbGV0JiB0cmlwbGV0KSB7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMtPm1f aXNXYWl0aW5nQ29udGludWVXaWxsU2VuZFJlcXVlc3RGb3JDYWNoZWRSZWRpcmVjdCA9IHRydWU7 CiAgICAgICAgICAgICAgICAgICAgIHRoaXMtPndpbGxTZW5kUmVkaXJlY3RlZFJlcXVlc3QoV1RG TW92ZSh0cmlwbGV0LnJlcXVlc3QpLCBXVEZNb3ZlKHRyaXBsZXQucmVkaXJlY3RSZXF1ZXN0KSwg V1RGTW92ZSh0cmlwbGV0LnJlZGlyZWN0UmVzcG9uc2UpKTsKLSAgICAgICAgICAgICAgICAgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiTmV0d29ya1Jlc291cmNlTG9hZGVyOiBzeW50aGV0aWMg cmVkaXJlY3Qgc2VudCBiZWNhdXNlIHJlcXVlc3QgVVJMIHdhcyBtb2RpZmllZC4iKTsKKyAgICAg ICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IHN5bnRoZXRpYyBy ZWRpcmVjdCBzZW50IGJlY2F1c2UgcmVxdWVzdCBVUkwgd2FzIG1vZGlmaWVkIChwYWdlSUQgPSAl IiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0 ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwgcGFyZW50UElEID0g JWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1f cGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlzLT5pc01haW5SZXNvdXJjZSgpLCB0aGlzLT5pc1N5 bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5wYXJlbnRQSUQpOwogICAgICAgICAgICAgICAgIH0s CiAgICAgICAgICAgICAgICAgW3RoaXNdIChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpIHsKICAg ICAgICAgICAgICAgICAgICAgaWYgKHRoaXMtPmNhblVzZUNhY2hlKHJlcXVlc3QpKSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogQ2hlY2tp bmcgY2FjaGUgZm9yIHJlc291cmNlIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUi IFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQs IGlzU3luY2hyb25vdXMgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRl cnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHRoaXMtPmlzTWFpblJlc291 cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogQ2hlY2tpbmcgY2FjaGUgZm9yIHJlc291cmNl IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlE ID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwg cGFyZW50UElEID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndl YkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlzLT5pc01haW5SZXNvdXJjZSgp LCB0aGlzLT5pc1N5bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5wYXJlbnRQSUQpOwogICAgICAg ICAgICAgICAgICAgICAgICAgdGhpcy0+cmV0cmlldmVDYWNoZUVudHJ5KHJlcXVlc3QpOwogICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgICAgICB9CkBAIC0y MDUsNyArMjA2LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0KCkKICAgICB9 CiAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGF0IGNvZGUgcGF0aCBvbmNlIG1fbmV0d29ya0xvYWRD aGVja2VyIGlzIHVzZWQgZm9yIGFsbCBuZXR3b3JrIGxvYWRzLgogICAgIGlmIChjYW5Vc2VDYWNo ZShvcmlnaW5hbFJlcXVlc3QoKSkpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi c3RhcnQ6IENoZWNraW5nIGNhY2hlIGZvciByZXNvdXJjZSAocGFnZUlEID0gJSIgUFJJdTY0ICIs IGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5S ZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJ RCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01h aW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJzdGFydDogQ2hlY2tpbmcgY2FjaGUgZm9yIHJlc291cmNlIChwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIs IGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwgcGFyZW50UElEID0gJWQp IiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFy YW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCksIG1f cGFyYW1ldGVycy5wYXJlbnRQSUQpOwogICAgICAgICByZXRyaWV2ZUNhY2hlRW50cnkob3JpZ2lu YWxSZXF1ZXN0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IGY5 ODU3Yzk0YWQ0NjIwY2JlZmY4OGUzYTlkZjBjNWY4YzBiMGQ5OWUuLmJhMDFjMWJkYTRhZDI5NDky MDQ4NTIwNDQzOTVhNTYyZGJkZjg1YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTI2OCw2ICsyNjgsNyBA QCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3Mo UmVzb3VyY2VMb2FkZXImIHJlc291cmNlTAogICAgIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIg PSBpZGVudGlmaWVyOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYlBhZ2VJRCA9IHRyYWNraW5nUGFy YW1ldGVycy5wYWdlSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRCA9IHRyYWNraW5n UGFyYW1ldGVycy5mcmFtZUlEOworICAgIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJRCA9IGdldEN1 cnJlbnRQcm9jZXNzSUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9uSUQgPSBzZXNzaW9u SUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgbG9hZFBhcmFt ZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gY29udGVudFNuaWZmaW5nUG9saWN5OwpAQCAt NTMxLDYgKzUzMiw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OmxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCB1bnNpCiAgICAgbG9hZFBhcmFtZXRl cnMuaWRlbnRpZmllciA9IHJlc291cmNlTG9hZElkZW50aWZpZXI7CiAgICAgbG9hZFBhcmFtZXRl cnMud2ViUGFnZUlEID0gcGFnZUlEOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSBm cmFtZUlEOworICAgIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJRCA9IGdldEN1cnJlbnRQcm9jZXNz SUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9uSUQgPSBzZXNzaW9uSUQ7CiAgICAgbG9h ZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgbG9hZFBhcmFtZXRlcnMuY29udGVu dFNuaWZmaW5nUG9saWN5ID0gQ29udGVudFNuaWZmaW5nUG9saWN5OjpTbmlmZkNvbnRlbnQ7CkBA IC01ODUsNiArNTg3LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c3RhcnRQaW5nTG9hZChG cmFtZSYgZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY28KICAgICBsb2FkUGFyYW1l dGVycy5pZGVudGlmaWVyID0gZ2VuZXJhdGVMb2FkSWRlbnRpZmllcigpOwogICAgIGxvYWRQYXJh bWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIGxvYWRQYXJhbWV0ZXJzLnNvdXJjZU9yaWdp biA9ICZkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsKKyAgICBsb2FkUGFyYW1ldGVycy5wYXJl bnRQSUQgPSBnZXRDdXJyZW50UHJvY2Vzc0lEKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2Vzc2lv bklEID0gZnJhbWUucGFnZSgpID8gZnJhbWUucGFnZSgpLT5zZXNzaW9uSUQoKSA6IFBBTDo6U2Vz c2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc3RvcmVkQ3Jl ZGVudGlhbHNQb2xpY3kgPSBvcHRpb25zLmNyZWRlbnRpYWxzID09IEZldGNoT3B0aW9uczo6Q3Jl ZGVudGlhbHM6Ok9taXQgPyBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6RG9Ob3RVc2UgOiBTdG9y ZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOwogICAgIGxvYWRQYXJhbWV0ZXJzLm9wdGlvbnMgPSBv cHRpb25zOwpAQCAtNjQ0LDYgKzY0Nyw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNv bm5lY3RUbyhGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIsIGNvbnN0IFVSTCYgdXJsLCBTCiAgICAg cGFyYW1ldGVycy5yZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0IHsgdXJsIH07CiAgICAgcGFyYW1l dGVycy53ZWJQYWdlSUQgPSB3ZWJQYWdlID8gd2ViUGFnZS0+cGFnZUlEKCkgOiAwOwogICAgIHBh cmFtZXRlcnMud2ViRnJhbWVJRCA9IHdlYkZyYW1lID8gd2ViRnJhbWUtPmZyYW1lSUQoKSA6IDA7 CisgICAgcGFyYW1ldGVycy5wYXJlbnRQSUQgPSBnZXRDdXJyZW50UHJvY2Vzc0lEKCk7CiAgICAg cGFyYW1ldGVycy5zZXNzaW9uSUQgPSB3ZWJQYWdlID8gd2ViUGFnZS0+c2Vzc2lvbklEKCkgOiBQ QUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpOwogICAgIHBhcmFtZXRlcnMuc3RvcmVk Q3JlZGVudGlhbHNQb2xpY3kgPSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeTsKICAgICBwYXJhbWV0 ZXJzLnNob3VsZFByZWNvbm5lY3RPbmx5ID0gUHJlY29ubmVjdE9ubHk6OlllczsK 358292 2019-01-03 17:04:04 -0800 2019-01-03 17:11:17 -0800 Fix windows build. bug-193121-20190103170403.patch text/plain 10483 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0ODM1YmE0MmI2Y2ZkNmZk YzQ3MWRiMzk4OWQxYThlNGYyMTZhZjkuLjU3MjFmZGM0ZTcxZTUyN2JkMWYwODY0MDI3YzRhNWNj ZDI0YjZlM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMDEtMDMgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEJyaW5nIGJhY2sgcGFyZW50IHBy b2Nlc3NJRCBmb3IgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzAzMTYzND4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTkyOTYx IHJlbW92ZXMgcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEIGZyb20KKyAgICAgICAgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgYmVjYXVzZSBpdCB3YXMgKGEpIHN0b3JlZCBpbiBzb21l CisgICAgICAgIGdsb2JhbCBzdGF0ZSwgdGhlIHVzZSBvZiB3aGljaCBpcyBiZWluZyBtaW5pbWl6 ZWQsIGFuZCAoYikgaXQgd2FzCisgICAgICAgIGxhcmdlbHkgdW51c2VkLiBIb3dldmVyLCBpdCB3 YXMgYWN0dWFsbHkgc3RpbGwgYmVpbmcgdXNlZCBpbiBzb21lCisgICAgICAgIHVzZWZ1bCBsb2dn aW5nIGluIG9yZGVyIHRvIHRpZSB0b2dldGhlciBjaGlsZCBwcm9jZXNzZXMgd2l0aCB0aGVpcgor ICAgICAgICBwYXJlbnQgcHJvY2Vzcy4gUmUtaW50cm9kdWNlIHRoaXMgdmFsdWUgaW4gTmV0d29y a0xvYWRQYXJhbWV0ZXJzIHNvCisgICAgICAgIHRoYXQgd2UgY2FuIGxvZyBpdC4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MpOgorICAg ICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNs eSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyk6CisKIDIw MTktMDEtMDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGxvZ2ljIGhhbmRsaW5nIEROVCBoZWFkZXIgZHVyaW5nIHJlZGlyZWN0cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgK aW5kZXggY2ZjNGI1MjdmMGQxZjcyZjNkODY4NTgzZjlkNDhiODczZGUzNTFjZS4uMjNhNjEwMDQ4 ZGYyOTU4ODkzYzk0MjcxZjIzY2IzM2EyNzc4MzBiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oCkBAIC0zOSw2ICszOSw3 IEBAIGNsYXNzIE5ldHdvcmtMb2FkUGFyYW1ldGVycyB7CiBwdWJsaWM6CiAgICAgdWludDY0X3Qg d2ViUGFnZUlEIHsgMCB9OwogICAgIHVpbnQ2NF90IHdlYkZyYW1lSUQgeyAwIH07CisgICAgUHJv Y2Vzc0lEIHBhcmVudFBJRCB7IDAgfTsKICAgICBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQgeyBQ QUw6OlNlc3Npb25JRDo6ZW1wdHlTZXNzaW9uSUQoKSB9OwogICAgIFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCByZXF1ZXN0OwogICAgIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeSBjb250 ZW50U25pZmZpbmdQb2xpY3kgeyBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xpY3k6OlNuaWZm Q29udGVudCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcAppbmRleCA4MGI3MGFhYWIyMjc5 MTA3Y2UwYmRhNjdhNmVjYTIxMDc1YTJiZWRhLi5jZmU1OGUxY2U5ZjdiMmUyM2ZlODdlYzcwYWFl NmIzYjQ5YzljNThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcApAQCAtMzYsNiArMzYs NyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKICAgICBlbmNv ZGVyIDw8IHdlYlBhZ2VJRDsKICAgICBlbmNvZGVyIDw8IHdlYkZyYW1lSUQ7CisgICAgZW5jb2Rl ciA8PCBwYXJlbnRQSUQ7CiAgICAgZW5jb2RlciA8PCBzZXNzaW9uSUQ7CiAgICAgZW5jb2RlciA8 PCByZXF1ZXN0OwogCkBAIC0xMTMsNiArMTE0LDkgQEAgYm9vbCBOZXR3b3JrUmVzb3VyY2VMb2Fk UGFyYW1ldGVyczo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgTmV0d29ya1Jlc291cmMK ICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC53ZWJGcmFtZUlEKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGFyZW50UElEKSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQu c2Vzc2lvbklEKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggOTdm MTM5NmM4NTA1YmE4YmYyZTdkNGQ3ZjE0Mzk4NzczYTU4OTJkNy4uYjg1MjQ1YTkzMmQ0MDg3OGY3 ZDcwZjE3MTE2OGM1ZjQ5ZTlmMDMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMTcxLDcgKzE3MSw3IEBA IHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCiAgICAgbV9uZXR3b3JrQWN0aXZp dHlUcmFja2VyID0gbV9jb25uZWN0aW9uLT5zdGFydFRyYWNraW5nUmVzb3VyY2VMb2FkKG1fcGFy YW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJj ZSgpLCBzZXNzaW9uSUQoKSk7CiAKICAgICBpZiAobV9kZWZlcnNMb2FkaW5nKSB7Ci0gICAgICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0OiBMb2FkaW5nIGlzIGRlZmVycmVkIChwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIg UFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBtX3Bh cmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJz LmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMoKSk7CisgICAgICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0OiBMb2FkaW5nIGlzIGRlZmVycmVkIChwYWdl SUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIg UFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwgcGFyZW50 UElEID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1l SUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9u b3VzKCksIG1fcGFyYW1ldGVycy5wYXJlbnRQSUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CkBAIC0xODIsMTcgKzE4MiwxOCBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQo KQogICAgICAgICBtX25ldHdvcmtMb2FkQ2hlY2tlci0+Y2hlY2soUmVzb3VyY2VSZXF1ZXN0IHsg b3JpZ2luYWxSZXF1ZXN0KCkgfSwgdGhpcywgW3RoaXNdIChhdXRvJiYgcmVzdWx0KSB7CiAgICAg ICAgICAgICBXVEY6OnN3aXRjaE9uKHJlc3VsdCwKICAgICAgICAgICAgICAgICBbdGhpc10gKFJl c291cmNlRXJyb3ImIGVycm9yKSB7CisgICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoInN0YXJ0OiBlcnJvciBjaGVja2luZyAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZy YW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNv dXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQsIHBhcmVudFBJRCA9ICVkLCBlcnJvci5kb21h aW4gPSAle3B1YmxpY31zLCBlcnJvci5jb2RlID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJ RCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlz LT5pc01haW5SZXNvdXJjZSgpLCB0aGlzLT5pc1N5bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5w YXJlbnRQSUQsIGVycm9yLmRvbWFpbigpLnV0ZjgoKS5kYXRhKCksIGVycm9yLmVycm9yQ29kZSgp KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFlcnJvci5pc0NhbmNlbGxhdGlvbigpKQogICAg ICAgICAgICAgICAgICAgICAgICAgdGhpcy0+ZGlkRmFpbExvYWRpbmcoZXJyb3IpOwogICAgICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgW3RoaXNdIChOZXR3b3JrTG9hZENoZWNrZXI6 OlJlZGlyZWN0aW9uVHJpcGxldCYgdHJpcGxldCkgewogICAgICAgICAgICAgICAgICAgICB0aGlz LT5tX2lzV2FpdGluZ0NvbnRpbnVlV2lsbFNlbmRSZXF1ZXN0Rm9yQ2FjaGVkUmVkaXJlY3QgPSB0 cnVlOwogICAgICAgICAgICAgICAgICAgICB0aGlzLT53aWxsU2VuZFJlZGlyZWN0ZWRSZXF1ZXN0 KFdURk1vdmUodHJpcGxldC5yZXF1ZXN0KSwgV1RGTW92ZSh0cmlwbGV0LnJlZGlyZWN0UmVxdWVz dCksIFdURk1vdmUodHJpcGxldC5yZWRpcmVjdFJlc3BvbnNlKSk7Ci0gICAgICAgICAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIk5ldHdvcmtSZXNvdXJjZUxvYWRlcjogc3ludGhl dGljIHJlZGlyZWN0IHNlbnQgYmVjYXVzZSByZXF1ZXN0IFVSTCB3YXMgbW9kaWZpZWQuIik7Cisg ICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0OiBzeW50aGV0 aWMgcmVkaXJlY3Qgc2VudCBiZWNhdXNlIHJlcXVlc3QgVVJMIHdhcyBtb2RpZmllZCAocGFnZUlE ID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBS SXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQsIHBhcmVudFBJ RCA9ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlE LCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgdGhpcy0+aXNNYWluUmVzb3VyY2UoKSwgdGhpcy0+ aXNTeW5jaHJvbm91cygpLCBtX3BhcmFtZXRlcnMucGFyZW50UElEKTsKICAgICAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgICAgIFt0aGlzXSAoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSB7 CiAgICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLT5jYW5Vc2VDYWNoZShyZXF1ZXN0KSkgewot ICAgICAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IENo ZWNraW5nIGNhY2hlIGZvciByZXNvdXJjZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQg PSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9 ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJh bWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlzLT5pc01haW5S ZXNvdXJjZSgpLCB0aGlzLT5pc1N5bmNocm9ub3VzKCkpOworICAgICAgICAgICAgICAgICAgICAg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IENoZWNraW5nIGNhY2hlIGZvciByZXNv dXJjZSAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3Vy Y2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0g JWQsIHBhcmVudFBJRCA9ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVy cy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgdGhpcy0+aXNNYWluUmVzb3Vy Y2UoKSwgdGhpcy0+aXNTeW5jaHJvbm91cygpLCBtX3BhcmFtZXRlcnMucGFyZW50UElEKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIHRoaXMtPnJldHJpZXZlQ2FjaGVFbnRyeShyZXF1ZXN0KTsK ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICAgICAgfQpA QCAtMjA1LDcgKzIwNiw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCiAg ICAgfQogICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhhdCBjb2RlIHBhdGggb25jZSBtX25ldHdvcmtM b2FkQ2hlY2tlciBpcyB1c2VkIGZvciBhbGwgbmV0d29yayBsb2Fkcy4KICAgICBpZiAoY2FuVXNl Q2FjaGUob3JpZ2luYWxSZXF1ZXN0KCkpKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInN0YXJ0OiBDaGVja2luZyBjYWNoZSBmb3IgcmVzb3VyY2UgKHBhZ2VJRCA9ICUiIFBSSXU2 NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNN YWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQ YWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwg aXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91cygpKTsKKyAgICAgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgic3RhcnQ6IENoZWNraW5nIGNhY2hlIGZvciByZXNvdXJjZSAocGFnZUlEID0g JSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2 NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQsIHBhcmVudFBJRCA9 ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBt X3BhcmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91cygp LCBtX3BhcmFtZXRlcnMucGFyZW50UElEKTsKICAgICAgICAgcmV0cmlldmVDYWNoZUVudHJ5KG9y aWdpbmFsUmVxdWVzdCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAppbmRl eCBmOTg1N2M5NGFkNDYyMGNiZWZmODhlM2E5ZGYwYzVmOGMwYjBkOTllLi5iYTAxYzFiZGE0YWQy OTQ5MjA0ODUyMDQ0Mzk1YTU2MmRiZGY4NWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCkBAIC0yNjgsNiArMjY4 LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9j ZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKICAgICBsb2FkUGFyYW1ldGVycy5pZGVudGlm aWVyID0gaWRlbnRpZmllcjsKICAgICBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQgPSB0cmFja2lu Z1BhcmFtZXRlcnMucGFnZUlEOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSB0cmFj a2luZ1BhcmFtZXRlcnMuZnJhbWVJRDsKKyAgICBsb2FkUGFyYW1ldGVycy5wYXJlbnRQSUQgPSBn ZXRDdXJyZW50UHJvY2Vzc0lEKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2Vzc2lvbklEID0gc2Vz c2lvbklEOwogICAgIGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIGxvYWRQ YXJhbWV0ZXJzLmNvbnRlbnRTbmlmZmluZ1BvbGljeSA9IGNvbnRlbnRTbmlmZmluZ1BvbGljeTsK QEAgLTUzMSw2ICs1MzIsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2VT eW5jaHJvbm91c2x5KEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgdW5zaQogICAgIGxvYWRQYXJh bWV0ZXJzLmlkZW50aWZpZXIgPSByZXNvdXJjZUxvYWRJZGVudGlmaWVyOwogICAgIGxvYWRQYXJh bWV0ZXJzLndlYlBhZ2VJRCA9IHBhZ2VJRDsKICAgICBsb2FkUGFyYW1ldGVycy53ZWJGcmFtZUlE ID0gZnJhbWVJRDsKKyAgICBsb2FkUGFyYW1ldGVycy5wYXJlbnRQSUQgPSBnZXRDdXJyZW50UHJv Y2Vzc0lEKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMuc2Vzc2lvbklEID0gc2Vzc2lvbklEOwogICAg IGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIGxvYWRQYXJhbWV0ZXJzLmNv bnRlbnRTbmlmZmluZ1BvbGljeSA9IENvbnRlbnRTbmlmZmluZ1BvbGljeTo6U25pZmZDb250ZW50 OwpAQCAtNTg1LDYgKzU4Nyw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnN0YXJ0UGluZ0xv YWQoRnJhbWUmIGZyYW1lLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvCiAgICAgbG9hZFBh cmFtZXRlcnMuaWRlbnRpZmllciA9IGdlbmVyYXRlTG9hZElkZW50aWZpZXIoKTsKICAgICBsb2Fk UGFyYW1ldGVycy5yZXF1ZXN0ID0gcmVxdWVzdDsKICAgICBsb2FkUGFyYW1ldGVycy5zb3VyY2VP cmlnaW4gPSAmZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCk7CisgICAgbG9hZFBhcmFtZXRlcnMu cGFyZW50UElEID0gZ2V0Q3VycmVudFByb2Nlc3NJRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNl c3Npb25JRCA9IGZyYW1lLnBhZ2UoKSA/IGZyYW1lLnBhZ2UoKS0+c2Vzc2lvbklEKCkgOiBQQUw6 OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnN0b3Jl ZENyZWRlbnRpYWxzUG9saWN5ID0gb3B0aW9ucy5jcmVkZW50aWFscyA9PSBGZXRjaE9wdGlvbnM6 OkNyZWRlbnRpYWxzOjpPbWl0ID8gU3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlIDog U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OlVzZTsKICAgICBsb2FkUGFyYW1ldGVycy5vcHRpb25z ID0gb3B0aW9uczsKQEAgLTY0NCw2ICs2NDcsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpw cmVjb25uZWN0VG8oRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCBjb25zdCBVUkwmIHVybCwgUwog ICAgIHBhcmFtZXRlcnMucmVxdWVzdCA9IFJlc291cmNlUmVxdWVzdCB7IHVybCB9OwogICAgIHBh cmFtZXRlcnMud2ViUGFnZUlEID0gd2ViUGFnZSA/IHdlYlBhZ2UtPnBhZ2VJRCgpIDogMDsKICAg ICBwYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSB3ZWJGcmFtZSA/IHdlYkZyYW1lLT5mcmFtZUlEKCkg OiAwOworICAgIHBhcmFtZXRlcnMucGFyZW50UElEID0gZ2V0Q3VycmVudFByb2Nlc3NJRCgpOwog ICAgIHBhcmFtZXRlcnMuc2Vzc2lvbklEID0gd2ViUGFnZSA/IHdlYlBhZ2UtPnNlc3Npb25JRCgp IDogUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKTsKICAgICBwYXJhbWV0ZXJzLnN0 b3JlZENyZWRlbnRpYWxzUG9saWN5ID0gc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k7CiAgICAgcGFy YW1ldGVycy5zaG91bGRQcmVjb25uZWN0T25seSA9IFByZWNvbm5lY3RPbmx5OjpZZXM7Cg== 358293 2019-01-03 17:16:16 -0800 2019-01-04 10:42:17 -0800 Oh, let's be generous ... fix *all* the builds. bug-193121-20190103171615.patch text/plain 10668 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0ODM1YmE0MmI2Y2ZkNmZk YzQ3MWRiMzk4OWQxYThlNGYyMTZhZjkuLjU3MjFmZGM0ZTcxZTUyN2JkMWYwODY0MDI3YzRhNWNj ZDI0YjZlM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMDEtMDMgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEJyaW5nIGJhY2sgcGFyZW50IHBy b2Nlc3NJRCBmb3IgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzAzMTYzND4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTkyOTYx IHJlbW92ZXMgcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEIGZyb20KKyAgICAgICAgTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgYmVjYXVzZSBpdCB3YXMgKGEpIHN0b3JlZCBpbiBzb21l CisgICAgICAgIGdsb2JhbCBzdGF0ZSwgdGhlIHVzZSBvZiB3aGljaCBpcyBiZWluZyBtaW5pbWl6 ZWQsIGFuZCAoYikgaXQgd2FzCisgICAgICAgIGxhcmdlbHkgdW51c2VkLiBIb3dldmVyLCBpdCB3 YXMgYWN0dWFsbHkgc3RpbGwgYmVpbmcgdXNlZCBpbiBzb21lCisgICAgICAgIHVzZWZ1bCBsb2dn aW5nIGluIG9yZGVyIHRvIHRpZSB0b2dldGhlciBjaGlsZCBwcm9jZXNzZXMgd2l0aCB0aGVpcgor ICAgICAgICBwYXJlbnQgcHJvY2Vzcy4gUmUtaW50cm9kdWNlIHRoaXMgdmFsdWUgaW4gTmV0d29y a0xvYWRQYXJhbWV0ZXJzIHNvCisgICAgICAgIHRoYXQgd2UgY2FuIGxvZyBpdC4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MpOgorICAg ICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNs eSk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyk6CisKIDIw MTktMDEtMDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGxvZ2ljIGhhbmRsaW5nIEROVCBoZWFkZXIgZHVyaW5nIHJlZGlyZWN0cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgK aW5kZXggY2ZjNGI1MjdmMGQxZjcyZjNkODY4NTgzZjlkNDhiODczZGUzNTFjZS4uYzU2ZThlYmJh Y2ZmNDcwNDQwNDBhYzNmYjUyOWFlNmM5OGM3Mjg1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oCkBAIC0zMCw2ICszMCw3 IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1Jlc291cmNlUmVxdWVzdC5oPgogI2luY2x1ZGUgPHBhbC9TZXNzaW9uSUQuaD4K KyNpbmNsdWRlIDx3dGYvUHJvY2Vzc0lELmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC0z OSw2ICs0MCw3IEBAIGNsYXNzIE5ldHdvcmtMb2FkUGFyYW1ldGVycyB7CiBwdWJsaWM6CiAgICAg dWludDY0X3Qgd2ViUGFnZUlEIHsgMCB9OwogICAgIHVpbnQ2NF90IHdlYkZyYW1lSUQgeyAwIH07 CisgICAgV1RGOjpQcm9jZXNzSUQgcGFyZW50UElEIHsgMCB9OwogICAgIFBBTDo6U2Vzc2lvbklE IHNlc3Npb25JRCB7IFBBTDo6U2Vzc2lvbklEOjplbXB0eVNlc3Npb25JRCgpIH07CiAgICAgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3Q7CiAgICAgV2ViQ29yZTo6Q29udGVudFNuaWZm aW5nUG9saWN5IGNvbnRlbnRTbmlmZmluZ1BvbGljeSB7IFdlYkNvcmU6OkNvbnRlbnRTbmlmZmlu Z1BvbGljeTo6U25pZmZDb250ZW50IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4 IDgwYjcwYWFhYjIyNzkxMDdjZTBiZGE2N2E2ZWNhMjEwNzVhMmJlZGEuLmNmZTU4ZTFjZTlmN2Iy ZTIzZmU4N2VjNzBhYWU2YjNiNDljOWM1OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3Bw CkBAIC0zNiw2ICszNiw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVu Y29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBpZGVudGlm aWVyOwogICAgIGVuY29kZXIgPDwgd2ViUGFnZUlEOwogICAgIGVuY29kZXIgPDwgd2ViRnJhbWVJ RDsKKyAgICBlbmNvZGVyIDw8IHBhcmVudFBJRDsKICAgICBlbmNvZGVyIDw8IHNlc3Npb25JRDsK ICAgICBlbmNvZGVyIDw8IHJlcXVlc3Q7CiAKQEAgLTExMyw2ICsxMTQsOSBAQCBib29sIE5ldHdv cmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBO ZXR3b3JrUmVzb3VyYwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LndlYkZyYW1lSUQp KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5wYXJlbnRQSUQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHJlc3VsdC5zZXNzaW9uSUQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcAppbmRleCA5N2YxMzk2Yzg1MDViYThiZjJlN2Q0ZDdmMTQzOTg3NzNhNTg5MmQ3Li5iODUy NDVhOTMyZDQwODc4ZjdkNzBmMTcxMTY4YzVmNDllOWYwMzBkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0x NzEsNyArMTcxLDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0KCkKICAgICBt X25ldHdvcmtBY3Rpdml0eVRyYWNrZXIgPSBtX2Nvbm5lY3Rpb24tPnN0YXJ0VHJhY2tpbmdSZXNv dXJjZUxvYWQobV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIs IGlzTWFpblJlc291cmNlKCksIHNlc3Npb25JRCgpKTsKIAogICAgIGlmIChtX2RlZmVyc0xvYWRp bmcpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IExvYWRpbmcgaXMg ZGVmZXJyZWQgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJl c291cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91 cyA9ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlE LCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2UoKSwgaXNTeW5jaHJvbm91 cygpKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IExvYWRpbmcgaXMg ZGVmZXJyZWQgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJl c291cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91 cyA9ICVkLCBwYXJlbnRQSUQgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFt ZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNl KCksIGlzU3luY2hyb25vdXMoKSwgbV9wYXJhbWV0ZXJzLnBhcmVudFBJRCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKQEAgLTE4MiwxNyArMTgyLDE4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNl TG9hZGVyOjpzdGFydCgpCiAgICAgICAgIG1fbmV0d29ya0xvYWRDaGVja2VyLT5jaGVjayhSZXNv dXJjZVJlcXVlc3QgeyBvcmlnaW5hbFJlcXVlc3QoKSB9LCB0aGlzLCBbdGhpc10gKGF1dG8mJiBy ZXN1bHQpIHsKICAgICAgICAgICAgIFdURjo6c3dpdGNoT24ocmVzdWx0LAogICAgICAgICAgICAg ICAgIFt0aGlzXSAoUmVzb3VyY2VFcnJvciYgZXJyb3IpIHsKKyAgICAgICAgICAgICAgICAgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IGVycm9yIGNoZWNraW5nIChwYWdlSUQgPSAl IiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0 ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCwgcGFyZW50UElEID0g JWQsIGVycm9yLmRvbWFpbiA9ICV7cHVibGljfXMsIGVycm9yLmNvZGUgPSAlZCkiLCBtX3BhcmFt ZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlk ZW50aWZpZXIsIHRoaXMtPmlzTWFpblJlc291cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSwg bV9wYXJhbWV0ZXJzLnBhcmVudFBJRCwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJy b3IuZXJyb3JDb2RlKCkpOwogICAgICAgICAgICAgICAgICAgICBpZiAoIWVycm9yLmlzQ2FuY2Vs bGF0aW9uKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLT5kaWRGYWlsTG9hZGluZyhl cnJvcik7CiAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICBbdGhpc10gKE5ldHdv cmtMb2FkQ2hlY2tlcjo6UmVkaXJlY3Rpb25UcmlwbGV0JiB0cmlwbGV0KSB7CiAgICAgICAgICAg ICAgICAgICAgIHRoaXMtPm1faXNXYWl0aW5nQ29udGludWVXaWxsU2VuZFJlcXVlc3RGb3JDYWNo ZWRSZWRpcmVjdCA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMtPndpbGxTZW5kUmVk aXJlY3RlZFJlcXVlc3QoV1RGTW92ZSh0cmlwbGV0LnJlcXVlc3QpLCBXVEZNb3ZlKHRyaXBsZXQu cmVkaXJlY3RSZXF1ZXN0KSwgV1RGTW92ZSh0cmlwbGV0LnJlZGlyZWN0UmVzcG9uc2UpKTsKLSAg ICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiTmV0d29ya1Jlc291cmNl TG9hZGVyOiBzeW50aGV0aWMgcmVkaXJlY3Qgc2VudCBiZWNhdXNlIHJlcXVlc3QgVVJMIHdhcyBt b2RpZmllZC4iKTsKKyAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi c3RhcnQ6IHN5bnRoZXRpYyByZWRpcmVjdCBzZW50IGJlY2F1c2UgcmVxdWVzdCBVUkwgd2FzIG1v ZGlmaWVkIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNv dXJjZUlEID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMg PSAlZCwgcGFyZW50UElEID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0 ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlzLT5pc01haW5SZXNv dXJjZSgpLCB0aGlzLT5pc1N5bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5wYXJlbnRQSUQpOwog ICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgW3RoaXNdIChSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHRoaXMtPmNhblVzZUNhY2hl KHJlcXVlc3QpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCJzdGFydDogQ2hlY2tpbmcgY2FjaGUgZm9yIHJlc291cmNlIChwYWdlSUQgPSAlIiBQUkl1 NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGlz TWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2Vi UGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIs IHRoaXMtPmlzTWFpblJlc291cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSk7CisgICAgICAg ICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogQ2hlY2tpbmcg Y2FjaGUgZm9yIHJlc291cmNlIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBS SXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlz U3luY2hyb25vdXMgPSAlZCwgcGFyZW50UElEID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJ RCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCB0aGlz LT5pc01haW5SZXNvdXJjZSgpLCB0aGlzLT5pc1N5bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5w YXJlbnRQSUQpOwogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy0+cmV0cmlldmVDYWNoZUVu dHJ5KHJlcXVlc3QpOwogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgICAgICAgICB9CkBAIC0yMDUsNyArMjA2LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2Fk ZXI6OnN0YXJ0KCkKICAgICB9CiAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGF0IGNvZGUgcGF0aCBv bmNlIG1fbmV0d29ya0xvYWRDaGVja2VyIGlzIHVzZWQgZm9yIGFsbCBuZXR3b3JrIGxvYWRzLgog ICAgIGlmIChjYW5Vc2VDYWNoZShvcmlnaW5hbFJlcXVlc3QoKSkpIHsKLSAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6IENoZWNraW5nIGNhY2hlIGZvciByZXNvdXJjZSAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9ub3VzID0gJWQpIiwgbV9w YXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1lSUQsIG1fcGFyYW1ldGVy cy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9ub3VzKCkpOworICAgICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogQ2hlY2tpbmcgY2FjaGUgZm9yIHJlc291 cmNlIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJj ZUlEID0gJSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAl ZCwgcGFyZW50UElEID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJz LndlYkZyYW1lSUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBp c1N5bmNocm9ub3VzKCksIG1fcGFyYW1ldGVycy5wYXJlbnRQSUQpOwogICAgICAgICByZXRyaWV2 ZUNhY2hlRW50cnkob3JpZ2luYWxSZXF1ZXN0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwCmluZGV4IGY5ODU3Yzk0YWQ0NjIwY2JlZmY4OGUzYTlkZjBjNWY4YzBiMGQ5OWUu LmJhMDFjMWJkYTRhZDI5NDkyMDQ4NTIwNDQzOTVhNTYyZGJkZjg1YTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAK QEAgLTI2OCw2ICsyNjgsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRG cm9tTmV0d29ya1Byb2Nlc3MoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTAogICAgIGxvYWRQYXJh bWV0ZXJzLmlkZW50aWZpZXIgPSBpZGVudGlmaWVyOwogICAgIGxvYWRQYXJhbWV0ZXJzLndlYlBh Z2VJRCA9IHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMud2Vi RnJhbWVJRCA9IHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlEOworICAgIGxvYWRQYXJhbWV0ZXJz LnBhcmVudFBJRCA9IGdldEN1cnJlbnRQcm9jZXNzSUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5z ZXNzaW9uSUQgPSBzZXNzaW9uSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVl c3Q7CiAgICAgbG9hZFBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gY29udGVudFNu aWZmaW5nUG9saWN5OwpAQCAtNTMxLDYgKzUzMiw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCB1bnNp CiAgICAgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllciA9IHJlc291cmNlTG9hZElkZW50aWZpZXI7 CiAgICAgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlEID0gcGFnZUlEOwogICAgIGxvYWRQYXJhbWV0 ZXJzLndlYkZyYW1lSUQgPSBmcmFtZUlEOworICAgIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJRCA9 IGdldEN1cnJlbnRQcm9jZXNzSUQoKTsKICAgICBsb2FkUGFyYW1ldGVycy5zZXNzaW9uSUQgPSBz ZXNzaW9uSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgbG9h ZFBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID0gQ29udGVudFNuaWZmaW5nUG9saWN5 OjpTbmlmZkNvbnRlbnQ7CkBAIC01ODUsNiArNTg3LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVn eTo6c3RhcnRQaW5nTG9hZChGcmFtZSYgZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y28KICAgICBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyID0gZ2VuZXJhdGVMb2FkSWRlbnRpZmll cigpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIGxvYWRQYXJh bWV0ZXJzLnNvdXJjZU9yaWdpbiA9ICZkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsKKyAgICBs b2FkUGFyYW1ldGVycy5wYXJlbnRQSUQgPSBnZXRDdXJyZW50UHJvY2Vzc0lEKCk7CiAgICAgbG9h ZFBhcmFtZXRlcnMuc2Vzc2lvbklEID0gZnJhbWUucGFnZSgpID8gZnJhbWUucGFnZSgpLT5zZXNz aW9uSUQoKSA6IFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7CiAgICAgbG9hZFBh cmFtZXRlcnMuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgPSBvcHRpb25zLmNyZWRlbnRpYWxzID09 IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Ok9taXQgPyBTdG9yZWRDcmVkZW50aWFsc1BvbGlj eTo6RG9Ob3RVc2UgOiBTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlOwogICAgIGxvYWRQYXJh bWV0ZXJzLm9wdGlvbnMgPSBvcHRpb25zOwpAQCAtNjQ0LDYgKzY0Nyw3IEBAIHZvaWQgV2ViTG9h ZGVyU3RyYXRlZ3k6OnByZWNvbm5lY3RUbyhGcmFtZUxvYWRlciYgZnJhbWVMb2FkZXIsIGNvbnN0 IFVSTCYgdXJsLCBTCiAgICAgcGFyYW1ldGVycy5yZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0IHsg dXJsIH07CiAgICAgcGFyYW1ldGVycy53ZWJQYWdlSUQgPSB3ZWJQYWdlID8gd2ViUGFnZS0+cGFn ZUlEKCkgOiAwOwogICAgIHBhcmFtZXRlcnMud2ViRnJhbWVJRCA9IHdlYkZyYW1lID8gd2ViRnJh bWUtPmZyYW1lSUQoKSA6IDA7CisgICAgcGFyYW1ldGVycy5wYXJlbnRQSUQgPSBnZXRDdXJyZW50 UHJvY2Vzc0lEKCk7CiAgICAgcGFyYW1ldGVycy5zZXNzaW9uSUQgPSB3ZWJQYWdlID8gd2ViUGFn ZS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpOwogICAg IHBhcmFtZXRlcnMuc3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgPSBzdG9yZWRDcmVkZW50aWFsc1Bv bGljeTsKICAgICBwYXJhbWV0ZXJzLnNob3VsZFByZWNvbm5lY3RPbmx5ID0gUHJlY29ubmVjdE9u bHk6OlllczsK 358334 2019-01-04 10:42:18 -0800 2019-01-04 11:02:08 -0800 Patch bug-193121-20190104104217.patch text/plain 10983 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0ODM1YmE0MmI2Y2ZkNmZk YzQ3MWRiMzk4OWQxYThlNGYyMTZhZjkuLjc4OWU4NjUxMzcwYjU4M2E3Y2EzMWFmODg3NTY5NjZj MmUwMWRlNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMDEtMDMgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIEJyaW5nIGJhY2sgcGFyZW50IHBy b2Nlc3NJRCBmb3IgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzAzMTYzND4KKwor ICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIEJ1ZyAxOTI5 NjEgcmVtb3ZlcyBwcmVzZW50aW5nQXBwbGljYXRpb25QSUQgZnJvbQorICAgICAgICBOZXR3b3Jr UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyBiZWNhdXNlIGl0IHdhcyAoYSkgc3RvcmVkIGluIHNv bWUKKyAgICAgICAgZ2xvYmFsIHN0YXRlLCB0aGUgdXNlIG9mIHdoaWNoIGlzIGJlaW5nIG1pbmlt aXplZCwgYW5kIChiKSBpdCB3YXMKKyAgICAgICAgbGFyZ2VseSB1bnVzZWQuIEhvd2V2ZXIsIGl0 IHdhcyBhY3R1YWxseSBzdGlsbCBiZWluZyB1c2VkIGluIHNvbWUKKyAgICAgICAgdXNlZnVsIGxv Z2dpbmcgaW4gb3JkZXIgdG8gdGllIHRvZ2V0aGVyIGNoaWxkIHByb2Nlc3NlcyB3aXRoIHRoZWly CisgICAgICAgIHBhcmVudCBwcm9jZXNzLiBSZS1pbnRyb2R1Y2UgdGhpcyB2YWx1ZSBpbiBOZXR3 b3JrTG9hZFBhcmFtZXRlcnMgc28KKyAgICAgICAgdGhhdCB3ZSBjYW4gbG9nIGl0LgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmg6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZSk6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCk6CisgICAgICAgICog V2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZEZyb21OZXR3b3JrUHJvY2Vzcyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KToKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnN0YXJ0UGluZ0xvYWQp OgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6cHJlY29ubmVjdFRvKToKKwog MjAxOS0wMS0wMyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgbG9naWMgaGFuZGxpbmcgRE5UIGhlYWRlciBkdXJpbmcgcmVkaXJlY3RzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVy cy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFtZXRlcnMu aAppbmRleCBjZmM0YjUyN2YwZDFmNzJmM2Q4Njg1ODNmOWQ0OGI4NzNkZTM1MWNlLi5jNTZlOGVi YmFjZmY0NzA0NDA0MGFjM2ZiNTI5YWU2Yzk4YzcyODVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0ZXJzLmgKQEAgLTMwLDYgKzMw LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8cGFsL1Nlc3Npb25JRC5o PgorI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAg LTM5LDYgKzQwLDcgQEAgY2xhc3MgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHsKIHB1YmxpYzoKICAg ICB1aW50NjRfdCB3ZWJQYWdlSUQgeyAwIH07CiAgICAgdWludDY0X3Qgd2ViRnJhbWVJRCB7IDAg fTsKKyAgICBXVEY6OlByb2Nlc3NJRCBwYXJlbnRQSUQgeyAwIH07CiAgICAgUEFMOjpTZXNzaW9u SUQgc2Vzc2lvbklEIHsgUEFMOjpTZXNzaW9uSUQ6OmVtcHR5U2Vzc2lvbklEKCkgfTsKICAgICBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdDsKICAgICBXZWJDb3JlOjpDb250ZW50U25p ZmZpbmdQb2xpY3kgY29udGVudFNuaWZmaW5nUG9saWN5IHsgV2ViQ29yZTo6Q29udGVudFNuaWZm aW5nUG9saWN5OjpTbmlmZkNvbnRlbnQgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKaW5k ZXggODBiNzBhYWFiMjI3OTEwN2NlMGJkYTY3YTZlY2EyMTA3NWEyYmVkYS4uY2ZlNThlMWNlOWY3 YjJlMjNmZTg3ZWM3MGFhZTZiM2I0OWM5YzU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5j cHAKQEAgLTM2LDYgKzM2LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6 ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IGlkZW50 aWZpZXI7CiAgICAgZW5jb2RlciA8PCB3ZWJQYWdlSUQ7CiAgICAgZW5jb2RlciA8PCB3ZWJGcmFt ZUlEOworICAgIGVuY29kZXIgPDwgcGFyZW50UElEOwogICAgIGVuY29kZXIgPDwgc2Vzc2lvbklE OwogICAgIGVuY29kZXIgPDwgcmVxdWVzdDsKIApAQCAtMTEzLDYgKzExNCw5IEBAIGJvb2wgTmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIs IE5ldHdvcmtSZXNvdXJjCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQud2ViRnJhbWVJ RCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0LnBhcmVudFBJRCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocmVzdWx0LnNlc3Npb25JRCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwCmluZGV4IDk3ZjEzOTZjODUwNWJhOGJmMmU3ZDRkN2YxNDM5ODc3M2E1ODkyZDcuLmI4 NTI0NWE5MzJkNDA4NzhmN2Q3MGYxNzExNjhjNWY0OWU5ZjAzMGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKQEAg LTE3MSw3ICsxNzEsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogICAg IG1fbmV0d29ya0FjdGl2aXR5VHJhY2tlciA9IG1fY29ubmVjdGlvbi0+c3RhcnRUcmFja2luZ1Jl c291cmNlTG9hZChtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmll ciwgaXNNYWluUmVzb3VyY2UoKSwgc2Vzc2lvbklEKCkpOwogCiAgICAgaWYgKG1fZGVmZXJzTG9h ZGluZykgewotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogTG9hZGluZyBp cyBkZWZlcnJlZCAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9u b3VzID0gJWQpIiwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwgbV9wYXJhbWV0ZXJzLndlYkZyYW1l SUQsIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyLCBpc01haW5SZXNvdXJjZSgpLCBpc1N5bmNocm9u b3VzKCkpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogTG9hZGluZyBp cyBkZWZlcnJlZCAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiLCBpc01haW5SZXNvdXJjZSA9ICVkLCBpc1N5bmNocm9u b3VzID0gJWQsIHBhcmVudFBJRCA9ICVkKSIsIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFy YW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciwgaXNNYWluUmVzb3Vy Y2UoKSwgaXNTeW5jaHJvbm91cygpLCBtX3BhcmFtZXRlcnMucGFyZW50UElEKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApAQCAtMTgyLDE3ICsxODIsMTggQEAgdm9pZCBOZXR3b3JrUmVzb3Vy Y2VMb2FkZXI6OnN0YXJ0KCkKICAgICAgICAgbV9uZXR3b3JrTG9hZENoZWNrZXItPmNoZWNrKFJl c291cmNlUmVxdWVzdCB7IG9yaWdpbmFsUmVxdWVzdCgpIH0sIHRoaXMsIFt0aGlzXSAoYXV0byYm IHJlc3VsdCkgewogICAgICAgICAgICAgV1RGOjpzd2l0Y2hPbihyZXN1bHQsCiAgICAgICAgICAg ICAgICAgW3RoaXNdIChSZXNvdXJjZUVycm9yJiBlcnJvcikgeworICAgICAgICAgICAgICAgICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogZXJyb3IgY2hlY2tpbmcgKHBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1 NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkLCBwYXJlbnRQSUQg PSAlZCwgZXJyb3IuZG9tYWluID0gJXtwdWJsaWN9cywgZXJyb3IuY29kZSA9ICVkKSIsIG1fcGFy YW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMu aWRlbnRpZmllciwgdGhpcy0+aXNNYWluUmVzb3VyY2UoKSwgdGhpcy0+aXNTeW5jaHJvbm91cygp LCBtX3BhcmFtZXRlcnMucGFyZW50UElELCBlcnJvci5kb21haW4oKS51dGY4KCkuZGF0YSgpLCBl cnJvci5lcnJvckNvZGUoKSk7CiAgICAgICAgICAgICAgICAgICAgIGlmICghZXJyb3IuaXNDYW5j ZWxsYXRpb24oKSkKICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMtPmRpZEZhaWxMb2FkaW5n KGVycm9yKTsKICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgIFt0aGlzXSAoTmV0 d29ya0xvYWRDaGVja2VyOjpSZWRpcmVjdGlvblRyaXBsZXQmIHRyaXBsZXQpIHsKICAgICAgICAg ICAgICAgICAgICAgdGhpcy0+bV9pc1dhaXRpbmdDb250aW51ZVdpbGxTZW5kUmVxdWVzdEZvckNh Y2hlZFJlZGlyZWN0ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgdGhpcy0+d2lsbFNlbmRS ZWRpcmVjdGVkUmVxdWVzdChXVEZNb3ZlKHRyaXBsZXQucmVxdWVzdCksIFdURk1vdmUodHJpcGxl dC5yZWRpcmVjdFJlcXVlc3QpLCBXVEZNb3ZlKHRyaXBsZXQucmVkaXJlY3RSZXNwb25zZSkpOwot ICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJOZXR3b3JrUmVzb3Vy Y2VMb2FkZXI6IHN5bnRoZXRpYyByZWRpcmVjdCBzZW50IGJlY2F1c2UgcmVxdWVzdCBVUkwgd2Fz IG1vZGlmaWVkLiIpOworICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJzdGFydDogc3ludGhldGljIHJlZGlyZWN0IHNlbnQgYmVjYXVzZSByZXF1ZXN0IFVSTCB3YXMg bW9kaWZpZWQgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJl c291cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91 cyA9ICVkLCBwYXJlbnRQSUQgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFt ZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHRoaXMtPmlzTWFpblJl c291cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSwgbV9wYXJhbWV0ZXJzLnBhcmVudFBJRCk7 CiAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICBbdGhpc10gKFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCkgewogICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy0+Y2FuVXNlQ2Fj aGUocmVxdWVzdCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoInN0YXJ0OiBDaGVja2luZyBjYWNoZSBmb3IgcmVzb3VyY2UgKHBhZ2VJRCA9ICUiIFBS SXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIiwg aXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9ICVkKSIsIG1fcGFyYW1ldGVycy53 ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3BhcmFtZXRlcnMuaWRlbnRpZmll ciwgdGhpcy0+aXNNYWluUmVzb3VyY2UoKSwgdGhpcy0+aXNTeW5jaHJvbm91cygpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0OiBDaGVja2lu ZyBjYWNoZSBmb3IgcmVzb3VyY2UgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwg aXNTeW5jaHJvbm91cyA9ICVkLCBwYXJlbnRQSUQgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFn ZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIHRo aXMtPmlzTWFpblJlc291cmNlKCksIHRoaXMtPmlzU3luY2hyb25vdXMoKSwgbV9wYXJhbWV0ZXJz LnBhcmVudFBJRCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLT5yZXRyaWV2ZUNhY2hl RW50cnkocmVxdWVzdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICAgICAgICAgIH0KQEAgLTIwNSw3ICsyMDYsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6c3RhcnQoKQogICAgIH0KICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoYXQgY29kZSBwYXRo IG9uY2UgbV9uZXR3b3JrTG9hZENoZWNrZXIgaXMgdXNlZCBmb3IgYWxsIG5ldHdvcmsgbG9hZHMu CiAgICAgaWYgKGNhblVzZUNhY2hlKG9yaWdpbmFsUmVxdWVzdCgpKSkgewotICAgICAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDogQ2hlY2tpbmcgY2FjaGUgZm9yIHJlc291cmNlIChw YWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0g JSIgUFJJdTY0ICIsIGlzTWFpblJlc291cmNlID0gJWQsIGlzU3luY2hyb25vdXMgPSAlZCkiLCBt X3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0 ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCksIGlzU3luY2hyb25vdXMoKSk7CisgICAg ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0OiBDaGVja2luZyBjYWNoZSBmb3IgcmVz b3VyY2UgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291 cmNlSUQgPSAlIiBQUkl1NjQgIiwgaXNNYWluUmVzb3VyY2UgPSAlZCwgaXNTeW5jaHJvbm91cyA9 ICVkLCBwYXJlbnRQSUQgPSAlZCkiLCBtX3BhcmFtZXRlcnMud2ViUGFnZUlELCBtX3BhcmFtZXRl cnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGlzTWFpblJlc291cmNlKCks IGlzU3luY2hyb25vdXMoKSwgbV9wYXJhbWV0ZXJzLnBhcmVudFBJRCk7CiAgICAgICAgIHJldHJp ZXZlQ2FjaGVFbnRyeShvcmlnaW5hbFJlcXVlc3QoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJT dHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJT dHJhdGVneS5jcHAKaW5kZXggZjk4NTdjOTRhZDQ2MjBjYmVmZjg4ZTNhOWRmMGM1ZjhjMGIwZDk5 ZS4uNTg5MDhjZDUzYWVkNzgyYTA5ODdiZTJmZDFjYzIzNjg2ODdhMmM5OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNw cApAQCAtNjEsNiArNjEsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1TdHJhdGVnaWVz Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZWZlcnJlclBvbGljeS5oPgogI2luY2x1ZGUgPFdlYkNv cmUvUmVzb3VyY2VMb2FkZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1J1bnRpbWVBcHBsaWNhdGlv bkNoZWNrcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oPgog I2luY2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Nl dHRpbmdzLmg+CkBAIC0yNjgsNiArMjY5LDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2No ZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKICAg ICBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyID0gaWRlbnRpZmllcjsKICAgICBsb2FkUGFyYW1l dGVycy53ZWJQYWdlSUQgPSB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlEOwogICAgIGxvYWRQYXJh bWV0ZXJzLndlYkZyYW1lSUQgPSB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRDsKKyAgICBsb2Fk UGFyYW1ldGVycy5wYXJlbnRQSUQgPSBwcmVzZW50aW5nQXBwbGljYXRpb25QSUQoKTsKICAgICBs b2FkUGFyYW1ldGVycy5zZXNzaW9uSUQgPSBzZXNzaW9uSUQ7CiAgICAgbG9hZFBhcmFtZXRlcnMu cmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgbG9hZFBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9s aWN5ID0gY29udGVudFNuaWZmaW5nUG9saWN5OwpAQCAtNTMxLDYgKzUzMyw3IEBAIHZvaWQgV2Vi TG9hZGVyU3RyYXRlZ3k6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoRnJhbWVMb2FkZXImIGZy YW1lTG9hZGVyLCB1bnNpCiAgICAgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllciA9IHJlc291cmNl TG9hZElkZW50aWZpZXI7CiAgICAgbG9hZFBhcmFtZXRlcnMud2ViUGFnZUlEID0gcGFnZUlEOwog ICAgIGxvYWRQYXJhbWV0ZXJzLndlYkZyYW1lSUQgPSBmcmFtZUlEOworICAgIGxvYWRQYXJhbWV0 ZXJzLnBhcmVudFBJRCA9IHByZXNlbnRpbmdBcHBsaWNhdGlvblBJRCgpOwogICAgIGxvYWRQYXJh bWV0ZXJzLnNlc3Npb25JRCA9IHNlc3Npb25JRDsKICAgICBsb2FkUGFyYW1ldGVycy5yZXF1ZXN0 ID0gcmVxdWVzdDsKICAgICBsb2FkUGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQb2xpY3kgPSBD b250ZW50U25pZmZpbmdQb2xpY3k6OlNuaWZmQ29udGVudDsKQEAgLTU4NSw2ICs1ODgsNyBAQCB2 b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzdGFydFBpbmdMb2FkKEZyYW1lJiBmcmFtZSwgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjbwogICAgIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIgPSBn ZW5lcmF0ZUxvYWRJZGVudGlmaWVyKCk7CiAgICAgbG9hZFBhcmFtZXRlcnMucmVxdWVzdCA9IHJl cXVlc3Q7CiAgICAgbG9hZFBhcmFtZXRlcnMuc291cmNlT3JpZ2luID0gJmRvY3VtZW50LT5zZWN1 cml0eU9yaWdpbigpOworICAgIGxvYWRQYXJhbWV0ZXJzLnBhcmVudFBJRCA9IHByZXNlbnRpbmdB cHBsaWNhdGlvblBJRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnNlc3Npb25JRCA9IGZyYW1lLnBh Z2UoKSA/IGZyYW1lLnBhZ2UoKS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Npb25JRDo6ZGVmYXVs dFNlc3Npb25JRCgpOwogICAgIGxvYWRQYXJhbWV0ZXJzLnN0b3JlZENyZWRlbnRpYWxzUG9saWN5 ID0gb3B0aW9ucy5jcmVkZW50aWFscyA9PSBGZXRjaE9wdGlvbnM6OkNyZWRlbnRpYWxzOjpPbWl0 ID8gU3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRvTm90VXNlIDogU3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3k6OlVzZTsKICAgICBsb2FkUGFyYW1ldGVycy5vcHRpb25zID0gb3B0aW9uczsKQEAgLTY0 NCw2ICs2NDgsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8oRnJhbWVM b2FkZXImIGZyYW1lTG9hZGVyLCBjb25zdCBVUkwmIHVybCwgUwogICAgIHBhcmFtZXRlcnMucmVx dWVzdCA9IFJlc291cmNlUmVxdWVzdCB7IHVybCB9OwogICAgIHBhcmFtZXRlcnMud2ViUGFnZUlE ID0gd2ViUGFnZSA/IHdlYlBhZ2UtPnBhZ2VJRCgpIDogMDsKICAgICBwYXJhbWV0ZXJzLndlYkZy YW1lSUQgPSB3ZWJGcmFtZSA/IHdlYkZyYW1lLT5mcmFtZUlEKCkgOiAwOworICAgIHBhcmFtZXRl cnMucGFyZW50UElEID0gcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCk7CiAgICAgcGFyYW1ldGVy cy5zZXNzaW9uSUQgPSB3ZWJQYWdlID8gd2ViUGFnZS0+c2Vzc2lvbklEKCkgOiBQQUw6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpOwogICAgIHBhcmFtZXRlcnMuc3RvcmVkQ3JlZGVudGlh bHNQb2xpY3kgPSBzdG9yZWRDcmVkZW50aWFsc1BvbGljeTsKICAgICBwYXJhbWV0ZXJzLnNob3Vs ZFByZWNvbm5lY3RPbmx5ID0gUHJlY29ubmVjdE9ubHk6OlllczsK