135996 2014-08-15 15:28:32 -0700 Improve page to process relationship tracking 2014-08-15 19:50:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap andersca benjamin oldest_to_newest 1029480 0 ap 2014-08-15 15:28:32 -0700 I've added some assertions for page to process relationship, and I'm seeing them fail in Safari sometimes. <rdar://problem/16991213> 1029486 1 236683 ap 2014-08-15 15:39:42 -0700 Created attachment 236683 proposed fix 1029525 2 ap 2014-08-15 16:57:24 -0700 Committed <http://trac.webkit.org/r172660>. 1029545 3 benjamin 2014-08-15 18:41:44 -0700 Looks like this introduced failures in debug (failing assertion):. E.g.: http://build.webkit.org/builders/Apple%20Mavericks%20Debug%20WK2%20(Tests)/builds/6284/steps/run-api-tests/logs/stdio 1029556 4 ap 2014-08-15 19:50:25 -0700 Filed bug 136012 about this, will investigate. 236683 2014-08-15 15:39:42 -0700 2014-08-15 15:50:54 -0700 proposed fix ProcessPageTrackingOpenSource.txt text/plain 8519 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjY1NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTA4LTE1ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgcGFnZSB0byBw cm9jZXNzIHJlbGF0aW9uc2hpcCB0cmFja2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTk2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjk5 MTIxMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9WaXNpdGVkTGlua1Byb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Vmlz aXRlZExpbmtQcm92aWRlcjo6cmVtb3ZlQWxsKToKKyAgICAgICAgKFdlYktpdDo6VmlzaXRlZExp bmtQcm92aWRlcjo6cGVuZGluZ1Zpc2l0ZWRMaW5rc1RpbWVyRmlyZWQpOgorICAgICAgICAoV2Vi S2l0OjpWaXNpdGVkTGlua1Byb3ZpZGVyOjpzZW5kVGFibGUpOgorICAgICAgICBBZGRlZCBhc3Nl cnRpb25zIGZvciBtX3Byb2Nlc3NlcyBvbmx5IGhhdmluZyB2YWxpZCBlbnRyaWVzLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MpOiBXaGVuIGF0dGFjaGluZyB0byBhIG5ldyBw cm9jZXNzLAorICAgICAgICB0ZWxsIHRoZSBvbGQgcHJvY2VzcyB0aGF0IHRoZSBwYWdlIGlzIG5v dCBsb25nZXIgYXNzb2NpYXRlZCB3aXRoIGl0LCBhdm9pZGluZworICAgICAgICBhIHBvdGVudGlh bCBzdGFsZSBwb2ludGVyLgorICAgICAgICBJZiByZS1hdHRhY2hlZCB0byBhbiBleGlzdGluZyBw cm9jZXNzLCBtYWtlIHN1cmUgdGhhdCB3ZSBwZXJmb3JtIGFsbCB0aGUgc2FtZQorICAgICAgICBy ZWdpc3RyYXRpb25zIGFzIGFmdGVyIGhhdmluZyBsYXVuY2hlZCBhIG5ldyBwcm9jZXNzLiBUaGlz IHN1YnN0YW50aWFsbHkgaW1wcm92ZXMKKyAgICAgICAgdGhlIGJlaGF2aW9yIHdoZW4gdGhlIG51 bWJlciBvZiBvcGVuIHRhYnMgaXMgb3ZlciBwcm9jZXNzIGxpbWl0LgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0pOiBBZGRlZCBBU1NF UlQoIWlzVmFsaWQoKSkKKyAgICAgICAgdG8gYXZvaWQgY29uZnVzaW9uLiBBbGwgb3RoZXIgY2Fs bHMgdG8gcmVhdHRhY2hUb1dlYlByb2Nlc3MoKSBoYXZlIHRoaXMgYXMgYQorICAgICAgICBydW50 aW1lIGNoZWNrLCBidXQgcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbSgpIGlzIG9ubHkgY2Fs bGVkIGZvciB2YWxpZCBwYWdlcy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0ZXJt aW5hdGVQcm9jZXNzKTogQWRkZWQgYW4gYXNzZXJ0aW9uIHdpdGggYSBGSVhNRSBmb3IKKyAgICAg ICAgc29tZXRoaW5nIHRoYXQgd2lsbCBuZWVkIHRvIGJlIGZpeGVkIGFub3RoZXIgZGF5LgorCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOiBSZW1vdmVkIGFuIHVuaW1wbGVtZW50 ZWQgZnVuY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjphZGRFeGlzdGluZ1dlYlBhZ2UpOiBB ZGRlZCBhc3NlcnRpb25zIGZvciBwYWdlIG1hcCBzYW5pdHkuCisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQcm94eTo6cmVtb3ZlV2ViUGFnZSk6IEFkZGVkIGEgY2hlY2sgZm9yIHBhZ2Ugc3Rh dGUgYmVpbmcgVGVybWluYXRlZAorICAgICAgICBhbHJlYWR5LiBUaGlzIGF2b2lkcyBhbiBhc3Nl cnRpb24gZmFpbHVyZSB0aGF0IGhhcHBlbmVkIHVuZGVyIHRoZSBuZXcgY2FsbCB0bworICAgICAg ICByZW1vdmVXZWJQYWdlKCkgaW4gcmVhdHRhY2hUb1dlYlByb2Nlc3MoKSwgYXMgd2UgYXJlIG5v dyBjYWxsaW5nIGl0IGZvciB0ZXJtaW5hdGVkCisgICAgICAgIHByb2Nlc3NlcyB0aGF0IGFyZSBu b3QgaW4gV2ViQ29udGV4dDo6bV9wcm9jZXNzZXMgYW55IG1vcmUuCisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKTogQWRkZWQgYW4gYXNzZXJ0aW9u IHRoYXQgcGFnZSBhZ3JlZXMKKyAgICAgICAgYWJvdXQgdXNpbmcgdGhpcyBwcm9jZXNzLgorCiAy MDE0LTA4LTE1ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAog ICAgICAgICBGaXggcGx1Z2luIHZpc2liaWxpdHkgY2hlY2suCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvVmlzaXRlZExpbmtQcm92aWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1Zpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwCShyZXZpc2lvbiAxNzI1 ODYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVmlzaXRlZExpbmtQcm92aWRlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTk3LDggKzk3LDExIEBAIHZvaWQgVmlzaXRlZExpbmtQcm92aWRl cjo6cmVtb3ZlQWxsKCkKICAgICBtX3RhYmxlU2l6ZSA9IDA7CiAgICAgbV90YWJsZS5jbGVhcigp OwogCi0gICAgZm9yIChhdXRvJiBwcm9jZXNzQW5kQ291bnQgOiBtX3Byb2Nlc3NlcykKLSAgICAg ICAgcHJvY2Vzc0FuZENvdW50LmtleS0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpWaXNp dGVkTGlua1RhYmxlQ29udHJvbGxlcjo6UmVtb3ZlQWxsVmlzaXRlZExpbmtzKCksIG1faWRlbnRp Zmllcik7CisgICAgZm9yIChhdXRvJiBwcm9jZXNzQW5kQ291bnQgOiBtX3Byb2Nlc3Nlcykgewor ICAgICAgICBXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MgPSBwcm9jZXNzQW5kQ291bnQua2V5Owor ICAgICAgICBBU1NFUlQocHJvY2Vzcy0+Y29udGV4dCgpLnByb2Nlc3NlcygpLmNvbnRhaW5zKHBy b2Nlc3MpKTsKKyAgICAgICAgcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpW aXNpdGVkTGlua1RhYmxlQ29udHJvbGxlcjo6UmVtb3ZlQWxsVmlzaXRlZExpbmtzKCksIG1faWRl bnRpZmllcik7CisgICAgfQogfQogCiB2b2lkIFZpc2l0ZWRMaW5rUHJvdmlkZXI6OmFkZFZpc2l0 ZWRMaW5rSGFzaChMaW5rSGFzaCBsaW5rSGFzaCkKQEAgLTE3NSwxMCArMTc4LDEzIEBAIHZvaWQg VmlzaXRlZExpbmtQcm92aWRlcjo6cGVuZGluZ1Zpc2l0ZWQKICAgICAgICAgcmV0dXJuOwogCiAg ICAgZm9yIChhdXRvJiBwcm9jZXNzQW5kQ291bnQgOiBtX3Byb2Nlc3NlcykgeworICAgICAgICBX ZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MgPSBwcm9jZXNzQW5kQ291bnQua2V5OworICAgICAgICBB U1NFUlQocHJvY2Vzcy0+Y29udGV4dCgpLnByb2Nlc3NlcygpLmNvbnRhaW5zKHByb2Nlc3MpKTsK KwogICAgICAgICBpZiAoYWRkZWRWaXNpdGVkTGlua3Muc2l6ZSgpID4gMjApCi0gICAgICAgICAg ICBwcm9jZXNzQW5kQ291bnQua2V5LT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OlZpc2l0 ZWRMaW5rVGFibGVDb250cm9sbGVyOjpBbGxWaXNpdGVkTGlua1N0YXRlQ2hhbmdlZCgpLCBtX2lk ZW50aWZpZXIpOworICAgICAgICAgICAgcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3Nh Z2VzOjpWaXNpdGVkTGlua1RhYmxlQ29udHJvbGxlcjo6QWxsVmlzaXRlZExpbmtTdGF0ZUNoYW5n ZWQoKSwgbV9pZGVudGlmaWVyKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcHJvY2Vzc0Fu ZENvdW50LmtleS0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpWaXNpdGVkTGlua1RhYmxl Q29udHJvbGxlcjo6VmlzaXRlZExpbmtTdGF0ZUNoYW5nZWQoYWRkZWRWaXNpdGVkTGlua3MpLCBt X2lkZW50aWZpZXIpOworICAgICAgICAgICAgcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1l c3NhZ2VzOjpWaXNpdGVkTGlua1RhYmxlQ29udHJvbGxlcjo6VmlzaXRlZExpbmtTdGF0ZUNoYW5n ZWQoYWRkZWRWaXNpdGVkTGlua3MpLCBtX2lkZW50aWZpZXIpOwogICAgIH0KIH0KIApAQCAtMjI5 LDYgKzIzNSw4IEBAIHZvaWQgVmlzaXRlZExpbmtQcm92aWRlcjo6cmVzaXplVGFibGUodW4KIAog dm9pZCBWaXNpdGVkTGlua1Byb3ZpZGVyOjpzZW5kVGFibGUoV2ViUHJvY2Vzc1Byb3h5JiBwcm9j ZXNzKQogeworICAgIEFTU0VSVChwcm9jZXNzLmNvbnRleHQoKS5wcm9jZXNzZXMoKS5jb250YWlu cygmcHJvY2VzcykpOworCiAgICAgU2hhcmVkTWVtb3J5OjpIYW5kbGUgaGFuZGxlOwogICAgIGlm ICghbV90YWJsZS5zaGFyZWRNZW1vcnkoKS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSwgU2hhcmVkTWVt b3J5OjpSZWFkT25seSkpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNzI1ODYpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTQ1LDEx ICs1NDUsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzKAogICAg IEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6VGVy bWluYXRlZCk7CiAKICAgICBtX2lzVmFsaWQgPSB0cnVlOworICAgIG1fcHJvY2Vzcy0+cmVtb3Zl V2ViUGFnZShtX3BhZ2VJRCk7CiAKICAgICBpZiAobV9wcm9jZXNzLT5jb250ZXh0KCkucHJvY2Vz c01vZGVsKCkgPT0gUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJvY2VzcykKICAgICAgICAg bV9wcm9jZXNzID0gbV9wcm9jZXNzLT5jb250ZXh0KCkuZW5zdXJlU2hhcmVkV2ViUHJvY2Vzcygp OwogICAgIGVsc2UKICAgICAgICAgbV9wcm9jZXNzID0gbV9wcm9jZXNzLT5jb250ZXh0KCkuY3Jl YXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdCgpOworCisgICAgQVNT RVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBDaGlsZFByb2Nlc3NQcm94eTo6U3RhdGU6OlRlcm1p bmF0ZWQpOworICAgIGlmIChtX3Byb2Nlc3MtPnN0YXRlKCkgPT0gQ2hpbGRQcm9jZXNzUHJveHk6 OlN0YXRlOjpSdW5uaW5nKQorICAgICAgICBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCk7CiAg ICAgbV9wcm9jZXNzLT5hZGRFeGlzdGluZ1dlYlBhZ2UodGhpcywgbV9wYWdlSUQpOwogICAgIG1f cHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlSUQsICp0aGlzKTsKIApAQCAtNTc5LDcgKzU4NCw4IEBA IHVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2MKIAogICAgIGlmIChpdGVt ICYmIGl0ZW0gIT0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpCiAgICAgICAgIG1f YmFja0ZvcndhcmRMaXN0LT5nb1RvSXRlbShpdGVtKTsKLSAgICAKKworICAgIEFTU0VSVCghaXNW YWxpZCgpKTsKICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogCiAgICAgaWYgKCFpdGVtKQpA QCAtMTg2MSw2ICsxODY3LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRDdXN0b21UZXh0RW5j b2RpbmcKIAogdm9pZCBXZWJQYWdlUHJveHk6OnRlcm1pbmF0ZVByb2Nlc3MoKQogeworICAgIC8v IHJlcXVlc3RUZXJtaW5hdGlvbigpIGlzIGEgbm8tb3AgZm9yIGxhdW5jaGluZyBwcm9jZXNzZXMs IHNvIHdlIGdldCBpbnRvIGFuIGluY29uc2lzdGVudCBzdGF0ZSBieSBjYWxsaW5nIHJlc2V0U3Rh dGVBZnRlclByb2Nlc3NFeGl0ZWQoKS4KKyAgICAvLyBGSVhNRTogQSBjbGllbnQgY2FuIHRlcm1p bmF0ZSB0aGUgcGFnZSBhdCBhbnkgdGltZSwgc28gd2Ugc2hvdWxkIGRvIHNvbWV0aGluZyBtb3Jl IG1lYW5pbmdmdWwgdGhhbiBhc3NlcnQgYW5kIGZhbGwgYXBhcnQgaW4gcmVsZWFzZSBidWlsZHMu CisgICAgQVNTRVJUKG1fcHJvY2Vzcy0+c3RhdGUoKSAhPSBXZWJQcm9jZXNzUHJveHk6OlN0YXRl OjpMYXVuY2hpbmcpOworCiAgICAgLy8gTk9URTogVGhpcyB1c2VzIGEgY2hlY2sgb2YgbV9pc1Zh bGlkIHJhdGhlciB0aGFuIGNhbGxpbmcgaXNWYWxpZCgpIHNpbmNlCiAgICAgLy8gd2Ugd2FudCB0 aGlzIHRvIHJ1biBldmVuIGZvciBwYWdlcyBiZWluZyBjbG9zZWQgb3IgdGhhdCBhbHJlYWR5IGNs b3NlZC4KICAgICBpZiAoIW1faXNWYWxpZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE3MjU4NikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzQwLDggKzc0MCw2IEBAIHB1 YmxpYzoKIAogICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0OwogCi0gICAgUGFzc1JlZlB0cjxBUEk6 OkFycmF5PiByZWxhdGVkUGFnZXMoKSBjb25zdDsKLQogICAgIGNvbnN0IFN0cmluZyYgdXJsQXRQ cm9jZXNzRXhpdCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsQXRQcm9jZXNzRXhpdDsgfQogICAgIEZy YW1lTG9hZFN0YXRlOjpTdGF0ZSBsb2FkU3RhdGVBdFByb2Nlc3NFeGl0KCkgY29uc3QgeyByZXR1 cm4gbV9sb2FkU3RhdGVBdFByb2Nlc3NFeGl0OyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxNzI1ODYpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTg2LDYgKzE4Niw5IEBAIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUHJv eHkKIAogdm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZEV4aXN0aW5nV2ViUGFnZShXZWJQYWdlUHJv eHkqIHdlYlBhZ2UsIHVpbnQ2NF90IHBhZ2VJRCkKIHsKKyAgICBBU1NFUlQoIW1fcGFnZU1hcC5j b250YWlucyhwYWdlSUQpKTsKKyAgICBBU1NFUlQoIWdsb2JhbFBhZ2VNYXAoKS5jb250YWlucyhw YWdlSUQpKTsKKwogICAgIG1fcGFnZU1hcC5zZXQocGFnZUlELCB3ZWJQYWdlKTsKICAgICBnbG9i YWxQYWdlTWFwKCkuc2V0KHBhZ2VJRCwgd2ViUGFnZSk7CiAjaWYgUExBVEZPUk0oQ09DT0EpCkBA IC0yMTUsNyArMjE4LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnJlbW92ZVdlYlBhZ2UodWlu dAogCiAgICAgLy8gSWYgdGhpcyB3YXMgdGhlIGxhc3QgV2ViUGFnZSBvcGVuIGluIHRoYXQgd2Vi IHByb2Nlc3MsIGFuZCB3ZSBoYXZlIG5vIG90aGVyIHJlYXNvbiB0byBrZWVwIGl0IGFsaXZlLCBs ZXQgaXQgZ28uCiAgICAgLy8gV2Ugb25seSBhbGxvdyB0aGlzIHdoZW4gdXNpbmcgYSBuZXR3b3Jr IHByb2Nlc3MsIGFzIG90aGVyd2lzZSB0aGUgV2ViUHJvY2VzcyBuZWVkcyB0byBwcmVzZXJ2ZSBp dHMgc2Vzc2lvbiBzdGF0ZS4KLSAgICBpZiAoIW1fY29udGV4dC0+dXNlc05ldHdvcmtQcm9jZXNz KCkgfHwgIWNhblRlcm1pbmF0ZUNoaWxkUHJvY2VzcygpKQorICAgIGlmICghbV9jb250ZXh0LT51 c2VzTmV0d29ya1Byb2Nlc3MoKSB8fCBzdGF0ZSgpID09IFN0YXRlOjpUZXJtaW5hdGVkIHx8ICFj YW5UZXJtaW5hdGVDaGlsZFByb2Nlc3MoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYWJvcnRQ cm9jZXNzTGF1bmNoSWZOZWVkZWQoKTsKQEAgLTQ3MSw4ICs0NzQsMTAgQEAgdm9pZCBXZWJQcm9j ZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZwogewogICAgIENoaWxkUHJvY2Vzc1Byb3h5Ojpk aWRGaW5pc2hMYXVuY2hpbmcobGF1bmNoZXIsIGNvbm5lY3Rpb25JZGVudGlmaWVyKTsKIAotICAg IGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKKyAgICBmb3IgKFdlYlBhZ2VQ cm94eSogcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkgeworICAgICAgICBBU1NFUlQodGhpcyA9 PSAmcGFnZS0+cHJvY2VzcygpKTsKICAgICAgICAgcGFnZS0+cHJvY2Vzc0RpZEZpbmlzaExhdW5j aGluZygpOworICAgIH0KIAogICAgIG1fd2ViQ29ubmVjdGlvbiA9IFdlYkNvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OmNyZWF0ZSh0aGlzKTsKIAo=