57374 2011-03-29 12:02:28 -0700 WebKit2: The WebProcess should be relaunched if necessary when WebKit2 is asked for information about Cookies, Databases, Local Storage, etc 2011-03-29 13:46:33 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin andersca jberlin sam oldest_to_newest 375639 0 jberlin 2011-03-29 12:02:28 -0700 <rdar://problem/9151673> 375662 1 87392 jberlin 2011-03-29 12:26:36 -0700 Created attachment 87392 Patch 375718 2 87392 jberlin 2011-03-29 13:46:25 -0700 Comment on attachment 87392 Patch Committed in http://trac.webkit.org/changeset/82312 87392 2011-03-29 12:26:36 -0700 2011-03-29 13:46:25 -0700 Patch relaunchIfNecessary9151673.patch text/plain 15309 jberlin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMjk5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTEtMDMtMjkgIEplc3NpZSBC ZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyOiBUaGUgV2ViUHJvY2VzcyBzaG91bGQgYmUgcmVs YXVuY2hlZCBpZiBuZWNlc3Nhcnkgd2hlbiBXZWJLaXQyIGlzIGFza2VkIGZvcgorICAgICAgICBp bmZvcm1hdGlvbiBhYm91dCBDb29raWVzLCBEYXRhYmFzZXMsIExvY2FsIFN0b3JhZ2UsIGV0Yy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Mzc0CisK KyAgICAgICAgSW5zdGVhZCBvZiBiYWlsaW5nIHdoZW4gdGhlIFdlYlByb2Nlc3MgaXMgbm90IHZh bGlkLCBjYWxsIHJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvUGx1Z2lucy9XZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI6OmdldFNpdGVzV2l0aERhdGEpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI6OmNsZWFyU2l0ZURhdGEpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6Z2V0QXBwbGlj YXRpb25DYWNoZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hl TWFuYWdlclByb3h5OjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6 V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxsRW50cmllcyk6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYkNvb2tpZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eTo6Z2V0SG9zdG5hbWVzV2l0aENvb2tpZXMpOgorICAg ICAgICAoV2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJveHk6OmRlbGV0ZUNvb2tpZXNGb3JIb3N0 bmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxs Q29va2llcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eTo6c3RhcnRP YnNlcnZpbmdDb29raWVDaGFuZ2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29va2llTWFuYWdl clByb3h5OjpzZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29va2llTWFuYWdlclByb3h5OjpnZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhc2VzQnlPcmlnaW4pOgorICAgICAg ICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhc2VPcmlnaW5zKToK KyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZURhdGFiYXNl V2l0aE5hbWVGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJQ cm94eTo6ZGVsZXRlRGF0YWJhc2VzRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0 YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbERhdGFiYXNlcyk6CisgICAgICAgIChXZWJLaXQ6 OldlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpzZXRRdW90YUZvck9yaWdpbik6CisgICAgICAgICog VUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6Z2V0S2V5VmFsdWVTdG9yYWdl T3JpZ2lucyk6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94 eTo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVl U3RvcmFnZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxsRW50cmllcyk6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJN ZWRpYUNhY2hlTWFuYWdlclByb3h5OjpnZXRIb3N0bmFtZXNXaXRoTWVkaWFDYWNoZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JIb3N0 bmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFy Q2FjaGVGb3JBbGxIb3N0bmFtZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUNh Y2hlTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VDYWNoZU1h bmFnZXJQcm94eTo6Z2V0Q2FjaGVPcmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3Vy Y2VDYWNoZU1hbmFnZXJQcm94eTo6Y2xlYXJDYWNoZUZvck9yaWdpbik6CisgICAgICAgIChXZWJL aXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5z KToKKwogMjAxMS0wMy0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJv eHkuY3BwCShyZXZpc2lvbiA4MjI1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJB cHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjAsMTAg KzYwLDcgQEAgdm9pZCBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5OjpkaQogdm9pZCBX ZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5OjpnZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lu cyhQYXNzUmVmUHRyPEFycmF5Q2FsbGJhY2s+IHBycENhbGxiYWNrKQogewogICAgIFJlZlB0cjxB cnJheUNhbGxiYWNrPiBjYWxsYmFjayA9IHBycENhbGxiYWNrOwotICAgIGlmICghbV93ZWJDb250 ZXh0LT5oYXNWYWxpZFByb2Nlc3MoKSkgewotICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0ZSgp OwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9j ZXNzSWZOZWNlc3NhcnkoKTsKICAgICAKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJh Y2stPmNhbGxiYWNrSUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBj YWxsYmFjay5yZWxlYXNlKCkpOwpAQCAtNzgsOCArNzUsNyBAQCB2b2lkIFdlYkFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyUHJveHk6OmRpCiAKIHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQ cm94eTo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQog ewotICAgIGlmICghbV93ZWJDb250ZXh0LT5oYXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0 dXJuOworICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAg ICAKICAgICBTZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJpdHlPcmlnaW5EYXRhOwogICAgIHNlY3Vy aXR5T3JpZ2luRGF0YS5wcm90b2NvbCA9IG9yaWdpbi0+cHJvdG9jb2woKTsKQEAgLTkxLDggKzg3 LDcgQEAgdm9pZCBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5OjpkZQogCiB2b2lkIFdl YkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbEVudHJpZXMoKQogewotICAg IGlmICghbV93ZWJDb250ZXh0LT5oYXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0dXJuOwor ICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAgICBtX3dl YkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1h bmFnZXI6OkRlbGV0ZUFsbEVudHJpZXMoKSwgMCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwCShyZXZpc2lvbiA4 MjI1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCwxMCArNjgsNyBAQCB2b2lkIFdlYkNvb2tpZU1hbmFn ZXJQcm94eTo6Z2V0SG9zdG5hbWVzCiAgICAgQVNTRVJUKG1fd2ViQ29udGV4dCk7CiAKICAgICBS ZWZQdHI8QXJyYXlDYWxsYmFjaz4gY2FsbGJhY2sgPSBwcnBDYWxsYmFjazsKLSAgICBpZiAoIW1f d2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpIHsKLSAgICAgICAgY2FsbGJhY2stPmludmFs aWRhdGUoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBtX3dlYkNvbnRleHQtPnJlbGF1 bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgCiAgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9 IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7CiAgICAgbV9hcnJheUNhbGxiYWNrcy5zZXQoY2FsbGJh Y2tJRCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKQEAgLTk4LDI0ICs5NSwyMSBAQCB2b2lkIFdlYkNv b2tpZU1hbmFnZXJQcm94eTo6ZGlkR2V0SG9zdG5hCiB2b2lkIFdlYkNvb2tpZU1hbmFnZXJQcm94 eTo6ZGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7CiAg ICAgQVNTRVJUKG1fd2ViQ29udGV4dCk7Ci0gICAgaWYgKCFtX3dlYkNvbnRleHQtPmhhc1ZhbGlk UHJvY2VzcygpKQotICAgICAgICByZXR1cm47CisgICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFBy b2Nlc3NJZk5lY2Vzc2FyeSgpOwogICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1l c3NhZ2VzOjpXZWJDb29raWVNYW5hZ2VyOjpEZWxldGVDb29raWVzRm9ySG9zdG5hbWUoaG9zdG5h bWUpLCAwKTsKIH0KIAogdm9pZCBXZWJDb29raWVNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbENvb2tp ZXMoKQogewogICAgIEFTU0VSVChtX3dlYkNvbnRleHQpOwotICAgIGlmICghbV93ZWJDb250ZXh0 LT5oYXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0dXJuOworICAgIG1fd2ViQ29udGV4dC0+ cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3Mo KS0+c2VuZChNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6RGVsZXRlQWxsQ29va2llcygpLCAw KTsKIH0KIAogdm9pZCBXZWJDb29raWVNYW5hZ2VyUHJveHk6OnN0YXJ0T2JzZXJ2aW5nQ29va2ll Q2hhbmdlcygpCiB7CiAgICAgQVNTRVJUKG1fd2ViQ29udGV4dCk7Ci0gICAgaWYgKCFtX3dlYkNv bnRleHQtPmhhc1ZhbGlkUHJvY2VzcygpKQotICAgICAgICByZXR1cm47CisgICAgbV93ZWJDb250 ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwogICAgIG1fd2ViQ29udGV4dC0+cHJv Y2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJDb29raWVNYW5hZ2VyOjpTdGFydE9ic2VydmluZ0Nv b2tpZUNoYW5nZXMoKSwgMCk7CiB9CiAKQEAgLTEzNSw5ICsxMjksNyBAQCB2b2lkIFdlYkNvb2tp ZU1hbmFnZXJQcm94eTo6Y29va2llc0RpZENoCiB2b2lkIFdlYkNvb2tpZU1hbmFnZXJQcm94eTo6 c2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkK IHsKICAgICBBU1NFUlQobV93ZWJDb250ZXh0KTsKLSAgICBpZiAoIW1fd2ViQ29udGV4dC0+aGFz VmFsaWRQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybjsKLQorICAgIG1fd2ViQ29udGV4dC0+cmVs YXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICNpZiBQTEFURk9STShNQUMpCiAgICAgcGVyc2lz dEhUVFBDb29raWVBY2NlcHRQb2xpY3kocG9saWN5KTsKICNlbmRpZgpAQCAtMTQ5LDEwICsxNDEs NyBAQCB2b2lkIFdlYkNvb2tpZU1hbmFnZXJQcm94eTo6Z2V0SFRUUENvb2tpCiAgICAgQVNTRVJU KG1fd2ViQ29udGV4dCk7CiAKICAgICBSZWZQdHI8SFRUUENvb2tpZUFjY2VwdFBvbGljeUNhbGxi YWNrPiBjYWxsYmFjayA9IHBycENhbGxiYWNrOwotICAgIGlmICghbV93ZWJDb250ZXh0LT5oYXNW YWxpZFByb2Nlc3MoKSkgewotICAgICAgICBjYWxsYmFjay0+aW52YWxpZGF0ZSgpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQorICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNl c3NhcnkoKTsKIAogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJ RCgpOwogICAgIG1faHR0cENvb2tpZUFjY2VwdFBvbGljeUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJ RCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJEYXRhYmFzZU1hbmFnZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkRhdGFiYXNlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gODIyNTApCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTEsMTAgKzExMSw3IEBAIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2Vy UHJveHk6OmluaXRpYWxpemUKIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmdldERhdGFi YXNlc0J5T3JpZ2luKFBhc3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2FsbGJhY2spCiB7CiAg ICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7Ci0gICAgaWYg KCFtX3dlYkNvbnRleHQtPmhhc1ZhbGlkUHJvY2VzcygpKSB7Ci0gICAgICAgIGNhbGxiYWNrLT5p bnZhbGlkYXRlKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgbV93ZWJDb250ZXh0LT5y ZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBj YWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNr SUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7CiAgICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNl bmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VzQnlPcmlnaW4oY2Fs bGJhY2tJRCksIDApOwpAQCAtMTY3LDEwICsxNjQsNyBAQCB2b2lkIFdlYkRhdGFiYXNlTWFuYWdl clByb3h5OjpkaWRHZXREYXRhCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpnZXREYXRh YmFzZU9yaWdpbnMoUGFzc1JlZlB0cjxBcnJheUNhbGxiYWNrPiBwcnBDYWxsYmFjaykKIHsKICAg ICBSZWZQdHI8QXJyYXlDYWxsYmFjaz4gY2FsbGJhY2sgPSBwcnBDYWxsYmFjazsKLSAgICBpZiAo IW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpIHsKLSAgICAgICAgY2FsbGJhY2stPmlu dmFsaWRhdGUoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBtX3dlYkNvbnRleHQtPnJl bGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IGNh bGxiYWNrLT5jYWxsYmFja0lEKCk7CiAgICAgbV9hcnJheUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJ RCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKICAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2Vu ZChNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpHZXREYXRhYmFzZU9yaWdpbnMoY2FsbGJh Y2tJRCksIDApOwpAQCAtMTk1LDI5ICsxODksMjUgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQ cm94eTo6ZGlkR2V0RGF0YQogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkZWxldGVE YXRhYmFzZVdpdGhOYW1lRm9yT3JpZ2luKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VJZGVudGlmaWVy LCBXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAgIGlmICghbV93ZWJDb250ZXh0LT5o YXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0dXJuOworICAgIG1fd2ViQ29udGV4dC0+cmVs YXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+ c2VuZChNZXNzYWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpEZWxldGVEYXRhYmFzZVdpdGhOYW1l Rm9yT3JpZ2luKGRhdGFiYXNlSWRlbnRpZmllciwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIo KSksIDApOwogfQogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkZWxldGVEYXRhYmFz ZXNGb3JPcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICBpZiAoIW1fd2Vi Q29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybjsKKyAgICBtX3dlYkNv bnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgbV93ZWJDb250ZXh0LT5w cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6RGVsZXRlRGF0YWJh c2VzRm9yT3JpZ2luKG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpLCAwKTsKIH0KIAogdm9p ZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxsRGF0YWJhc2VzKCkKIHsKLSAgICBp ZiAoIW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybjsKKyAg ICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgbV93ZWJD b250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6RGVs ZXRlQWxsRGF0YWJhc2VzKCksIDApOwogfQogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5 OjpzZXRRdW90YUZvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luLCB1aW50NjRfdCBx dW90YSkKIHsKLSAgICBpZiAoIW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpCi0gICAg ICAgIHJldHVybjsKKyAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5 KCk7CiAgICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkRhdGFi YXNlTWFuYWdlcjo6U2V0UXVvdGFGb3JPcmlnaW4ob3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIo KSwgcXVvdGEpLCAwKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYktl eVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eS5jcHAJKHJldmlzaW9u IDgyMjUwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1h bmFnZXJQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDEwICs2MCw3IEBAIHZvaWQgV2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpkaWQKIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdl TWFuYWdlclByb3h5OjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKFBhc3NSZWZQdHI8QXJyYXlD YWxsYmFjaz4gcHJwQ2FsbGJhY2spCiB7CiAgICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxi YWNrID0gcHJwQ2FsbGJhY2s7Ci0gICAgaWYgKCFtX3dlYkNvbnRleHQtPmhhc1ZhbGlkUHJvY2Vz cygpKSB7Ci0gICAgICAgIGNhbGxiYWNrLT5pbnZhbGlkYXRlKCk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9CisgICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwog ICAgIAogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwog ICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7 CkBAIC03OCw4ICs3NSw3IEBAIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5Ojpk aWQKIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUVudHJpZXNG b3JPcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICBpZiAoIW1fd2ViQ29u dGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpCi0gICAgICAgIHJldHVybjsKKyAgICBtX3dlYkNvbnRl eHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgCiAgICAgU2VjdXJpdHlPcmln aW5EYXRhIHNlY3VyaXR5T3JpZ2luRGF0YTsKICAgICBzZWN1cml0eU9yaWdpbkRhdGEucHJvdG9j b2wgPSBvcmlnaW4tPnByb3RvY29sKCk7CkBAIC05MSw5ICs4Nyw3IEBAIHZvaWQgV2ViS2V5VmFs dWVTdG9yYWdlTWFuYWdlclByb3h5OjpkZWwKIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyUHJveHk6OmRlbGV0ZUFsbEVudHJpZXMoKQogewotICAgIGlmICghbV93ZWJDb250ZXh0LT5o YXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0dXJuOwotCisgICAgbV93ZWJDb250ZXh0LT5y ZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwogICAgIG1fd2ViQ29udGV4dC0+cHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpEZWxldGVBbGxFbnRy aWVzKCksIDApOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFD YWNoZU1hbmFnZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCShyZXZpc2lvbiA4MjI1MCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTksMTAgKzU5LDcgQEAgdm9pZCBXZWJNZWRpYUNhY2hlTWFuYWdlclBy b3h5OjpkaWRSZWNlaQogdm9pZCBXZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5OjpnZXRIb3N0bmFt ZXNXaXRoTWVkaWFDYWNoZShQYXNzUmVmUHRyPEFycmF5Q2FsbGJhY2s+IHBycENhbGxiYWNrKQog ewogICAgIFJlZlB0cjxBcnJheUNhbGxiYWNrPiBjYWxsYmFjayA9IHBycENhbGxiYWNrOwotICAg IGlmICghbV93ZWJDb250ZXh0LT5oYXNWYWxpZFByb2Nlc3MoKSkgewotICAgICAgICBjYWxsYmFj ay0+aW52YWxpZGF0ZSgpOwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIG1fd2ViQ29udGV4 dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAgICAKICAgICB1aW50NjRfdCBjYWxs YmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNl dChjYWxsYmFja0lELCBjYWxsYmFjay5yZWxlYXNlKCkpOwpAQCAtODgsMTcgKzg1LDEzIEBAIHZv aWQgV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6ZGlkR2V0SG8KIAogdm9pZCBXZWJNZWRpYUNh Y2hlTWFuYWdlclByb3h5OjpjbGVhckNhY2hlRm9ySG9zdG5hbWUoY29uc3QgU3RyaW5nJiBob3N0 bmFtZSkKIHsKLSAgICBpZiAoIW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpCi0gICAg ICAgIHJldHVybjsKLQorICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3Nh cnkoKTsKICAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViTWVk aWFDYWNoZU1hbmFnZXI6OkNsZWFyQ2FjaGVGb3JIb3N0bmFtZShob3N0bmFtZSksIDApOwogfQog CiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JBbGxIb3N0bmFt ZXMoKQogewotICAgIGlmICghbV93ZWJDb250ZXh0LT5oYXNWYWxpZFByb2Nlc3MoKSkKLSAgICAg ICAgcmV0dXJuOwotCisgICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2Fy eSgpOwogICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJNZWRp YUNhY2hlTWFuYWdlcjo6Q2xlYXJDYWNoZUZvckFsbEhvc3RuYW1lcygpLCAwKTsKIH0KIApJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUNh Y2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gODIyNTApCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU5LDEwICs1OSw3IEBAIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTo6aW52 YWwKIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTo6Z2V0Q2FjaGVPcmlnaW5zKFBh c3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2FsbGJhY2spCiB7CiAgICAgUmVmUHRyPEFycmF5 Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7Ci0gICAgaWYgKCFtX3dlYkNvbnRleHQt Pmhhc1ZhbGlkUHJvY2VzcygpKSB7Ci0gICAgICAgIGNhbGxiYWNrLT5pbnZhbGlkYXRlKCk7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9CisgICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJ Zk5lY2Vzc2FyeSgpOwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJh Y2tJRCgpOwogICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJl bGVhc2UoKSk7CiAgICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Oldl YlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpHZXRDYWNoZU9yaWdpbnMoY2FsbGJhY2tJRCksIDApOwpA QCAtNzYsOCArNzMsNyBAQCB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmRpZEdl CiAKIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTo6Y2xlYXJDYWNoZUZvck9yaWdp bihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAgIGlmICghbV93ZWJDb250ZXh0LT5o YXNWYWxpZFByb2Nlc3MoKSkKLSAgICAgICAgcmV0dXJuOworICAgIG1fd2ViQ29udGV4dC0+cmVs YXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKIAogICAgIFNlY3VyaXR5T3JpZ2luRGF0YSBzZWN1 cml0eU9yaWdpbjsKICAgICBzZWN1cml0eU9yaWdpbi5wcm90b2NvbCA9IG9yaWdpbi0+cHJvdG9j b2woKTsKQEAgLTg4LDggKzg0LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5 OjpjbGVhcgogCiB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVG b3JBbGxPcmlnaW5zKCkKIHsKLSAgICBpZiAoIW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNz KCkpCi0gICAgICAgIHJldHVybjsKKyAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lm TmVjZXNzYXJ5KCk7CiAgICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6 OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpDbGVhckNhY2hlRm9yQWxsT3JpZ2lucygpLCAwKTsK IH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvV2ViUGx1Z2luU2l0 ZURhdGFNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9XZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwCShyZXZpc2lvbiA4MjI1MCkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRhTWFuYWdl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MywxMSArMTYzLDcgQEAgdm9pZCBXZWJQbHVnaW5T aXRlRGF0YU1hbmFnZXI6OmdldFNpdGVzVwogICAgIG1fcGVuZGluZ0dldFNpdGVzV2l0aERhdGEu c2V0KGNhbGxiYWNrSUQsIHN0YXRlKTsKICAgICBzdGF0ZS0+Z2V0U2l0ZXNXaXRoRGF0YUZvck5l eHRQbHVnaW4oKTsKICNlbHNlCi0gICAgaWYgKCFtX3dlYkNvbnRleHQtPmhhc1ZhbGlkUHJvY2Vz cygpKSB7Ci0gICAgICAgIFJlZlB0cjxBcnJheUNhbGxiYWNrPiBjYWxsYmFjayA9IG1fYXJyYXlD YWxsYmFja3MudGFrZShjYWxsYmFja0lEKTsKLSAgICAgICAgY2FsbGJhY2stPmludmFsaWRhdGUo KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJv Y2Vzc0lmTmVjZXNzYXJ5KCk7CiAKICAgICBWZWN0b3I8U3RyaW5nPiBwbHVnaW5QYXRoczsKICAg ICBtX3dlYkNvbnRleHQtPnBsdWdpbkluZm9TdG9yZSgpLT5nZXRQbHVnaW5QYXRocyhwbHVnaW5Q YXRocyk7CkBAIC0yMjcsMTEgKzIyMyw3IEBAIHZvaWQgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2Vy OjpjbGVhclNpdGUKICAgICBzdGF0ZS0+Y2xlYXJTaXRlRGF0YUZvck5leHRQbHVnaW4oKTsKICNl bHNlCiAKLSAgICBpZiAoIW1fd2ViQ29udGV4dC0+aGFzVmFsaWRQcm9jZXNzKCkpIHsKLSAgICAg ICAgUmVmUHRyPFZvaWRDYWxsYmFjaz4gY2FsbGJhY2sgPSBtX3ZvaWRDYWxsYmFja3MudGFrZShj YWxsYmFja0lEKTsKLSAgICAgICAgY2FsbGJhY2stPmludmFsaWRhdGUoKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KKyAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5 KCk7CiAgICAgVmVjdG9yPFN0cmluZz4gcGx1Z2luUGF0aHM7CiAgICAgbV93ZWJDb250ZXh0LT5w bHVnaW5JbmZvU3RvcmUoKS0+Z2V0UGx1Z2luUGF0aHMocGx1Z2luUGF0aHMpOwogICAgIG1fd2Vi Q29udGV4dC0+ZW5zdXJlV2ViUHJvY2VzcygpOyAgICAK