81997 2012-03-22 17:17:07 -0700 Remove the Flash NPRuntime short-circuit hacks 2012-03-22 21:05:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 585892 0 andersca 2012-03-22 17:17:07 -0700 Remove the Flash NPRuntime short-circuit hacks 585908 1 133398 andersca 2012-03-22 17:34:39 -0700 Created attachment 133398 Patch 585910 2 133398 sam 2012-03-22 17:35:33 -0700 Comment on attachment 133398 Patch Begone! 586058 3 andersca 2012-03-22 21:05:55 -0700 Committed r111822: <http://trac.webkit.org/changeset/111822> 133398 2012-03-22 17:34:39 -0700 2012-03-22 17:35:33 -0700 Patch bug-81997-20120322173439.patch text/plain 18524 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDhjMGZlYjhmYmYwMWYz ZWM1YzRlNDljODVkMGY2ODY1NmRhYTE5My4uYzVhNzYwMDExNWJmMTExNmE2YWQ5MTI3MjgyNDUz YTAyN2QzNmFlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDEyLTAzLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBG bGFzaCBOUFJ1bnRpbWUgc2hvcnQtY2lyY3VpdCBoYWNrcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE5OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzEwNDA5Mjg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgY29kZSB3YXMgYWRkZWQgdG8gaGVscCBzcGVlZCB1cCBGbGFzaCBwbHVnLWluIGlu c3RhbnRpYXRpb24gYnkgcmVkdWNpbmcgdGhlIG51bWJlciBvZgorICAgICAgICBzeW5jaHJvbm91 cyBBUEkgY2FsbHMgZnJvbSB0aGUgcGx1Zy1pbiBwcm9jZXNzIHRvIHRoZSB3ZWIgcHJvY2VzcyBk dXJpbmcgaW5zdGFudGlhdGlvbi4KKyAgICAgICAgSG93ZXZlciwgdGhlcmUgd2FzIG5vIHJlYWwg aW5kaWNhdGlvbiB0aGF0IHRoaXMgYWN0dWFsbHkgaW1wcm92ZWQgcGVyZm9ybWFuY2UuCisKKyAg ICAgICAgRnVydGhlcm1vcmUsIGl0IHNlZW1zIHRvIGhhdmUgaW50cm9kdWNlZCBjcmFzaGVycyB3 aGVuIG1pc2JlaGF2aW5nIHBsdWctaW5zIHdvdWxkIG1ha2UgTlBSdW50aW1lIGNhbGxzCisgICAg ICAgIGFmdGVyIGEgcGx1Zy1pbiBoYWQgYmVlbiBkZXN0cm95ZWQuIFNpbmNlIEZsYXNoIGlzIG5v dyA2NC1iaXQgbGlrZSB0aGUgcmVzdCBvZiBXZWJLaXQgbGF1bmNoIHRpbWUgaGFzCisgICAgICAg IGltcHJvdmVkIHNpbmNlIHdlIGRvbid0IGhhdmUgdG8gYnJpbmcgaW4gYWxsIG9mIHRoZSAzMi1i aXQgc3lzdGVtIGZyYW1ld29ya3MsIHNvIHRoZSB0aW1lIGhhcyBjb21lIHRvIAorICAgICAgICBy aXAgb3V0IHRoaXMgZWdyZWdpb3VzIGhhY2suCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1Bs dWdpbkNvbnRyb2xsZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xs ZXJQcm94eTo6ZXZhbHVhdGUpOgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJv bGxlclByb3h5Lmg6CisgICAgICAgIChQbHVnaW5Db250cm9sbGVyUHJveHkpOgorICAgICAgICAq IFNoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbToK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmRldGVybWluZVF1aXJrcyk6 CisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvUGx1Z2luUXVpcmtzLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TlBOX0ludm9rZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaDoKKyAgICAgICAgKE5ldHNjYXBlUGx1Z2luKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luOjpQYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW46OlBh cmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5o OgorICAgICAgICAoUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKFBsdWdpbkNvbnRyb2xsZXIpOgorICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5oOgorICAgICAgICAoUGx1Z2luVmlldyk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQbHVnaW4pOgorCiAyMDEy LTAzLTIyICBEYXZlIE1pY2hhZWwgIDxkbWljaGFlbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg SFRNTFBsdWdpbkVsZW1lbnQgaXMgbm90IGRlc3Ryb3llZCBvbiByZWxvYWQgb3IgbmF2aWdhdGlv biBpZiBnZXROUE9iamVjdCBpcyBjYWxsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcAppbmRleCAxZmQxYjExMjQ2ZWMy ZTlhODRlMTE3NjBjNTNjODkwZDhmYzZmNzZlLi45ZDVjMTJlZDgyMTIxMmZiMDU3ZWU1MmU3ZDBi YmRmMmYyYWI4NTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1Bs dWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCkBAIC0yNjksOSArMjY5LDYgQEAgTlBPYmplY3Qq IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6cGx1Z2luRWxlbWVudE5QT2JqZWN0KCkKIAogYm9vbCBQ bHVnaW5Db250cm9sbGVyUHJveHk6OmV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3Qg U3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBib29sIGFsbG93UG9wdXBz KQogewotICAgIGlmICh0cnlUb1Nob3J0Q2lyY3VpdEV2YWx1YXRlKG5wT2JqZWN0LCBzY3JpcHRT dHJpbmcsIHJlc3VsdCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCiAgICAgUGx1Z2luRGVzdHJ1 Y3Rpb25Qcm90ZWN0b3IgcHJvdGVjdG9yKHRoaXMpOwogCiAgICAgTlBWYXJpYW50IG5wT2JqZWN0 QXNOUFZhcmlhbnQ7CkBAIC0yOTMsNTggKzI5MCw2IEBAIGJvb2wgUGx1Z2luQ29udHJvbGxlclBy b3h5OjpldmFsdWF0ZShOUE9iamVjdCogbnBPYmplY3QsIGNvbnN0IFN0cmluZyYgc2NyaXB0U3Ry CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUGx1Z2luQ29udHJvbGxlclByb3h5Ojp0cnlU b1Nob3J0Q2lyY3VpdEludm9rZShOUE9iamVjdCogbnBPYmplY3QsIE5QSWRlbnRpZmllciBtZXRo b2ROYW1lLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3Vu dCwgYm9vbCYgcmV0dXJuVmFsdWUsIE5QVmFyaWFudCYgcmVzdWx0KQotewotICAgIC8vIE9ubHkg dHJ5IHRvIHNob3J0IGNpcmN1aXQgZXZhbHVhdGUgZm9yIHBsdWctaW5zIHRoYXQgaGF2ZSB0aGUg cXVpcmsgc3BlY2lmaWVkLgotI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoTUFDKQotICAgIGlmICgh UGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkubmV0c2NhcGVQbHVnaW5Nb2R1bGUoKS0+cGx1Z2luUXVp cmtzKCkuY29udGFpbnMoUGx1Z2luUXVpcmtzOjpDYW5TaG9ydENpcmN1aXRTb21lTlBSdW50aW1l Q2FsbHNEdXJpbmdJbml0aWFsaXphdGlvbikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSNlbHNl Ci0gICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCi0KLSAgICAvLyBBbmQgb25seSB3aGVuIHdlJ3Jl IGluIGluaXRpYWxpemUuCi0gICAgaWYgKCFpbkluaXRpYWxpemUoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIAotICAgIC8vIEFuZCBvbmx5IHdoZW4gdGhlIE5QT2JqZWN0IGlzIHRoZSB3 aW5kb3cgTlBPYmplY3QuCi0gICAgaWYgKG5wT2JqZWN0ICE9IG1fd2luZG93TlBPYmplY3QpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIEFuZCBvbmx5IHdoZW4gd2UgZG9uJ3QgaGF2 ZSBhbnkgYXJndW1lbnRzLgotICAgIGlmIChhcmd1bWVudENvdW50KQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICBJZGVudGlmaWVyUmVwKiBtZXRob2ROYW1lUmVwID0gc3RhdGljX2Nhc3Q8 SWRlbnRpZmllclJlcCo+KG1ldGhvZE5hbWUpOwotICAgIGlmICghbWV0aG9kTmFtZVJlcC0+aXNT dHJpbmcoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaWYgKCFzdHJjbXAobWV0aG9k TmFtZVJlcC0+c3RyaW5nKCksICJfX2ZsYXNoX2dldFdpbmRvd0xvY2F0aW9uIikpIHsKLSAgICAg ICAgcmVzdWx0LnR5cGUgPSBOUFZhcmlhbnRUeXBlX1N0cmluZzsKLSAgICAgICAgcmVzdWx0LnZh bHVlLnN0cmluZ1ZhbHVlID0gY3JlYXRlTlBTdHJpbmcobV9wbHVnaW5DcmVhdGlvblBhcmFtZXRl cnMtPnBhcmFtZXRlcnMuZG9jdW1lbnRVUkwudXRmOCgpKTsgCi0gICAgICAgIHJldHVyblZhbHVl ID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIAotICAgIGlmICghc3Ry Y21wKG1ldGhvZE5hbWVSZXAtPnN0cmluZygpLCAiX19mbGFzaF9nZXRUb3BMb2NhdGlvbiIpKSB7 Ci0gICAgICAgIGlmIChtX3BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy0+cGFyYW1ldGVycy50b3Bs ZXZlbERvY3VtZW50VVJMLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICAvLyBJZiB0aGUgdG9wbGV2 ZWwgZG9jdW1lbnQgaXMgVVJMIGl0IG1lYW5zIHRoYXQgdGhlIGZyYW1lIHRoYXQgdGhlIHBsdWct aW4gaXMgaW4gZG9lc24ndCBoYXZlIGFjY2VzcyB0byB0aGUgdG9wbGV2ZWwgZG9jdW1lbnQuCi0g ICAgICAgICAgICAvLyBJbiB0aGlzIGNhc2UsIGp1c3QgcGFzcyB0aGUgc3RyaW5nICJbb2JqZWN0 XSIgdG8gRmxhc2guCi0gICAgICAgICAgICByZXN1bHQudHlwZSA9IE5QVmFyaWFudFR5cGVfU3Ry aW5nOwotICAgICAgICAgICAgcmVzdWx0LnZhbHVlLnN0cmluZ1ZhbHVlID0gY3JlYXRlTlBTdHJp bmcoIltvYmplY3RdIik7Ci0gICAgICAgICAgICByZXR1cm5WYWx1ZSA9IHRydWU7Ci0gICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIHJlc3VsdC50eXBlID0gTlBW YXJpYW50VHlwZV9TdHJpbmc7Ci0gICAgICAgIHJlc3VsdC52YWx1ZS5zdHJpbmdWYWx1ZSA9IGNy ZWF0ZU5QU3RyaW5nKG1fcGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLT5wYXJhbWV0ZXJzLnRvcGxl dmVsRG9jdW1lbnRVUkwudXRmOCgpKTsgCi0gICAgICAgIHJldHVyblZhbHVlID0gdHJ1ZTsKLSAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOwotfQotCiB2b2lk IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6c2V0U3RhdHVzYmFyVGV4dChjb25zdCBTdHJpbmcmIHN0 YXR1c2JhclRleHQpCiB7CiAgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVz c2FnZXM6OlBsdWdpblByb3h5OjpTZXRTdGF0dXNiYXJUZXh0KHN0YXR1c2JhclRleHQpLCBtX3Bs dWdpbkluc3RhbmNlSUQpOwpAQCAtNTk4LDMzICs1NDMsNiBAQCB2b2lkIFBsdWdpbkNvbnRyb2xs ZXJQcm94eTo6Z2V0Rm9ybVZhbHVlKGJvb2wmIHJldHVyblZhbHVlLCBTdHJpbmcmIGZvcm1WYWx1 ZSkKICAgICByZXR1cm5WYWx1ZSA9IG1fcGx1Z2luLT5nZXRGb3JtVmFsdWUoZm9ybVZhbHVlKTsK IH0KIAotYm9vbCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnRyeVRvU2hvcnRDaXJjdWl0RXZhbHVh dGUoTlBPYmplY3QqIG5wT2JqZWN0LCBjb25zdCBTdHJpbmcmIHNjcmlwdFN0cmluZywgTlBWYXJp YW50KiByZXN1bHQpCi17Ci0gICAgLy8gT25seSB0cnkgdG8gc2hvcnQgY2lyY3VpdCBldmFsdWF0 ZSBmb3IgcGx1Zy1pbnMgdGhhdCBoYXZlIHRoZSBxdWlyayBzcGVjaWZpZWQuCi0jaWYgUExVR0lO X0FSQ0hJVEVDVFVSRShNQUMpCi0gICAgaWYgKCFQbHVnaW5Qcm9jZXNzOjpzaGFyZWQoKS5uZXRz Y2FwZVBsdWdpbk1vZHVsZSgpLT5wbHVnaW5RdWlya3MoKS5jb250YWlucyhQbHVnaW5RdWlya3M6 OkNhblNob3J0Q2lyY3VpdFNvbWVOUFJ1bnRpbWVDYWxsc0R1cmluZ0luaXRpYWxpemF0aW9uKSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotI2Vsc2UKLSAgICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYK LQotICAgIC8vIEFuZCBvbmx5IHdoZW4gd2UncmUgaW4gaW5pdGlhbGl6ZS4KLSAgICBpZiAoIWlu SW5pdGlhbGl6ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyBBbmQgb25seSB3 aGVuIHRoZSBOUE9iamVjdCBpcyB0aGUgd2luZG93IE5QT2JqZWN0LgotICAgIGlmIChucE9iamVj dCAhPSBtX3dpbmRvd05QT2JqZWN0KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyBO b3csIGNoZWNrIGZvciB0aGUgcmlnaHQgc3RyaW5ncy4KLSAgICBpZiAoc2NyaXB0U3RyaW5nICE9 ICJmdW5jdGlvbiBfX2ZsYXNoX2dldFdpbmRvd0xvY2F0aW9uKCkgeyByZXR1cm4gd2luZG93Lmxv Y2F0aW9uOyB9IgotICAgICAgICAmJiBzY3JpcHRTdHJpbmcgIT0gImZ1bmN0aW9uIF9fZmxhc2hf Z2V0VG9wTG9jYXRpb24oKSB7IHJldHVybiB0b3AubG9jYXRpb247IH0iKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBWT0lEX1RPX05QVkFSSUFOVCgqcmVzdWx0KTsKLSAgICByZXR1cm4g dHJ1ZTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBFTkFCTEUoUExV R0lOX1BST0NFU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1Bs dWdpbkNvbnRyb2xsZXJQcm94eS5oIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVn aW5Db250cm9sbGVyUHJveHkuaAppbmRleCBlODYwOTI1YzFlZmE2YTE0ZDAxM2M2NWI1OWE0YmJh YzQxNmVjOTM3Li5kZTFiNjZmNGUzYzU2NTQ1MWEyZDEyM2NjYWI1NmUzMjA5MDJmMGFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclBy b3h5LmgKQEAgLTg0LDcgKzg0LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIE5QT2JqZWN0KiB3 aW5kb3dTY3JpcHROUE9iamVjdCgpOwogICAgIHZpcnR1YWwgTlBPYmplY3QqIHBsdWdpbkVsZW1l bnROUE9iamVjdCgpOwogICAgIHZpcnR1YWwgYm9vbCBldmFsdWF0ZShOUE9iamVjdCosIGNvbnN0 IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBOUFZhcmlhbnQqIHJlc3VsdCwgYm9vbCBhbGxvd1BvcHVw cyk7Ci0gICAgdmlydHVhbCBib29sIHRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKE5QT2JqZWN0Kiwg TlBJZGVudGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50 MzJfdCBhcmd1bWVudENvdW50LCBib29sJiByZXR1cm5WYWx1ZSwgTlBWYXJpYW50JiByZXN1bHQp OwogICAgIHZpcnR1YWwgdm9pZCBzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFN0cmluZyYpOwogICAg IHZpcnR1YWwgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCk7CiAgICAgdmly dHVhbCB2b2lkIHBsdWdpblByb2Nlc3NDcmFzaGVkKCk7CkBAIC0xMzksOCArMTM4LDYgQEAgcHJp dmF0ZToKICAgICB2b2lkIHByaXZhdGVCcm93c2luZ1N0YXRlQ2hhbmdlZChib29sKTsKICAgICB2 b2lkIGdldEZvcm1WYWx1ZShib29sJiByZXR1cm5WYWx1ZSwgU3RyaW5nJiBmb3JtVmFsdWUpOwog Ci0gICAgYm9vbCB0cnlUb1Nob3J0Q2lyY3VpdEV2YWx1YXRlKE5QT2JqZWN0KiwgY29uc3QgU3Ry aW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0KTsKLQogICAgIGJvb2wgaW5Jbml0 aWFsaXplKCkgY29uc3QgeyByZXR1cm4gbV9wbHVnaW5DcmVhdGlvblBhcmFtZXRlcnM7IH0KIAog ICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVn aW5Nb2R1bGVNYWMubW0KaW5kZXggOTgwYzk4ODgxZTNjYzQyNWU3MGEwZDcyMTNhMzAzZDI4YjBj MThjZS4uNDFkOTM4OTc5YTRlODNjNTc5ZjQ4YmRiNzdlY2M2ODBjMmNjYzlkZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1 Z2luTW9kdWxlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNj YXBlL21hYy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQpAQCAtNDY5LDkgKzQ2OSw2IEBAIHZv aWQgTmV0c2NhcGVQbHVnaW5Nb2R1bGU6OmRldGVybWluZVF1aXJrcygpCiAgICAgICAgIC8vIEZs YXNoIHN1cHBvcnRzIHNuYXBzaG90dGluZy4KICAgICAgICAgbV9wbHVnaW5RdWlya3MuYWRkKFBs dWdpblF1aXJrczo6U3VwcG9ydHNTbmFwc2hvdHRpbmcpOwogCi0gICAgICAgIC8vIFdlIGNhbiBz aG9ydCBjaXJjdWl0IHNvbWUgTlBSdW50aW1lIGNhbGxzIGR1cmluZyBpbml0aWFsaXphdGlvbi4K LSAgICAgICAgbV9wbHVnaW5RdWlya3MuYWRkKFBsdWdpblF1aXJrczo6Q2FuU2hvcnRDaXJjdWl0 U29tZU5QUnVudGltZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRpb24pOwotCiAgICAgICAgIC8vIEZs YXNoIHJldHVybnMgYSByZXRhaW5lZCBDb3JlIEFuaW1hdGlvbiBsYXllci4KICAgICAgICAgbV9w bHVnaW5RdWlya3MuYWRkKFBsdWdpblF1aXJrczo6UmV0dXJuc1JldGFpbmVkQ29yZUFuaW1hdGlv bkxheWVyKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lu cy9QbHVnaW5RdWlya3MuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpblF1 aXJrcy5oCmluZGV4IDA0OTY2NGFlMDkyNWZiOGQ2OWRjNjMzODQwYjE1MjhmNTc2ZjRjNDQuLjFk MTFlNDg5YjZiNzM3MGU5OTYxMmM4MTI4NTg0N2VkOTA0Y2VlYzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpblF1aXJrcy5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpblF1aXJrcy5oCkBAIC00OCwxMiArNDgsNiBAQCBwdWJs aWM6CiAgICAgICAgIC8vIHRyYW5zcGFyZW50LgogICAgICAgICBNYWtlVHJhbnNwYXJlbnRJZkJh Y2tncm91bmRBdHRyaWJ1dGVFeGlzdHMsCiAKLSAgICAgICAgLy8gV2hldGhlciB3ZSBjYW4gc2hv cnQgY2lyY3VpdCBzb21lIE5QUnVudGltZSBjYWxscyBkdXJpbmcgcGx1Zy1pbiBpbml0aWFsaXph dGlvbi4KLSAgICAgICAgLy8gVGhlIEZsYXNoIHBsdWctaW4gdXNlcyBOUFJ1bnRpbWUgdG8gZmln dXJlIG91dCB0aGUgVVJMIG9mIHRoZSBmcmFtZSBpdCBpcyBpbiwgYXMgd2VsbAotICAgICAgICAv LyBhcyB0aGUgVVJMIG9mIHRoZSBtYWluIGZyYW1lLiBTaW5jZSB3ZSBrbm93IHRoZSBleGFjdCBO UFJ1bnRpbWUgY2FsbHMgdGhlIHBsdWctaW4gbWFrZXMsCi0gICAgICAgIC8vIHdlIGNhbiByZXR1 cm4gdGhlIHJpZ2h0IHZhbHVlcyB3aXRob3V0IGhhdmluZyB0byBkbyBzeW5jIElQQyBiYWNrIGlu dG8gdGhlIHdlYiBwcm9jZXNzLgotICAgICAgICBDYW5TaG9ydENpcmN1aXRTb21lTlBSdW50aW1l Q2FsbHNEdXJpbmdJbml0aWFsaXphdGlvbiwKLQogICAgICAgICAvLyBXaGV0aGVyIGNhbGxpbmcg TlBQX0dldFZhbHVlIHdpdGggTlBQVnBsdWdpbkNvcmVBbmltYXRpb25MYXllciByZXR1cm5zIGEg cmV0YWluZWQgQ29yZSBBbmltYXRpb24KICAgICAgICAgLy8gbGF5ZXIgb3Igbm90LiBBY2NvcmRp bmcgdG8gdGhlIE5QQVBJIHNwZWNpZmljYXRpb25zLCBwbHVnLWluIHNob3VsZG4ndCByZXR1cm4g YSByZXRhaW5lZCBsYXllciBidXQKICAgICAgICAgLy8gV2ViS2l0MSBleHBlY3RzIGEgcmV0YWlu ZWQgcGx1Zy1pbiBsYXllci4gV2UgdXNlIHRoaXMgZm9yIEZsYXNoIHRvIGF2b2lkIGxlYWtpbmcg T3BlbkdMIGxheWVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCmluZGV4 IGJkYzZlOWRlOWUxMjU0NGIwYTA0MjNkMDRkOWUyYjY0NGQ4MzljZDEuLjY0YzYyNGY2YjU5MjJj MWIzYzZjYzg1MDFkZGQwY2QzNzFjNTE4MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3Nl ckZ1bmNzLmNwcApAQCAtNzA2LDEyICs3MDYsNiBAQCBzdGF0aWMgdm9pZCBOUE5fUmVsZWFzZU9i amVjdChOUE9iamVjdCAqbnBPYmplY3QpCiAKIHN0YXRpYyBib29sIE5QTl9JbnZva2UoTlBQIG5w cCwgTlBPYmplY3QgKm5wT2JqZWN0LCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBW YXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCogcmVz dWx0KQogewotICAgIGlmIChSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IHBsdWdpbiA9IE5ldHNjYXBl UGx1Z2luOjpmcm9tTlBQKG5wcCkpIHsKLSAgICAgICAgYm9vbCByZXR1cm5WYWx1ZTsKLSAgICAg ICAgaWYgKHBsdWdpbi0+dHJ5VG9TaG9ydENpcmN1aXRJbnZva2UobnBPYmplY3QsIG1ldGhvZE5h bWUsIGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmV0dXJuVmFsdWUsICpyZXN1bHQpKQotICAg ICAgICAgICAgcmV0dXJuIHJldHVyblZhbHVlOwotICAgIH0KLQogICAgIGlmIChucE9iamVjdC0+ X2NsYXNzLT5pbnZva2UpCiAgICAgICAgIHJldHVybiBucE9iamVjdC0+X2NsYXNzLT5pbnZva2Uo bnBPYmplY3QsIG1ldGhvZE5hbWUsIGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmVzdWx0KTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggMWYwOWRjNDA4MzljY2MyNGMzMDM1NGY0 OGRjYzY4ODUwNmI1MjE1MC4uNjIxMDE5NzIzOTg5MmM1MjhhMDlmZjA3YjViZjJhOWQ1MmFmYzlj NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCkBAIC0yNTcsMTEgKzI1Nyw2IEBAIE5QT2Jq ZWN0KiBOZXRzY2FwZVBsdWdpbjo6cGx1Z2luRWxlbWVudE5QT2JqZWN0KCkKICAgICByZXR1cm4g Y29udHJvbGxlcigpLT5wbHVnaW5FbGVtZW50TlBPYmplY3QoKTsKIH0KIAotYm9vbCBOZXRzY2Fw ZVBsdWdpbjo6dHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBPYmplY3QqIG5wT2JqZWN0LCBOUElk ZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90 IGFyZ3VtZW50Q291bnQsIGJvb2wmIHJldHVyblZhbHVlLCBOUFZhcmlhbnQmIHJlc3VsdCkKLXsK LSAgICByZXR1cm4gY29udHJvbGxlcigpLT50cnlUb1Nob3J0Q2lyY3VpdEludm9rZShucE9iamVj dCwgbWV0aG9kTmFtZSwgYXJndW1lbnRzLCBhcmd1bWVudENvdW50LCByZXR1cm5WYWx1ZSwgcmVz dWx0KTsKLX0KLQogdm9pZCBOZXRzY2FwZVBsdWdpbjo6Y2FuY2VsU3RyZWFtTG9hZChOZXRzY2Fw ZVBsdWdpblN0cmVhbSogcGx1Z2luU3RyZWFtKQogewogICAgIGlmIChwbHVnaW5TdHJlYW0gPT0g bV9tYW51YWxTdHJlYW0pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKaW5kZXggYWRhZDJkMDE1Yjcw ZjYyYzMxNjkzOTYxNjZhNmEzYWU0Yzg0MDMxNC4uMTI0MmQzMTliZjY0MzRmNjFiNGVhYzc4NjNm YTJhMTY1MTBlZjdjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKQEAgLTEwMSw4ICsxMDEsNiBA QCBwdWJsaWM6CiAgICAgTlBPYmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0KCk7CiAgICAgTlBP YmplY3QqIHBsdWdpbkVsZW1lbnROUE9iamVjdCgpOwogCi0gICAgYm9vbCB0cnlUb1Nob3J0Q2ly Y3VpdEludm9rZShOUE9iamVjdCosIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZh cmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgYm9vbCYgcmV0dXJuVmFs dWUsIE5QVmFyaWFudCYgcmVzdWx0KTsKLQogICAgIHZvaWQgY2FuY2VsU3RyZWFtTG9hZChOZXRz Y2FwZVBsdWdpblN0cmVhbSopOwogICAgIHZvaWQgcmVtb3ZlUGx1Z2luU3RyZWFtKE5ldHNjYXBl UGx1Z2luU3RyZWFtKik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW4uY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbi5jcHAKaW5kZXggODdjOTk0MGE1YTg5YzA5OTYyZDQyYTZlZDNkYjQ3OThhMjA2ODhkZC4u NGY3OWIxYWE2YzMwYTE5ZDNkZmMxMTI0ZDI5ZTNiY2NjZTc0NTNiOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5jcHAKQEAgLTM5LDggKzM5LDYgQEAgdm9p ZCBQbHVnaW46OlBhcmFtZXRlcnM6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVu Y29kZXIpIGNvbnN0CiAgICAgZW5jb2Rlci0+ZW5jb2RlKHZhbHVlcyk7CiAgICAgZW5jb2Rlci0+ ZW5jb2RlKG1pbWVUeXBlKTsKICAgICBlbmNvZGVyLT5lbmNvZGUobG9hZE1hbnVhbGx5KTsKLSAg ICBlbmNvZGVyLT5lbmNvZGUoZG9jdW1lbnRVUkwpOwotICAgIGVuY29kZXItPmVuY29kZSh0b3Bs ZXZlbERvY3VtZW50VVJMKTsKIH0KIAogYm9vbCBQbHVnaW46OlBhcmFtZXRlcnM6OmRlY29kZShD b3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMp CkBAIC01OSwxMCArNTcsNiBAQCBib29sIFBsdWdpbjo6UGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJ UEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgUGFyYW1ldGVycyYgcAogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5sb2FkTWFudWFs bHkpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFy YW1ldGVycy5kb2N1bWVudFVSTCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRl Y29kZXItPmRlY29kZShwYXJhbWV0ZXJzLnRvcGxldmVsRG9jdW1lbnRVUkwpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBpZiAocGFyYW1ldGVycy5uYW1lcy5zaXplKCkgIT0gcGFyYW1l dGVycy52YWx1ZXMuc2l6ZSgpKSB7CiAgICAgICAgIGRlY29kZXItPm1hcmtJbnZhbGlkKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKaW5kZXggNGM2NTZhM2E3 MDRmYTdlYzFiNWQ0OTQzM2NlM2VmOWQ4OWJhNWY5MC4uYTVhZjQ4ZjRlMmVjMTU4NDlhOWIwMjI3 ZWY1NmUzMGNjMjNhMDg3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW4uaApAQCAtNjYsMTMgKzY2LDYgQEAgcHVibGljOgogICAgICAgICBTdHJpbmcgbWltZVR5 cGU7CiAgICAgICAgIGJvb2wgbG9hZE1hbnVhbGx5OwogCi0gICAgICAgIC8vIFRoZSBVUkwgb2Yg dGhlIGRvY3VtZW50IHRoYXQgdGhlIHBsdWctaW4gaXMgaW4uCi0gICAgICAgIFN0cmluZyBkb2N1 bWVudFVSTDsKLQotICAgICAgICAvLyBUaGUgVVJMIG9mIHRoZSBkb2N1bWVudCBpbiB0aGUgbWFp biBmcmFtZS4gV2lsbCBiZSBudWxsIGlmIHRoZSBkb2N1bWVudCB0aGUgcGx1Zy1pbgotICAgICAg ICAvLyBkb2Vzbid0IGhhdmUgYWNjZXNzIHRvIHRoZSBtYWluIGZyYW1lIGRvY3VtZW50LgotICAg ICAgICBTdHJpbmcgdG9wbGV2ZWxEb2N1bWVudFVSTDsKLQogICAgICAgICB2b2lkIGVuY29kZShD b3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKSBjb25zdDsKICAgICAgICAgc3RhdGljIGJvb2wgZGVj b2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFBhcmFtZXRlcnMmKTsKICAgICB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xs ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Db250cm9sbGVy LmgKaW5kZXggZGE0OGViNmUxYTViNTA5MWRjM2Y4MDRhNTk1Y2NiOWE4YjUxNDM4ZC4uNjAxMmVj Yzk0MDc0MTQyNmY0MWJlZmYxZDZiZTMwYTc3ODA0NTk1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oCkBAIC04NSw5ICs4 NSw2IEBAIHB1YmxpYzoKICAgICAvLyBFdmFsdWF0ZXMgdGhlIGdpdmVuIHNjcmlwdCBzdHJpbmcg aW4gdGhlIGNvbnRleHQgb2YgdGhlIGdpdmVuIE5QT2JqZWN0LgogICAgIHZpcnR1YWwgYm9vbCBl dmFsdWF0ZShOUE9iamVjdCosIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyaW5nLCBOUFZhcmlhbnQq IHJlc3VsdCwgYm9vbCBhbGxvd1BvcHVwcykgPSAwOwogCi0gICAgLy8gVHJpZXMgdG8gc2hvcnQg Y2lyY3VpdCB0aGUgTlBOX0ludm9rZSBjYWxsIHdpdGggdGhlIGdpdmVuIHBhcmFtZXRlcnMuIFJl dHVybnMgdHJ1ZSBvbiBzdWNjZXNzLgotICAgIHZpcnR1YWwgYm9vbCB0cnlUb1Nob3J0Q2lyY3Vp dEludm9rZShOUE9iamVjdCosIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZhcmlh bnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgYm9vbCYgcmV0dXJuVmFsdWUs IE5QVmFyaWFudCYgcmVzdWx0KSA9IDA7Ci0KICAgICAvLyBTZXQgdGhlIHN0YXR1c2JhciB0ZXh0 LgogICAgIHZpcnR1YWwgdm9pZCBzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFN0cmluZyYpID0gMDsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp ZXcuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3Bw CmluZGV4IDg5MzVkY2Y3ODVmNmJmYmUyNjlmYjFmNTY4ZWM4NjMyNGNlM2Q0YTAuLjNhMjU4ZjFl MGNjZTBlMzdhNjQzMWQ5YmM2Zjk1MTBkYTBhY2IzMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTEwNjMsMTIgKzEwNjMsNiBA QCBib29sIFBsdWdpblZpZXc6OmV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3QgU3Ry aW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaQogICAgIHJldHVybiBtX25wUnVudGltZU9iamVjdE1h cC5ldmFsdWF0ZShucE9iamVjdCwgc2NyaXB0U3RyaW5nLCByZXN1bHQpOwogfQogCi1ib29sIFBs dWdpblZpZXc6OnRyeVRvU2hvcnRDaXJjdWl0SW52b2tlKE5QT2JqZWN0KiwgTlBJZGVudGlmaWVy IG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVu dENvdW50LCBib29sJiByZXR1cm5WYWx1ZSwgTlBWYXJpYW50JiByZXN1bHQpCi17Ci0gICAgLy8g TmV2ZXIgdHJ5IHRvIHNob3J0LWNpcmN1aXQgaW52b2tlIGluIHRoZSB3ZWIgcHJvY2Vzcy4KLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQgUGx1Z2luVmlldzo6c2V0U3RhdHVzYmFyVGV4dChj b25zdCBTdHJpbmcmIHN0YXR1c2JhclRleHQpCiB7CiAgICAgaWYgKCFmcmFtZSgpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggY2Q2MzYz YTU4YmJlYWQzMTgxNTI1NDk1NTU3YzhkZGViOTMxOTZhZi4uZDU5YTNkMzZlMWYyMjVkNGM5MjRi OTBlOGZlOGI0Yzk3OWZkZWZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BsdWdpblZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5oCkBAIC0xNDEsNyArMTQxLDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0 dWFsIE5QT2JqZWN0KiB3aW5kb3dTY3JpcHROUE9iamVjdCgpOwogICAgIHZpcnR1YWwgTlBPYmpl Y3QqIHBsdWdpbkVsZW1lbnROUE9iamVjdCgpOwogICAgIHZpcnR1YWwgYm9vbCBldmFsdWF0ZShO UE9iamVjdCosIGNvbnN0IFN0cmluZyZzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0LCBi b29sIGFsbG93UG9wdXBzKTsKLSAgICB2aXJ0dWFsIGJvb2wgdHJ5VG9TaG9ydENpcmN1aXRJbnZv a2UoTlBPYmplY3QqLCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBh cmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIGJvb2wmIHJldHVyblZhbHVlLCBOUFZh cmlhbnQmIHJlc3VsdCk7CiAgICAgdmlydHVhbCB2b2lkIHNldFN0YXR1c2JhclRleHQoY29uc3Qg U3RyaW5nJik7CiAgICAgdmlydHVhbCBib29sIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgcGx1Z2luUHJvY2Vzc0NyYXNoZWQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggOTk3MzgwODZhY2NmYzE5ZDExNjRlMzFhOWI5 YmJmZTgxOTQ2YmNmOS4uZjBhMjQzN2UyNTAxNWU2MTFkOGJkMjdlNDRlMWFmNmFjZTliOWI0ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTEyNjcsMTUgKzEyNjcsNiBA QCBQYXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZVBsdWdpbihj b25zdCBJbnRTaXplJiwgSFRNTFBsdWdJbgogICAgIHBhcmFtZXRlcnMudmFsdWVzID0gcGFyYW1W YWx1ZXM7CiAgICAgcGFyYW1ldGVycy5taW1lVHlwZSA9IG1pbWVUeXBlOwogICAgIHBhcmFtZXRl cnMubG9hZE1hbnVhbGx5ID0gbG9hZE1hbnVhbGx5OwotICAgIHBhcmFtZXRlcnMuZG9jdW1lbnRV UkwgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ZG9jdW1lbnQoKS0+dXJsKCkuc3RyaW5nKCk7Ci0K LSAgICBGcmFtZSogbWFpbkZyYW1lID0gd2ViUGFnZS0+bWFpbldlYkZyYW1lKCktPmNvcmVGcmFt ZSgpOwotICAgIGlmIChtX2ZyYW1lLT5jb3JlRnJhbWUoKSA9PSBtYWluRnJhbWUpCi0gICAgICAg IHBhcmFtZXRlcnMudG9wbGV2ZWxEb2N1bWVudFVSTCA9IHBhcmFtZXRlcnMuZG9jdW1lbnRVUkw7 Ci0gICAgZWxzZSBpZiAobV9mcmFtZS0+Y29yZUZyYW1lKCktPmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCktPmNhbkFjY2VzcyhtYWluRnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCkpKSB7Ci0gICAgICAgIC8vIFdlIG9ubHkgd2FudCB0byBzZXQgdGhlIHRvcGxldmVsIGRvY3Vt ZW50IFVSTCBpZiB0aGUgcGx1Zy1pbiBoYXMgYWNjZXNzIHRvIGl0LgotICAgICAgICBwYXJhbWV0 ZXJzLnRvcGxldmVsRG9jdW1lbnRVUkwgPSBtYWluRnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnN0 cmluZygpOwotICAgIH0KIAogI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoWDExKQogICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCByZWFsbHkgYmUgWDExLXNwZWNpZmljIHBsdWctaW4gcXVpcmtzLgo=