139978 2014-12-28 13:29:27 -0800 Use UserData when sending messages to the process pool 2014-12-30 09:33:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140005 1 andersca andersca oldest_to_newest 1058054 0 andersca 2014-12-28 13:29:27 -0800 Use UserData when sending messages to the process pool 1058055 1 243785 andersca 2014-12-28 13:32:57 -0800 Created attachment 243785 Patch 1058066 2 243785 sam 2014-12-28 17:06:19 -0800 Comment on attachment 243785 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243785&action=review > Source/WebKit2/UIProcess/WebProcessPool.cpp:950 > // InjectedBundle client Can you get rid of this comment. 1058100 3 andersca 2014-12-29 09:46:18 -0800 Committed r177792: <http://trac.webkit.org/changeset/177792> 243785 2014-12-28 13:32:57 -0800 2014-12-28 17:06:19 -0800 Patch bug-139978-20141228133259.patch text/plain 20599 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzdjMDJkMzE3MTEwODIz NGVkZTQ4YzZiZmM0YjIyM2IxOTgwNzQxYy4uNmY1MWFhNjFlODM2OWIwODY1MWU2ZDlhMWZmYWQ3 NmQ4YjA0ZmE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUzIEBACiAyMDE0LTEyLTI4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIFVzZXJEYXRh IHdoZW4gc2VuZGluZyBtZXNzYWdlcyB0byB0aGUgcHJvY2VzcyBwb29sCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5NzgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0L21lc3Nh Z2VzLnB5OgorICAgICAgICAoZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyKToKKyAgICAgICAgSW5j bHVkZSB0aGUgY29ubmVjdGlvbiBwYXJhbWV0ZXIgZm9yIGxlZ2FjeSByZWNlaXZlcnMgYXMgd2Vs bC4KKworICAgICAgICAqIFNoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJDb250ZXh0TWVzc2FnZUtp bmRzLmg6CisgICAgICAgIFJlbW92ZSB0aGlzLCBpdCdzIG5vIGxvbmdlciBuZWVkZWQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUG9vbDo6ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICBObyBuZWVkIHRvIHNw ZWNpYWwgY2FzZSB0aGUgcG9zdE1lc3NhZ2UgbWVzc2FnZS4KKworICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUG9vbDo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgTm8gbmVlZCB0 byBzcGVjaWFsIGNhc2UgdGhlIHBvc3RTeW5jaHJvbm91c01lc3NhZ2VNZXNzYWdlIG1lc3NhZ2Uu CisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmhhbmRsZU1lc3NhZ2UpOgorICAg ICAgICBDb252ZXJ0IGhhbmRsZXMgdG8gb2JqZWN0cyBhbmQgY2FsbCBkaWRSZWNlaXZlTWVzc2Fn ZUZyb21JbmplY3RlZEJ1bmRsZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6 aGFuZGxlU3luY2hyb25vdXNNZXNzYWdlKToKKyAgICAgICAgQ29udmVydCBoYW5kbGVzIHRvIG9i amVjdHMsIGNhbGwgZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRs ZSwgYW5kIHRoZW4KKyAgICAgICAgY29udmVydCBvYmplY3RzIGJhY2sgdG8gaGFuZGxlcyBpbiB0 aGUgcmVwbHkuCisgICAgICAgIAorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZGlk UmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOiBEZWxldGVkLgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzUG9vbDo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21Jbmpl Y3RlZEJ1bmRsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpk dW1teSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6Cisg ICAgICAgIEFkZCBoYW5kbGVNZXNzYWdlIGFuZCBoYW5kbGVTeW5jaHJvbm91c01lc3NhZ2UgbWVz c2FnZSBoYW5kbGVycy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5tZXNz YWdlcy5pbjoKKyAgICAgICAgQWRkIG5ldyBtZXNzYWdlcy4KKworICAgICAgICAqIFdlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgUmVtb3ZlIGEgbm93IHVudXNlZCBm aWxlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjpwb3N0TWVzc2FnZSk6Cisg ICAgICAgIENvbnZlcnQgb2JqZWN0cyB0byBoYW5kbGVzIGluIHRoZSBtZXNzYWdlIGJvZHkgYW5k IHRoZW4gc2VuZCB0aGUgSGFuZGxlTWVzc2FnZSB0byB0aGUgVUkgcHJvY2Vzcy4KKworICAgICAg ICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cG9zdFN5bmNocm9ub3VzTWVzc2FnZSk6CisgICAg ICAgIENvbnZlcnQgb2JqZWN0cyB0byBoYW5kbGVzIGluIHRoZSBtZXNzYWdlIGJvZHksIHNlbmQg dGhlIEhhbmRsZVN5bmNocm9ub3VzTWVzc2FnZSBtZXNzYWdlIHRvIHRoZSBVSSBwcm9jZXNzLAor ICAgICAgICBhbmQgdGhlbiBjb252ZXJ0IGhhbmRsZXMgYmFjayB0byBvYmplY3RzIGluIHRoZSBy ZXBseS4KKworMjAxNC0xMi0yOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgorCiAgICAgICAgIFRyYW5zZm9ybSBuZXN0ZWQgb2JqZWN0cyBpbnNpZGUgYXJyYXlzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5NzYKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkgYi9Tb3Vy Y2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weQppbmRleCBhZDVmNzEzM2RkMGI1 MjBmZjVkYzY1M2I1ZGY3MWRhZjM1NTdhNGRhLi4xMWMyZjUxYWRiYTc5ZTNiNTE5NmI0YTQ1YjMw MGZmNjRlNjdkYzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdC9t ZXNzYWdlcy5weQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5w eQpAQCAtNTMzLDcgKzUzMyw3IEBAIGRlZiBnZW5lcmF0ZV9tZXNzYWdlX2hhbmRsZXIoZmlsZSk6 CiAKICAgICBpZiBhc3luY19tZXNzYWdlczoKICAgICAgICAgaWYgcmVjZWl2ZXIuaGFzX2F0dHJp YnV0ZShMRUdBQ1lfUkVDRUlWRVJfQVRUUklCVVRFKToKLSAgICAgICAgICAgIHJlc3VsdC5hcHBl bmQoJ3ZvaWQgJXM6OmRpZFJlY2VpdmUlc01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uKiwgSVBDOjpN ZXNzYWdlRGVjb2RlciYgZGVjb2RlcilcbicgJSAocmVjZWl2ZXIubmFtZSwgcmVjZWl2ZXIubmFt ZSkpCisgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCd2b2lkICVzOjpkaWRSZWNlaXZlJXNNZXNz YWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVj b2RlcilcbicgJSAocmVjZWl2ZXIubmFtZSwgcmVjZWl2ZXIubmFtZSkpCiAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCd2b2lkICVzOjpkaWRSZWNlaXZlTWVzc2FnZShJ UEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIElQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIp XG4nICUgKHJlY2VpdmVyLm5hbWUpKQogCkBAIC01NTIsOSArNTUyLDcgQEAgZGVmIGdlbmVyYXRl X21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAgICAgICAgcmVzdWx0LmFwcGVuZCgnXG4nKQogICAg ICAgICB1c2VfY29ubmVjdGlvbiA9IFRydWUKICAgICAgICAgaWYgcmVjZWl2ZXIuaGFzX2F0dHJp YnV0ZShMRUdBQ1lfUkVDRUlWRVJfQVRUUklCVVRFKToKLSAgICAgICAgICAgIGlmIG5vdCBzeW5j X2RlbGF5ZWRfbWVzc2FnZXM6Ci0gICAgICAgICAgICAgICAgdXNlX2Nvbm5lY3Rpb24gPSBGYWxz ZQotICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgndm9pZCAlczo6ZGlkUmVjZWl2ZVN5bmMlc01l c3NhZ2UoSVBDOjpDb25uZWN0aW9uKiVzLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBz dGQ6OnVuaXF1ZV9wdHI8SVBDOjpNZXNzYWdlRW5jb2Rlcj4mIHJlcGx5RW5jb2RlcilcbicgJSAo cmVjZWl2ZXIubmFtZSwgcmVjZWl2ZXIubmFtZSwgJyBjb25uZWN0aW9uJyBpZiB1c2VfY29ubmVj dGlvbiBlbHNlICcnKSkKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJ3ZvaWQgJXM6OmRpZFJl Y2VpdmVTeW5jJXNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgSVBDOjpNZXNz YWdlRGVjb2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6TWVzc2FnZUVuY29kZXI+ JiByZXBseUVuY29kZXIpXG4nICUgKHJlY2VpdmVyLm5hbWUsIHJlY2VpdmVyLm5hbWUpKQogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgndm9pZCAlczo6ZGlkUmVjZWl2 ZVN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgSVBDOjpNZXNzYWdlRGVj b2RlciYgZGVjb2Rlciwgc3RkOjp1bmlxdWVfcHRyPElQQzo6TWVzc2FnZUVuY29kZXI+JiByZXBs eUVuY29kZXIpXG4nICUgKHJlY2VpdmVyLm5hbWUpKQogICAgICAgICByZXN1bHQuYXBwZW5kKCd7 XG4nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvcmVJUENTdXBwb3J0L1dl YkNvbnRleHRNZXNzYWdlS2luZHMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db3JlSVBDU3Vw cG9ydC9XZWJDb250ZXh0TWVzc2FnZUtpbmRzLmgKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDQ4OTU4MTAyY2ZkZWVmMDY3MmU4MWVkMzZmMTE5OGRmMzM5MGVkZmIuLjAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L0NvcmVJUENTdXBwb3J0L1dlYkNvbnRleHRNZXNzYWdlS2luZHMuaAorKysgL2Rldi9udWxsCkBA IC0xLDUyICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUg bWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaWZuZGVmIFdlYkNvbnRleHRNZXNzYWdlS2lu ZHNfaAotI2RlZmluZSBXZWJDb250ZXh0TWVzc2FnZUtpbmRzX2gKLQotLy8gTWVzc2FnZXMgc2Vu dCBmcm9tIHRoZSBpbmplY3RlZCBidW5kbGUgdG8gdGhlIFdlYkNvbnRleHQuCi0KLSNpbmNsdWRl ICJTdHJpbmdSZWZlcmVuY2UuaCIKLQotbmFtZXNwYWNlIFdlYkNvbnRleHRMZWdhY3lNZXNzYWdl cyB7Ci0KLWlubGluZSBJUEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lKCkK LXsKLSAgICByZXR1cm4gSVBDOjpTdHJpbmdSZWZlcmVuY2UoIldlYkNvbnRleHRMZWdhY3lNZXNz YWdlIik7Ci19Ci0KLWlubGluZSBJUEM6OlN0cmluZ1JlZmVyZW5jZSBwb3N0TWVzc2FnZU1lc3Nh Z2VOYW1lKCkKLXsKLSAgICByZXR1cm4gSVBDOjpTdHJpbmdSZWZlcmVuY2UoIlBvc3RNZXNzYWdl Iik7Ci19Ci0KLWlubGluZSBJUEM6OlN0cmluZ1JlZmVyZW5jZSBwb3N0U3luY2hyb25vdXNNZXNz YWdlTWVzc2FnZU5hbWUoKQotewotICAgIHJldHVybiBJUEM6OlN0cmluZ1JlZmVyZW5jZSgiUG9z dFN5bmNocm9ub3VzTWVzc2FnZSIpOwotfQotCi19IC8vIG5hbWVzcGFjZSBXZWJDb250ZXh0TGVn YWN5TWVzc2FnZXMKLQotI2VuZGlmIC8vIEluamVjdGVkQnVuZGxlTWVzc2FnZUtpbmRzX2gKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IGI5MDM2MDll MmU3NDkzNTY1ZThhMjgxY2E5NDdlNjY2MTFmZjY1MGIuLmZjYWRhNjQzNTAzOTU2Y2MyYWU5MTg4 NWNkNmFiMzFiNGEyM2QwNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcApAQCAtMzgsNyArMzgsNiBAQAogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAj aW5jbHVkZSAiV0tDb250ZXh0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYkFwcGxpY2F0aW9uQ2Fj aGVNYW5hZ2VyUHJveHkuaCIKLSNpbmNsdWRlICJXZWJDb250ZXh0TWVzc2FnZUtpbmRzLmgiCiAj aW5jbHVkZSAiV2ViQ29udGV4dFN1cHBsZW1lbnQuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0VXNl ck1lc3NhZ2VDb2RlcnMuaCIKICNpbmNsdWRlICJXZWJDb29raWVNYW5hZ2VyUHJveHkuaCIKQEAg LTIwMCw3ICsxOTksNiBAQCBXZWJQcm9jZXNzUG9vbDo6V2ViUHJvY2Vzc1Bvb2woV2ViUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uIGNvbmZpZ3VyYXRpb24pCiAgICAgcGxhdGZvcm1Jbml0aWFsaXpl KCk7CiAKICAgICBhZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlByb2Nlc3NQb29sOjpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksICp0aGlzKTsKLSAgICBhZGRNZXNzYWdlUmVjZWl2ZXIoV2Vi Q29udGV4dExlZ2FjeU1lc3NhZ2VzOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksICp0aGlzKTsKIAog ICAgIC8vIE5PVEU6IFRoZXNlIHN1Yi1vYmplY3RzIG11c3QgYmUgaW5pdGlhbGl6ZWQgYWZ0ZXIg bV9tZXNzYWdlUmVjZWl2ZXJNYXAuLgogICAgIG1faWNvbkRhdGFiYXNlID0gV2ViSWNvbkRhdGFi YXNlOjpjcmVhdGUodGhpcyk7CkBAIC05NTEsMTYgKzk0OSw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bv b2w6OnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1l LCBBUEk6CiAKIC8vIEluamVjdGVkQnVuZGxlIGNsaWVudAogCi12b2lkIFdlYlByb2Nlc3NQb29s OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShjb25zdCBTdHJpbmcmIG1lc3Nh Z2VOYW1lLCBBUEk6Ok9iamVjdCogbWVzc2FnZUJvZHkpCi17Ci0gICAgbV9pbmplY3RlZEJ1bmRs ZUNsaWVudC5kaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSh0aGlzLCBtZXNzYWdl TmFtZSwgbWVzc2FnZUJvZHkpOwotfQotCi12b2lkIFdlYlByb2Nlc3NQb29sOjpkaWRSZWNlaXZl U3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKGNvbnN0IFN0cmluZyYgbWVzc2Fn ZU5hbWUsIEFQSTo6T2JqZWN0KiBtZXNzYWdlQm9keSwgUmVmUHRyPEFQSTo6T2JqZWN0PiYgcmV0 dXJuRGF0YSkKLXsKLSAgICBtX2luamVjdGVkQnVuZGxlQ2xpZW50LmRpZFJlY2VpdmVTeW5jaHJv bm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUodGhpcywgbWVzc2FnZU5hbWUsIG1lc3NhZ2VC b2R5LCByZXR1cm5EYXRhKTsKLX0KLQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6cG9wdWxhdGVWaXNp dGVkTGlua3MoKQogewogICAgIG1faGlzdG9yeUNsaWVudC0+cG9wdWxhdGVWaXNpdGVkTGlua3Mo KnRoaXMpOwpAQCAtMTE0NCwyMCArMTEzMiw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmRpZFJl Y2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgSVBDOjpNZXNzYWdlCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJO YW1lKCkgPT0gV2ViQ29udGV4dExlZ2FjeU1lc3NhZ2VzOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkK LSAgICAgICAgJiYgZGVjb2Rlci5tZXNzYWdlTmFtZSgpID09IFdlYkNvbnRleHRMZWdhY3lNZXNz YWdlczo6cG9zdE1lc3NhZ2VNZXNzYWdlTmFtZSgpKSB7Ci0gICAgICAgIFN0cmluZyBtZXNzYWdl TmFtZTsKLSAgICAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBtZXNzYWdlQm9keTsKLSAgICAgICAg V2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlQm9keURlY29kZXIobWVzc2FnZUJv ZHksICpXZWJQcm9jZXNzUHJveHk6OmZyb21Db25uZWN0aW9uKGNvbm5lY3Rpb24pKTsKLSAgICAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXNzYWdlTmFtZSkpCi0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUobWVzc2FnZUJvZHlEZWNvZGVyKSkKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1 bmRsZShtZXNzYWdlTmFtZSwgbWVzc2FnZUJvZHkuZ2V0KCkpOwotICAgICAgICByZXR1cm47Ci0g ICAgfQotCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKQEAgLTExNjgsMjYgKzExNDIs NiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoSVBDOjpDb25u ZWN0aW9uKiBjb25uZWN0aW9uLCBJUEM6Ok1lcwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0g ICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IFdlYkNvbnRleHRMZWdhY3lN ZXNzYWdlczo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpCi0gICAgICAgICYmIGRlY29kZXIubWVzc2Fn ZU5hbWUoKSA9PSBXZWJDb250ZXh0TGVnYWN5TWVzc2FnZXM6OnBvc3RTeW5jaHJvbm91c01lc3Nh Z2VNZXNzYWdlTmFtZSgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkg ZW5jb2RlIHNvbWV0aGluZyBpbiB0aGUgY2FzZSB0aGF0IHRoZSBhcmd1bWVudHMgZG8gbm90IGRl Y29kZSBjb3JyZWN0bHkuCi0KLSAgICAgICAgV2ViUHJvY2Vzc1Byb3h5KiBwcm9jZXNzID0gV2Vi UHJvY2Vzc1Byb3h5Ojpmcm9tQ29ubmVjdGlvbihjb25uZWN0aW9uKTsKLQotICAgICAgICBTdHJp bmcgbWVzc2FnZU5hbWU7Ci0gICAgICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gbWVzc2FnZUJvZHk7 Ci0gICAgICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZUJvZHlEZWNvZGVy KG1lc3NhZ2VCb2R5LCAqcHJvY2Vzcyk7Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUobWVz c2FnZU5hbWUpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKG1lc3NhZ2VCb2R5RGVjb2RlcikpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg UmVmUHRyPEFQSTo6T2JqZWN0PiByZXR1cm5EYXRhOwotICAgICAgICBkaWRSZWNlaXZlU3luY2hy b25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKG1lc3NhZ2VOYW1lLCBtZXNzYWdlQm9keS5n ZXQoKSwgcmV0dXJuRGF0YSk7Ci0gICAgICAgIHJlcGx5RW5jb2Rlci0+ZW5jb2RlKFdlYkNvbnRl eHRVc2VyTWVzc2FnZUVuY29kZXIocmV0dXJuRGF0YS5nZXQoKSwgKnByb2Nlc3MpKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCkBAIC0x MzgwLDExICsxMzM0LDIyIEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnJlcXVlc3ROZXR3b3JraW5n U3RhdGlzdGljcyhTdGF0aXN0aWNzUmVxdWVzdCogcmVxdWVzdCkKICNlbmRpZgogfQogCi0jaWYg IVBMQVRGT1JNKENPQ09BKQotdm9pZCBXZWJQcm9jZXNzUG9vbDo6ZHVtbXkoYm9vbCYpCit2b2lk IFdlYlByb2Nlc3NQb29sOjpoYW5kbGVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlv biwgY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgY29uc3QgV2ViS2l0OjpVc2VyRGF0YSYgbWVz c2FnZUJvZHkpCiB7CisgICAgaWYgKGF1dG8qIHdlYlByb2Nlc3NQcm94eSA9IFdlYlByb2Nlc3NQ cm94eTo6ZnJvbUNvbm5lY3Rpb24oY29ubmVjdGlvbikpCisgICAgICAgIG1faW5qZWN0ZWRCdW5k bGVDbGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUodGhpcywgbWVzc2Fn ZU5hbWUsIHdlYlByb2Nlc3NQcm94eS0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyhtZXNzYWdl Qm9keS5vYmplY3QoKSkuZ2V0KCkpOworfQorCit2b2lkIFdlYlByb2Nlc3NQb29sOjpoYW5kbGVT eW5jaHJvbm91c01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25zdCBTdHJp bmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBVc2VyRGF0YSYgbWVzc2FnZUJvZHksIFVzZXJEYXRhJiBy ZXR1cm5Vc2VyRGF0YSkKK3sKKyAgICBhdXRvKiB3ZWJQcm9jZXNzUHJveHkgPSBXZWJQcm9jZXNz UHJveHk6OmZyb21Db25uZWN0aW9uKGNvbm5lY3Rpb24pOworICAgIGlmICghd2ViUHJvY2Vzc1By b3h5KQorICAgICAgICByZXR1cm47CisKKyAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IHJldHVybkRh dGE7CisgICAgbV9pbmplY3RlZEJ1bmRsZUNsaWVudC5kaWRSZWNlaXZlU3luY2hyb25vdXNNZXNz YWdlRnJvbUluamVjdGVkQnVuZGxlKHRoaXMsIG1lc3NhZ2VOYW1lLCB3ZWJQcm9jZXNzUHJveHkt PnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobWVzc2FnZUJvZHkub2JqZWN0KCkpLmdldCgpLCBy ZXR1cm5EYXRhKTsKKyAgICByZXR1cm5Vc2VyRGF0YSA9IFVzZXJEYXRhKHdlYlByb2Nlc3NQcm94 eS0+dHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyhyZXR1cm5EYXRhLmdldCgpKSk7CiB9Ci0jZW5k aWYKIAogdm9pZCBXZWJQcm9jZXNzUG9vbDo6ZGlkR2V0U3RhdGlzdGljcyhjb25zdCBTdGF0aXN0 aWNzRGF0YSYgc3RhdGlzdGljc0RhdGEsIHVpbnQ2NF90IHJlcXVlc3RJRCkKIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggZjNlNjk4Yjk4NmU3ZjlmOTFh ZmE3ODdmZjM0NTg4MjI5NmExMzc2NC4uMWIzZDEzYzAwNDUwNWIyMmZjNGM0ZDNlYzMwZWRjNzgx ZTkxYzk4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAg LTE4OCwxMCArMTg4LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBwb3N0TWVzc2FnZVRvSW5qZWN0 ZWRCdW5kbGUoY29uc3QgU3RyaW5nJiwgQVBJOjpPYmplY3QqKTsKIAotICAgIC8vIEluamVjdGVk QnVuZGxlIGNsaWVudAotICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5k bGUoY29uc3QgU3RyaW5nJiwgQVBJOjpPYmplY3QqKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5j aHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoY29uc3QgU3RyaW5nJiwgQVBJOjpPYmpl Y3QqLCBSZWZQdHI8QVBJOjpPYmplY3Q+JiByZXR1cm5EYXRhKTsKLQogICAgIHZvaWQgcG9wdWxh dGVWaXNpdGVkTGlua3MoKTsKIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQpAQCAt NDA2LDExICs0MDIsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0UGFzdGVib2FyZEJ1ZmZlckZv clR5cGUoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgY29uc3QgU3RyaW5nJiBwYXN0ZWJv YXJkVHlwZSwgY29uc3QgU2hhcmVkTWVtb3J5OjpIYW5kbGUmLCB1aW50NjRfdCBzaXplLCB1aW50 NjRfdCYgbmV3Q2hhbmdlQ291bnQpOwogI2VuZGlmCiAKLSNpZiAhUExBVEZPUk0oQ09DT0EpCi0g ICAgLy8gRklYTUU6IFRoaXMgYSBkdW1teSBtZXNzYWdlLCB0byBhdm9pZCBicmVha2luZyB0aGUg YnVpbGQgZm9yIHBsYXRmb3JtcyB0aGF0IGRvbid0IHJlcXVpcmUKLSAgICAvLyBhbnkgc3luY2hy b25vdXMgbWVzc2FnZXMsIGFuZCBzaG91bGQgYmUgcmVtb3ZlZCB3aGVuIDxyZGFyOi8vcHJvYmxl bS84Nzc1MTE1PiBpcyBmaXhlZC4KLSAgICB2b2lkIGR1bW15KGJvb2wmKTsKLSNlbmRpZgorICAg IHZvaWQgaGFuZGxlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBjb25zdCBTdHJpbmcmIG1lc3Nh Z2VOYW1lLCBjb25zdCBVc2VyRGF0YSYgbWVzc2FnZUJvZHkpOworICAgIHZvaWQgaGFuZGxlU3lu Y2hyb25vdXNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiosIGNvbnN0IFN0cmluZyYgbWVzc2FnZU5h bWUsIGNvbnN0IFVzZXJEYXRhJiBtZXNzYWdlQm9keSwgVXNlckRhdGEmIHJldHVyblVzZXJEYXRh KTsKIAogICAgIHZvaWQgZGlkR2V0U3RhdGlzdGljcyhjb25zdCBTdGF0aXN0aWNzRGF0YSYsIHVp bnQ2NF90IGNhbGxiYWNrSUQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Bvb2wubWVzc2FnZXMuaW4KaW5kZXggZjk1OTJmODc3NDdhNGQ1ZDZiNzA4YThh YjNjMWRjZTA2ZjJkMmJkOC4uNzZkOTJlNTA0YmVmMWRlYmJlMDQ3NWFmMzYyOTNmMzY4NWUwZTVl MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLm1l c3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5t ZXNzYWdlcy5pbgpAQCAtMjEsNiArMjEsOCBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBtZXNzYWdlcyAt PiBXZWJQcm9jZXNzUG9vbCBMZWdhY3lSZWNlaXZlciB7CisgICAgSGFuZGxlTWVzc2FnZShTdHJp bmcgbWVzc2FnZU5hbWUsIFdlYktpdDo6VXNlckRhdGEgbWVzc2FnZUJvZHkpIFdhbnRzQ29ubmVj dGlvbgorICAgIEhhbmRsZVN5bmNocm9ub3VzTWVzc2FnZShTdHJpbmcgbWVzc2FnZU5hbWUsIFdl YktpdDo6VXNlckRhdGEgbWVzc2FnZUJvZHkpIC0+IChXZWJLaXQ6OlVzZXJEYXRhIHJldHVybkRh dGEpIFdhbnRzQ29ubmVjdGlvbgogCiAgICAgRGlkR2V0U3RhdGlzdGljcyhzdHJ1Y3QgV2ViS2l0 OjpTdGF0aXN0aWNzRGF0YSBzdGF0aXN0aWNzRGF0YSwgdWludDY0X3QgY2FsbGJhY2tJRCkKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmlu ZGV4IDJhNWNiZGYxMmQ3ZDZiZTVlYWRhMTU0YWJjYWI0ZDQ1MzdkYzFiMmUuLjZmNjhhZmFhMDRk MzQ3OTJmYmNlMGI0OGQ1YzhiNGYzNjVjMjQ0ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTE0NzYsNyArMTQ3Niw2IEBACiAJ CUJDQzU3MTVDMTE1QURBRUYwMDFDQ0FGOSAvKiBXZWJTeXN0ZW1JbnRlcmZhY2UubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0M1NzE1QTExNUFEQUVG MDAxQ0NBRjkgLyogV2ViU3lzdGVtSW50ZXJmYWNlLm1tICovOyB9OwogCQlCQ0M4QjM3NDEyNUZC NjkwMDBERTQ2QTQgLyogV0tHZW9tZXRyeS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQkNDOEIzNzMxMjVGQjY5MDAwREU0NkE0IC8qIFdLR2VvbWV0cnku aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlCQ0M5 MzhFMTExODBERTQ0MDA4NUU1RkUgLyogV0tDb250ZXh0UHJpdmF0ZS5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNDOTM4RTAxMTgwREU0NDAwODVFNUZF IC8qIFdLQ29udGV4dFByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2 YXRlLCApOyB9OyB9OwotCQlCQ0NCNzVDNjEyMDNBMUNFMDAyMjJEMUIgLyogV2ViQ29udGV4dE1l c3NhZ2VLaW5kcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkNDQjc1QzUxMjAzQTFDRTAwMjIyRDFCIC8qIFdlYkNvbnRleHRNZXNzYWdlS2luZHMuaCAq LzsgfTsKIAkJQkNDRjY3MkQxMkM3RURGNzAwOEY5QzM1IC8qIE9yaWdpbkFuZERhdGFiYXNlcy5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNDRjY3MkMx MkM3RURGNzAwOEY5QzM1IC8qIE9yaWdpbkFuZERhdGFiYXNlcy5oICovOyB9OwogCQlCQ0NGNjcz MzEyQzdGMTVDMDA4RjlDMzUgLyogT3JpZ2luQW5kRGF0YWJhc2VzLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDQ0Y2NzMyMTJDN0YxNUMwMDhGOUMz NSAvKiBPcmlnaW5BbmREYXRhYmFzZXMuY3BwICovOyB9OwogCQlCQ0NGNkFCQzEyQzkxRUY5MDA4 RjlDMzUgLyogV2ViSW1hZ2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQkNDRjZBQkExMkM5MUVGOTAwOEY5QzM1IC8qIFdlYkltYWdlLmNwcCAqLzsg fTsKQEAgLTM1OTYsNyArMzU5NSw2IEBACiAJCUJDQzU3MTVBMTE1QURBRUYwMDFDQ0FGOSAvKiBX ZWJTeXN0ZW1JbnRlcmZhY2UubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBh dGggPSBXZWJTeXN0ZW1JbnRlcmZhY2UubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CUJDQzhCMzczMTI1RkI2OTAwMERFNDZBNCAvKiBXS0dlb21ldHJ5LmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFdLR2VvbWV0cnkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJQkNDOTM4RTAxMTgwREU0NDAwODVFNUZFIC8qIFdLQ29udGV4dFByaXZhdGUuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tDb250ZXh0UHJpdmF0ZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwotCQlCQ0NCNzVDNTEyMDNBMUNFMDAyMjJEMUIgLyogV2ViQ29u dGV4dE1lc3NhZ2VLaW5kcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJD b250ZXh0TWVzc2FnZUtpbmRzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDQ0Y2 NzJDMTJDN0VERjcwMDhGOUMzNSAvKiBPcmlnaW5BbmREYXRhYmFzZXMuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gT3JpZ2luQW5kRGF0YWJhc2VzLmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUJDQ0Y2NzMyMTJDN0YxNUMwMDhGOUMzNSAvKiBPcmlnaW5BbmREYXRh YmFzZXMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gT3JpZ2luQW5k RGF0YWJhc2VzLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkNDRjZBQkExMkM5 MUVGOTAwOEY5QzM1IC8qIFdlYkltYWdlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFdlYkltYWdlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTYy NTUsNyArNjI1Myw2IEBACiAJCUJDMTExQjVGMTEyRjYzNUUwMDMzN0JBQiAvKiBDb3JlSVBDU3Vw cG9ydCAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCi0JCQkJQkND Qjc1QzUxMjAzQTFDRTAwMjIyRDFCIC8qIFdlYkNvbnRleHRNZXNzYWdlS2luZHMuaCAqLywKIAkJ CSk7CiAJCQlwYXRoID0gQ29yZUlQQ1N1cHBvcnQ7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4i OwpAQCAtNzU4Niw3ICs3NTgzLDYgQEAKIAkJCQk1MTBGQkI5QjEyODhDOTVFMDBBRkZERjQgLyog V2ViQ29udGV4dE1lbnVJdGVtRGF0YS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTFBQ0JCODIxMjdB OEJBRDAwRDIwM0I5IC8qIFdlYkNvbnRleHRNZW51UHJveHkuaCBpbiBIZWFkZXJzICovLAogCQkJ CTUxQUNCQkEwMTI3QThGMkMwMEQyMDNCOSAvKiBXZWJDb250ZXh0TWVudVByb3h5TWFjLmggaW4g SGVhZGVycyAqLywKLQkJCQlCQ0NCNzVDNjEyMDNBMUNFMDAyMjJEMUIgLyogV2ViQ29udGV4dE1l c3NhZ2VLaW5kcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkNGNERFMjUxNjhGQTQ0ODAwQzk0QUZD IC8qIFdlYkNvbnRleHRTdXBwbGVtZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0IwQjBEQzEy MzA1QTI1MDBCMTM0MUUgLyogV2ViQ29udGV4dFVzZXJNZXNzYWdlQ29kZXJzLmggaW4gSGVhZGVy cyAqLywKIAkJCQkzMzA5MzQ1MDEzMTVCOTREMDA5N0E3QkMgLyogV2ViQ29va2llTWFuYWdlci5o IGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCmluZGV4IDg3ZGYwZWNhOGI4MzZk ODc0MzdjYjkyY2M3MGIyYzFmMmEyYTJkMDMuLmNjMjJhZDgyNjVlNTQ0NmUwNzcwNGZiMTYwNTZm M2RiNWYyOTcxMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCkBAIC0zMiwxMSArMzIsMTEgQEAK ICNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlQ29kZXJzLmgiCiAjaW5jbHVkZSAi Tm90aWZpY2F0aW9uUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiU2Vzc2lv blRyYWNrZXIuaCIKKyNpbmNsdWRlICJVc2VyRGF0YS5oIgogI2luY2x1ZGUgIldLQVBJQ2FzdC5o IgogI2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgogI2luY2x1ZGUgIldlYkFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiV2ViQ29ubmVjdGlvblRvVUlQcm9jZXNzLmgiCi0j aW5jbHVkZSAiV2ViQ29udGV4dE1lc3NhZ2VLaW5kcy5oIgogI2luY2x1ZGUgIldlYkNvb2tpZU1h bmFnZXIuaCIKICNpbmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJX ZWJEYXRhYmFzZU1hbmFnZXIuaCIKQEAgLTQ3LDYgKzQ3LDcgQEAKICNpbmNsdWRlICJXZWJQcmVm ZXJlbmNlc1N0b3JlLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzcy5oIgogI2luY2x1ZGUgIldlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbE1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQVBJQ2FzdC5oPgogI2luY2x1ZGUgPEph dmFTY3JpcHRDb3JlL0pTTG9jay5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQXBwbGljYXRpb25DYWNo ZS5oPgpAQCAtMTE0LDI3ICsxMTUsMTcgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6aW5pdGlhbGl6 ZUNsaWVudChjb25zdCBXS0J1bmRsZUNsaWVudEJhc2UqIGNsaWVudCkKIAogdm9pZCBJbmplY3Rl ZEJ1bmRsZTo6cG9zdE1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJOjpPYmpl Y3QqIG1lc3NhZ2VCb2R5KQogewotICAgIGF1dG8gZW5jb2RlciA9IHN0ZDo6bWFrZV91bmlxdWU8 SVBDOjpNZXNzYWdlRW5jb2Rlcj4oV2ViQ29udGV4dExlZ2FjeU1lc3NhZ2VzOjptZXNzYWdlUmVj ZWl2ZXJOYW1lKCksIFdlYkNvbnRleHRMZWdhY3lNZXNzYWdlczo6cG9zdE1lc3NhZ2VNZXNzYWdl TmFtZSgpLCAwKTsKLSAgICBlbmNvZGVyLT5lbmNvZGUobWVzc2FnZU5hbWUpOwotICAgIGVuY29k ZXItPmVuY29kZShJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlcihtZXNzYWdlQm9keSkp OwotCi0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+ c2VuZE1lc3NhZ2UoV1RGOjptb3ZlKGVuY29kZXIpKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQo KS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUG9v bDo6SGFuZGxlTWVzc2FnZShtZXNzYWdlTmFtZSwgVXNlckRhdGEoV2ViUHJvY2Vzczo6c2hhcmVk KCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyhtZXNzYWdlQm9keSkpKSwgMCk7CiB9CiAKIHZv aWQgSW5qZWN0ZWRCdW5kbGU6OnBvc3RTeW5jaHJvbm91c01lc3NhZ2UoY29uc3QgU3RyaW5nJiBt ZXNzYWdlTmFtZSwgQVBJOjpPYmplY3QqIG1lc3NhZ2VCb2R5LCBSZWZQdHI8QVBJOjpPYmplY3Q+ JiByZXR1cm5EYXRhKQogewotICAgIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VEZWNvZGVyIG1l c3NhZ2VEZWNvZGVyKHJldHVybkRhdGEpOwotCi0gICAgdWludDY0X3Qgc3luY1JlcXVlc3RJRDsK LSAgICBzdGQ6OnVuaXF1ZV9wdHI8SVBDOjpNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciA9IFdlYlBy b2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPmNyZWF0ZVN5bmNNZXNz YWdlRW5jb2RlcihXZWJDb250ZXh0TGVnYWN5TWVzc2FnZXM6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSwgV2ViQ29udGV4dExlZ2FjeU1lc3NhZ2VzOjpwb3N0U3luY2hyb25vdXNNZXNzYWdlTWVzc2Fn ZU5hbWUoKSwgMCwgc3luY1JlcXVlc3RJRCk7Ci0gICAgZW5jb2Rlci0+ZW5jb2RlKG1lc3NhZ2VO YW1lKTsKLSAgICBlbmNvZGVyLT5lbmNvZGUoSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29k ZXIobWVzc2FnZUJvZHkpKTsKKyAgICBVc2VyRGF0YSByZXR1cm5Vc2VyRGF0YTsKIAotICAgIHN0 ZDo6dW5pcXVlX3B0cjxJUEM6Ok1lc3NhZ2VEZWNvZGVyPiByZXBseURlY29kZXIgPSBXZWJQcm9j ZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kU3luY01lc3NhZ2Uo c3luY1JlcXVlc3RJRCwgV1RGOjptb3ZlKGVuY29kZXIpLCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNv bmRzOjptYXgoKSk7Ci0gICAgaWYgKCFyZXBseURlY29kZXIgfHwgIXJlcGx5RGVjb2Rlci0+ZGVj b2RlKG1lc3NhZ2VEZWNvZGVyKSkgeworICAgIGlmICghV2ViUHJvY2Vzczo6c2hhcmVkKCkucGFy ZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlByb2Nlc3NQb29s OjpIYW5kbGVTeW5jaHJvbm91c01lc3NhZ2UobWVzc2FnZU5hbWUsIFVzZXJEYXRhKFdlYlByb2Nl c3M6OnNoYXJlZCgpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXMobWVzc2FnZUJvZHkpKSksIE1l c3NhZ2VzOjpXZWJQcm9jZXNzUG9vbDo6SGFuZGxlU3luY2hyb25vdXNNZXNzYWdlOjpSZXBseShy ZXR1cm5Vc2VyRGF0YSksIDApKQogICAgICAgICByZXR1cm5EYXRhID0gbnVsbHB0cjsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KKyAgICBlbHNlCisgICAgICAgIHJldHVybkRhdGEgPSBXZWJQcm9j ZXNzOjpzaGFyZWQoKS50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKHJldHVyblVzZXJEYXRhLm9i amVjdCgpKTsKIH0KIAogV2ViQ29ubmVjdGlvbiogSW5qZWN0ZWRCdW5kbGU6OndlYkNvbm5lY3Rp b25Ub1VJUHJvY2VzcygpIGNvbnN0Cg==