58271 2011-04-11 14:33:22 -0700 Remove the WebContext member variable from WebPageProxy 2011-04-12 05:00:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca aroben oldest_to_newest 383532 0 andersca 2011-04-11 14:33:22 -0700 Remove the WebContext member variable from WebPageProxy 383534 1 89091 andersca 2011-04-11 14:34:01 -0700 Created attachment 89091 Patch 383566 2 89091 aroben 2011-04-11 15:01:27 -0700 Comment on attachment 89091 Patch Do we need to worry about m_process being null? 383568 3 andersca 2011-04-11 15:02:21 -0700 (In reply to comment #2) > (From update of attachment 89091 [details]) > Do we need to worry about m_process being null? No, it will never be null anymore! 383572 4 andersca 2011-04-11 15:04:52 -0700 Committed r83509: <http://trac.webkit.org/changeset/83509> 383939 5 aroben 2011-04-12 05:00:08 -0700 *** Bug 57029 has been marked as a duplicate of this bug. *** 89091 2011-04-11 14:34:01 -0700 2011-04-11 15:01:27 -0700 Patch bug-58271-20110411143400.patch text/plain 19631 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNTAwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTEtMDQtMTEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIFdlYkNvbnRleHQgbWVtYmVyIHZhcmlh YmxlIGZyb20gV2ViUGFnZVByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01ODI3MQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5j cHA6CisgICAgICAgIChXS1BhZ2VHZXRDb250ZXh0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmNhblNob3dNSU1FVHlwZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVj ZWl2ZWRQb2xpY3lEZWNpc2lvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRG b3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZv ckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hEb2N1bWVu dExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmluaXNo TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsTG9h ZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTYW1lRG9jdW1l bnROYXZpZ2F0aW9uRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZFJlY2VpdmVUaXRsZUZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRGaXJzdExheW91dEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6ZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5KToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZy YW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xp Y3lGb3JOZXdXaW5kb3dBY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp1 bmFibGVUb0ltcGxlbWVudFBvbGljeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 d2lsbFN1Ym1pdEZvcm0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Om1vdXNlRGlk TW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93Q29u dGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRleHRNZW51SXRl bVNlbGVjdGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJJ bnNwZWN0b3JQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6 OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6CisKIDIwMTEtMDQtMTEgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vp bmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJl dmlzaW9uIDgzNDk5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCwxNSArMTAwLDE0IEBAIFdLUGFnZURlYnVnUGFpbnRG bGFncyBXZWJQYWdlUHJveHk6OnNfZGUKIHN0YXRpYyBXVEY6OlJlZkNvdW50ZWRMZWFrQ291bnRl ciB3ZWJQYWdlUHJveHlDb3VudGVyKCJXZWJQYWdlUHJveHkiKTsKICNlbmRpZgogCi1QYXNzUmVm UHRyPFdlYlBhZ2VQcm94eT4gV2ViUGFnZVByb3h5OjpjcmVhdGUoUGFnZUNsaWVudCogcGFnZUNs aWVudCwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3MsIFdlYkNvbnRleHQqIGNv bnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCB1aW50NjRfdCBwYWdlSUQpCitQYXNzUmVm UHRyPFdlYlBhZ2VQcm94eT4gV2ViUGFnZVByb3h5OjpjcmVhdGUoUGFnZUNsaWVudCogcGFnZUNs aWVudCwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3MsIFdlYlBhZ2VHcm91cCog cGFnZUdyb3VwLCB1aW50NjRfdCBwYWdlSUQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBX ZWJQYWdlUHJveHkocGFnZUNsaWVudCwgcHJvY2VzcywgY29udGV4dCwgcGFnZUdyb3VwLCBwYWdl SUQpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlBhZ2VQcm94eShwYWdlQ2xpZW50LCBw cm9jZXNzLCBwYWdlR3JvdXAsIHBhZ2VJRCkpOwogfQogCi1XZWJQYWdlUHJveHk6OldlYlBhZ2VQ cm94eShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4g cHJvY2VzcywgV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIHVp bnQ2NF90IHBhZ2VJRCkKK1dlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQqIHBh Z2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzLCBXZWJQYWdlR3Jv dXAqIHBhZ2VHcm91cCwgdWludDY0X3QgcGFnZUlEKQogICAgIDogbV9wYWdlQ2xpZW50KHBhZ2VD bGllbnQpCiAgICAgLCBtX3Byb2Nlc3MocHJvY2VzcykKLSAgICAsIG1fY29udGV4dChjb250ZXh0 KQogICAgICwgbV9wYWdlR3JvdXAocGFnZUdyb3VwKQogICAgICwgbV9tYWluRnJhbWUoMCkKICAg ICAsIG1fdXNlckFnZW50KHN0YW5kYXJkVXNlckFnZW50KCkpCkBAIC0xODAsNyArMTc5LDcgQEAg V2ViUGFnZVByb3h5Ojp+V2ViUGFnZVByb3h5KCkKIAogV2ViUHJvY2Vzc1Byb3h5KiBXZWJQYWdl UHJveHk6OnByb2Nlc3MoKSBjb25zdAogewotICAgIHJldHVybiBtX2NvbnRleHQtPnByb2Nlc3Mo KTsKKyAgICByZXR1cm4gbV9wcm9jZXNzLmdldCgpOwogfQogCiBib29sIFdlYlBhZ2VQcm94eTo6 aXNWYWxpZCgpCkBAIC0yNDcsNyArMjQ2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzKAogCiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIG1fcHJvY2VzcyA9 IGNvbnRleHQoKS0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKKyAgICBtX3Byb2Nlc3Mg PSBtX3Byb2Nlc3MtPmNvbnRleHQoKS0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAg ICBwcm9jZXNzKCktPmFkZEV4aXN0aW5nV2ViUGFnZSh0aGlzLCBtX3BhZ2VJRCk7CiAKICAgICBp bml0aWFsaXplV2ViUGFnZSgpOwpAQCAtNTMwLDcgKzUyOSw3IEBAIGJvb2wgV2ViUGFnZVByb3h5 OjpjYW5TaG93TUlNRVR5cGUoY29uc3QKICAgICAgICAgcmV0dXJuICFNSU1FVHlwZVJlZ2lzdHJ5 Ojppc1Vuc3VwcG9ydGVkVGV4dE1JTUVUeXBlKG1pbWVUeXBlKTsKIAogICAgIFN0cmluZyBuZXdN aW1lVHlwZSA9IG1pbWVUeXBlOwotICAgIFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luIHBsdWdpbiA9 IGNvbnRleHQoKS0+cGx1Z2luSW5mb1N0b3JlKCktPmZpbmRQbHVnaW4obmV3TWltZVR5cGUsIEtV UkwoKSk7CisgICAgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gcGx1Z2luID0gbV9wcm9jZXNzLT5j b250ZXh0KCktPnBsdWdpbkluZm9TdG9yZSgpLT5maW5kUGx1Z2luKG5ld01pbWVUeXBlLCBLVVJM KCkpOwogICAgIGlmICghcGx1Z2luLnBhdGguaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiB0cnVl OwogCkBAIC05MTQsNyArOTEzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5 RGVjaXNpbwogICAgIHVpbnQ2NF90IGRvd25sb2FkSUQgPSAwOwogICAgIGlmIChhY3Rpb24gPT0g UG9saWN5RG93bmxvYWQpIHsKICAgICAgICAgLy8gQ3JlYXRlIGEgZG93bmxvYWQgcHJveHkuCi0g ICAgICAgIGRvd25sb2FkSUQgPSBjb250ZXh0KCktPmNyZWF0ZURvd25sb2FkUHJveHkoKTsKKyAg ICAgICAgZG93bmxvYWRJRCA9IG1fcHJvY2Vzcy0+Y29udGV4dCgpLT5jcmVhdGVEb3dubG9hZFBy b3h5KCk7CiAgICAgfQogCiAgICAgLy8gSWYgd2UgcmVjZWl2ZWQgYSBwb2xpY3kgZGVjaXNpb24g d2hpbGUgaW4gZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUgdGhlIGRlY2lzaW9uIHdpbGwgCkBAIC0x NDY1LDcgKzE0NjQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv CiAgICAgY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVSTCgpOwogCiAgICAgUmVmUHRyPEFQSU9iamVj dD4gdXNlckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVj b2Rlcih1c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNv ZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAg aWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsK IApAQCAtMTQ4MSw3ICsxNDgwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlz aW9uYWxMbwogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgdXJs LCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBSZWZQdHI8QVBJ T2JqZWN0PiB1c2VyRGF0YTsKLSAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3Nh Z2VEZWNvZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOworICAgIFdlYkNvbnRleHRVc2VyTWVzc2Fn ZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy0+Y29udGV4dCgpKTsK ICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC0xNDk2LDcgKzE0OTUsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2 ZVNlcnZlclJlZGlyCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yLCBDb3Jl SVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBSZWZQdHI8QVBJT2JqZWN0 PiB1c2VyRGF0YTsKLSAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNv ZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOworICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29k ZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy0+Y29udGV4dCgpKTsKICAgICBp ZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAgICAgICAgcmV0dXJuOwog CkBAIC0xNTI0LDcgKzE1MjMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xlYXJMb2FkRGVwZW5k ZW50Q2FsCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90 IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21SZXBy ZXNlbnRhdGlvbiwgY29uc3QgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5m bywgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQ SU9iamVjdD4gdXNlckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNz YWdlRGVjb2Rlcih1c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3Nh Z2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7 CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJl dHVybjsKIApAQCAtMTU1MCw3ICsxNTQ5LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvbW1p dExvYWRGb3JGcmFtZQogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3VtZW50TG9hZEZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1l bnRzKQogewogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwotICAgIFdlYkNvbnRleHRV c2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIGNvbnRleHQoKSk7Cisg ICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwg bV9wcm9jZXNzLT5jb250ZXh0KCkpOwogICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUobWVzc2Fn ZURlY29kZXIpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE1NjMsNyArMTU2Miw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWQKIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRGaW5pc2hMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7Ci0g ICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwg Y29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNv ZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFhcmd1bWVudHMt PmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTU3OCw3ICsx NTc3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZQogdm9pZCBX ZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg UmVzb3VyY2VFcnJvciYgZXJyb3IsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRz KQogewogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwotICAgIFdlYkNvbnRleHRVc2Vy TWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIGNvbnRleHQoKSk7CisgICAg V2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgbV9w cm9jZXNzLT5jb250ZXh0KCkpOwogICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUobWVzc2FnZURl Y29kZXIpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE1OTUsNyArMTU5NCw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKHUKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRT YW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDMyX3Qg b3BhcXVlU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUsIGNvbnN0IFN0cmluZyYgdXJsLCBDb3Jl SVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBSZWZQdHI8QVBJT2JqZWN0 PiB1c2VyRGF0YTsKLSAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNv ZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOworICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29k ZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy0+Y29udGV4dCgpKTsKICAgICBp ZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAgICAgICAgcmV0dXJuOwog CkBAIC0xNjEwLDcgKzE2MDksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU2FtZURvY3VtZW50 TmF2aWdhCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB0aXRsZSwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVy KiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7Ci0gICAgV2Vi Q29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgY29udGV4 dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVz ZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29k ZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTYyNSw3ICsxNjI0LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVUaXRsZUZvckZyYQogdm9pZCBXZWJQYWdl UHJveHk6OmRpZEZpcnN0TGF5b3V0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQQzo6 QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNl ckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1 c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1l c3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFh cmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAt MTYzOCw3ICsxNjM3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpcnN0TGF5b3V0Rm9yRnJh bQogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZy YW1lKHVpbnQ2NF90IGZyYW1lSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRz KQogewogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwotICAgIFdlYkNvbnRleHRVc2Vy TWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIGNvbnRleHQoKSk7CisgICAg V2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgbV9w cm9jZXNzLT5jb250ZXh0KCkpOwogICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUobWVzc2FnZURl Y29kZXIpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE2NTEsNyArMTY1MCw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW0KIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRS ZW1vdmVGcmFtZUZyb21IaWVyYXJjaHkodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQQzo6QXJndW1l bnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7 Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0 YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VE ZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFhcmd1bWVu dHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTY2Niw3 ICsxNjY1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlbW92ZUZyYW1lRnJvbUhpZQogdm9p ZCBXZWJQYWdlUHJveHk6OmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZSh1aW50NjRf dCBmcmFtZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBS ZWZQdHI8QVBJT2JqZWN0PiB1c2VyRGF0YTsKLSAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNv ZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOworICAgIFdlYkNvbnRleHRV c2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy0+Y29u dGV4dCgpKTsKICAgICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAg ICAgICAgcmV0dXJuOwogCkBAIC0xNjc5LDcgKzE2NzgsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkRGlzcGxheUluc2VjdXJlQ29uCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUnVuSW5zZWN1cmVD b250ZW50Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVy KiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7Ci0gICAgV2Vi Q29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgY29udGV4 dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVz ZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29k ZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTcwMyw3ICsxNzAyLDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmZyYW1lRGlkQmVjb21lRnJhbWVTZQogdm9pZCBXZWJQYWdl UHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odWludDY0X3QgZnJhbWVJRCwg dWludDMyX3Qgb3BhcXVlTmF2aWdhdGlvblR5cGUsIHVpbnQzMl90IG9wYXF1ZU1vZGlmaWVycywg aW50MzJfdCBvcGFxdWVNb3VzZUJ1dHRvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCB1aW50NjRfdCBsaXN0ZW5lcklELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50 cywgYm9vbCYgcmVjZWl2ZWRQb2xpY3lBY3Rpb24sIHVpbnQ2NF90JiBwb2xpY3lBY3Rpb24sIHVp bnQ2NF90JiBkb3dubG9hZElEKQogewogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwot ICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEs IGNvbnRleHQoKSk7CisgICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVj b2Rlcih1c2VyRGF0YSwgbV9wcm9jZXNzLT5jb250ZXh0KCkpOwogICAgIGlmICghYXJndW1lbnRz LT5kZWNvZGUobWVzc2FnZURlY29kZXIpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE3NDAsNyAr MTczOSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2EKIHZvaWQg V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJh bWVJRCwgdWludDMyX3Qgb3BhcXVlTmF2aWdhdGlvblR5cGUsIHVpbnQzMl90IG9wYXF1ZU1vZGlm aWVycywgaW50MzJfdCBvcGFxdWVNb3VzZUJ1dHRvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgQ29y ZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVj dD4gdXNlckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVj b2Rlcih1c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNv ZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAg aWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsK IApAQCAtMTc1OSw3ICsxNzU4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5ld1dpbgogdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKHVpbnQ2 NF90IGZyYW1lSUQsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIHVpbnQ2NF90IGxpc3RlbmVySUQsIENvcmVJUEM6OkFyZ3Vt ZW50RGVjb2RlciogYXJndW1lbnRzLCBib29sJiByZWNlaXZlZFBvbGljeUFjdGlvbiwgdWludDY0 X3QmIHBvbGljeUFjdGlvbiwgdWludDY0X3QmIGRvd25sb2FkSUQpCiB7CiAgICAgUmVmUHRyPEFQ SU9iamVjdD4gdXNlckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNz YWdlRGVjb2Rlcih1c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3Nh Z2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7 CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJl dHVybjsKIApAQCAtMTc4OSw3ICsxNzg4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBv bGljeUZvclJlc3Bvbgogdm9pZCBXZWJQYWdlUHJveHk6OnVuYWJsZVRvSW1wbGVtZW50UG9saWN5 KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yLCBD b3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBSZWZQdHI8QVBJT2Jq ZWN0PiB1c2VyRGF0YTsKLSAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VE ZWNvZGVyKHVzZXJEYXRhLCBjb250ZXh0KCkpOworICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURl Y29kZXIgbWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy0+Y29udGV4dCgpKTsKICAg ICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKG1lc3NhZ2VEZWNvZGVyKSkKICAgICAgICAgcmV0dXJu OwogICAgIApAQCAtMTgwNCw3ICsxODAzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVuYWJsZVRv SW1wbGVtZW50UG9saQogdm9pZCBXZWJQYWdlUHJveHk6OndpbGxTdWJtaXRGb3JtKHVpbnQ2NF90 IGZyYW1lSUQsIHVpbnQ2NF90IHNvdXJjZUZyYW1lSUQsIGNvbnN0IFN0cmluZ1BhaXJWZWN0b3Im IHRleHRGaWVsZFZhbHVlcywgdWludDY0X3QgbGlzdGVuZXJJRCwgQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7Ci0g ICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwg Y29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNv ZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQoKSk7CiAgICAgaWYgKCFhcmd1bWVudHMt PmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTkzMiw3ICsx OTMxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFN0YXR1c1RleHQoY29uc3QgUwogdm9pZCBX ZWJQYWdlUHJveHk6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KHVpbnQzMl90IG9wYXF1ZU1vZGlm aWVycywgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRy PEFQSU9iamVjdD4gdXNlckRhdGE7Ci0gICAgV2ViQ29udGV4dFVzZXJNZXNzYWdlRGVjb2RlciBt ZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgY29udGV4dCgpKTsKKyAgICBXZWJDb250ZXh0VXNlck1l c3NhZ2VEZWNvZGVyIG1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhLCBtX3Byb2Nlc3MtPmNvbnRleHQo KSk7CiAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShtZXNzYWdlRGVjb2RlcikpCiAgICAgICAg IHJldHVybjsKIApAQCAtMjI0MSw3ICsyMjQwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhpZGVQ b3B1cE1lbnUoKQogdm9pZCBXZWJQYWdlUHJveHk6OnNob3dDb250ZXh0TWVudShjb25zdCBJbnRQ b2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBDb250ZXh0TWVudVN0YXRlJiBjb250ZXh0TWVudVN0 YXRlLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIHByb3Bvc2VkSXRlbXMs IENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIFJlZlB0cjxBUElP YmplY3Q+IHVzZXJEYXRhOwotICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29kZXIgbWVzc2Fn ZURlY29kZXIodXNlckRhdGEsIGNvbnRleHQoKSk7CisgICAgV2ViQ29udGV4dFVzZXJNZXNzYWdl RGVjb2RlciBtZXNzYWdlRGVjb2Rlcih1c2VyRGF0YSwgbV9wcm9jZXNzLT5jb250ZXh0KCkpOwog ICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUobWVzc2FnZURlY29kZXIpKQogICAgICAgICByZXR1 cm47CiAKQEAgLTIzMDksMTEgKzIzMDgsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNvbnRleHRN ZW51SXRlbVNlbGVjdAogICAgIH0KICNlbmRpZgogICAgIGlmIChpdGVtLmFjdGlvbigpID09IENv bnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkSW1hZ2VUb0Rpc2spIHsKLSAgICAgICAgbV9jb250ZXh0 LT5kb3dubG9hZCh0aGlzLCBLVVJMKEtVUkwoKSwgbV9hY3RpdmVDb250ZXh0TWVudVN0YXRlLmFi c29sdXRlSW1hZ2VVUkxTdHJpbmcpKTsKKyAgICAgICAgbV9wcm9jZXNzLT5jb250ZXh0KCktPmRv d25sb2FkKHRoaXMsIEtVUkwoS1VSTCgpLCBtX2FjdGl2ZUNvbnRleHRNZW51U3RhdGUuYWJzb2x1 dGVJbWFnZVVSTFN0cmluZykpOwogICAgICAgICByZXR1cm47ICAgIAogICAgIH0KICAgICBpZiAo aXRlbS5hY3Rpb24oKSA9PSBDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2spIHsK LSAgICAgICAgbV9jb250ZXh0LT5kb3dubG9hZCh0aGlzLCBLVVJMKEtVUkwoKSwgbV9hY3RpdmVD b250ZXh0TWVudVN0YXRlLmFic29sdXRlTGlua1VSTFN0cmluZykpOworICAgICAgICBtX3Byb2Nl c3MtPmNvbnRleHQoKS0+ZG93bmxvYWQodGhpcywgS1VSTChLVVJMKCksIG1fYWN0aXZlQ29udGV4 dE1lbnVTdGF0ZS5hYnNvbHV0ZUxpbmtVUkxTdHJpbmcpKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KICAgICBpZiAoaXRlbS5hY3Rpb24oKSA9PSBDb250ZXh0TWVudUl0ZW1UYWdDaGVja1NwZWxs aW5nV2hpbGVUeXBpbmcpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgJKHJldmlzaW9uIDgzNDk5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNyArMTU4LDcgQEAgY2xhc3MgV2ViUGFn ZVByb3h5IDogcHVibGljIEFQSU9iamVjdCwgcAogcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBU eXBlIEFQSVR5cGUgPSBUeXBlUGFnZTsKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlBhZ2VQ cm94eT4gY3JlYXRlKFBhZ2VDbGllbnQqLCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4sIFdl YkNvbnRleHQqLCBXZWJQYWdlR3JvdXAqLCB1aW50NjRfdCBwYWdlSUQpOworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlKFBhZ2VDbGllbnQqLCBQYXNzUmVmUHRyPFdl YlByb2Nlc3NQcm94eT4sIFdlYlBhZ2VHcm91cCosIHVpbnQ2NF90IHBhZ2VJRCk7CiAgICAgdmly dHVhbCB+V2ViUGFnZVByb3h5KCk7CiAKICAgICB1aW50NjRfdCBwYWdlSUQoKSBjb25zdCB7IHJl dHVybiBtX3BhZ2VJRDsgfQpAQCAtNDIxLDcgKzQyMSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJl Z2lzdGVyRWRpdENvbW1hbmQoUGFzc1JlZlB0cjxXZWJFZGl0Q29tbWFuZFByb3h5PiwgVW5kb09y UmVkbyk7CiAKICAgICBXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MoKSBjb25zdDsKLSAgICBXZWJD b250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0LmdldCgpOyB9CiAKICAg ICBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUdyb3VwLmdl dCgpOyB9CiAKQEAgLTQ5NSw3ICs0OTQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBsaW5rQ2xpY2tl ZChjb25zdCBTdHJpbmcmLCBjb25zdCBXZWJNb3VzZUV2ZW50Jik7CiAgCiBwcml2YXRlOgotICAg IFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+LCBX ZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKiwgdWludDY0X3QgcGFnZUlEKTsKKyAgICBXZWJQYWdl UHJveHkoUGFnZUNsaWVudCosIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiwgV2ViUGFnZUdy b3VwKiwgdWludDY0X3QgcGFnZUlEKTsKIAogICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gQVBJVHlwZTsgfQogCkBAIC03MTMsNyArNzEyLDYgQEAgcHJpdmF0ZToKIAogICAg IE93blB0cjxEcmF3aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdBcmVhOwogICAgIFJlZlB0cjxXZWJQ cm9jZXNzUHJveHk+IG1fcHJvY2VzczsKLSAgICBSZWZQdHI8V2ViQ29udGV4dD4gbV9jb250ZXh0 OwogICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IG1fcGFnZUdyb3VwOwogICAgIFJlZlB0cjxXZWJG cmFtZVByb3h5PiBtX21haW5GcmFtZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1 c2VkRnJhbWU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmNwcAkocmV2aXNpb24gODM0OTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDcgKzE3MSw3IEBAIFBhc3NS ZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUHJveHkKICAgICBBU1NFUlQoY29udGV4dC0+ cHJvY2VzcygpID09IHRoaXMpOwogCiAgICAgdW5zaWduZWQgcGFnZUlEID0gZ2VuZXJhdGVQYWdl SUQoKTsKLSAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiB3ZWJQYWdlID0gV2ViUGFnZVByb3h5Ojpj cmVhdGUocGFnZUNsaWVudCwgdGhpcywgY29udGV4dCwgcGFnZUdyb3VwLCBwYWdlSUQpOworICAg IFJlZlB0cjxXZWJQYWdlUHJveHk+IHdlYlBhZ2UgPSBXZWJQYWdlUHJveHk6OmNyZWF0ZShwYWdl Q2xpZW50LCB0aGlzLCBwYWdlR3JvdXAsIHBhZ2VJRCk7CiAgICAgbV9wYWdlTWFwLnNldChwYWdl SUQsIHdlYlBhZ2UuZ2V0KCkpOwogICAgIHJldHVybiB3ZWJQYWdlLnJlbGVhc2UoKTsKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShyZXZpc2lvbiA4 MzQ5OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0 LmgiCiAjaW5jbHVkZSAiV2ViRGF0YS5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2lu Y2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogCiAjaWZkZWYgX19CTE9DS1NfXwogI2luY2x1ZGUg PEJsb2NrLmg+CkBAIC00Niw3ICs0Nyw3IEBAIFdLVHlwZUlEIFdLUGFnZUdldFR5cGVJRCgpCiAK IFdLQ29udGV4dFJlZiBXS1BhZ2VHZXRDb250ZXh0KFdLUGFnZVJlZiBwYWdlUmVmKQogewotICAg IHJldHVybiB0b0FQSSh0b0ltcGwocGFnZVJlZiktPmNvbnRleHQoKSk7CisgICAgcmV0dXJuIHRv QVBJKHRvSW1wbChwYWdlUmVmKS0+cHJvY2VzcygpLT5jb250ZXh0KCkpOwogfQogCiBXS1BhZ2VH cm91cFJlZiBXS1BhZ2VHZXRQYWdlR3JvdXAoV0tQYWdlUmVmIHBhZ2VSZWYpCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMu bW0JKHJldmlzaW9uIDgzNDk4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJ bnNwZWN0b3JQcm94eU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2lt cG9ydCAiV0tBUElDYXN0LmgiCiAjaW1wb3J0ICJXS1ZpZXcuaCIKICNpbXBvcnQgIldlYlBhZ2VQ cm94eS5oIgorI2ltcG9ydCAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW1wb3J0IDxXZWJLaXRTeXN0 ZW1JbnRlcmZhY2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvTG9jYWxpemVkU3RyaW5ncy5oPgogI2lt cG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CkBAIC04MCw3ICs4MSw3IEBAIFdlYlBhZ2VQcm94 eSogV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3IKICAgICBBU1NFUlQobV9wYWdlKTsKICAgICBB U1NFUlQoIW1faW5zcGVjdG9yVmlldyk7CiAKLSAgICBtX2luc3BlY3RvclZpZXcuYWRvcHROUyhb W1dLVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU1plcm9SZWN0IGNvbnRleHRSZWY6dG9BUEko cGFnZSgpLT5jb250ZXh0KCkpIHBhZ2VHcm91cFJlZjp0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAo KSldKTsKKyAgICBtX2luc3BlY3RvclZpZXcuYWRvcHROUyhbW1dLVmlldyBhbGxvY10gaW5pdFdp dGhGcmFtZTpOU1plcm9SZWN0IGNvbnRleHRSZWY6dG9BUEkocGFnZSgpLT5wcm9jZXNzKCktPmNv bnRleHQoKSkgcGFnZUdyb3VwUmVmOnRvQVBJKGluc3BlY3RvclBhZ2VHcm91cCgpKV0pOwogICAg IEFTU0VSVChtX2luc3BlY3RvclZpZXcpOwogCiAgICAgW21faW5zcGVjdG9yVmlldy5nZXQoKSBz ZXREcmF3c0JhY2tncm91bmQ6Tk9dOwo=