57305 2011-03-28 23:52:49 -0700 WKPageGetSourceForFrame and WKPageGetContentsAsString should throw an error in case of a race with page loading 2011-03-29 00:37:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs oldest_to_newest 375068 0 mjs 2011-03-28 23:52:49 -0700 WKPageGetSourceForFrame and WKPageGetContentsAsString should throw an error in case of a race with page loading 375070 1 87271 mjs 2011-03-28 23:56:30 -0700 Created attachment 87271 Patch 375074 2 87272 mjs 2011-03-29 00:07:52 -0700 Created attachment 87272 Patch 375077 3 87273 mjs 2011-03-29 00:21:45 -0700 Created attachment 87273 Patch 375084 4 mjs 2011-03-29 00:37:39 -0700 Committed r82206: <http://trac.webkit.org/changeset/82206> 87271 2011-03-28 23:56:30 -0700 2011-03-29 00:07:50 -0700 Patch bug-57305-20110328235628.patch text/plain 5974 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMjAxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMjggIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXS1BhZ2VHZXRTb3VyY2VGb3JGcmFtZSBhbmQgV0tQYWdlR2V0 Q29udGVudHNBc1N0cmluZyBzaG91bGQgdGhyb3cgYW4gZXJyb3IgaW4gY2FzZSBvZiBhIHJhY2Ug d2l0aCBwYWdlIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU3MzA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzM4MDYwPiwgPHJkYXI6 Ly9wcm9ibGVtLzg3ODAxNjg+CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbG9zZSk6IENsZWFyIG1fbG9hZERl cGVuZGVudFN0cmluZ0NhbGxiYWNrSWRzCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0U291cmNlRm9yRnJhbWUpOiB0cmFjayB0aGUgY2FsbGJhY2sgYXMgbG9hZCBkZXBlbmRlbnQK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKTogZGl0 dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxs YmFja3MpOiBJbnZhbGlkYXRlIGFsbCBsb2FkIGRlcGVuZGVudCBjYWxsYmFja3MKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOiBDYWxsIGNsZWFy TG9hZERlcGVuZGVudENhbGxiYWNrcworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZEZhaWxMb2FkRm9yRnJhbWUpOiBkaXR0bworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnN0cmluZ0NhbGxiYWNrKTogUmVtb3ZlIGNhbGxiYWNrIGZyb20gbG9hZCBkZXBlbmRlbnQgc2V0 IGlmIGFwcHJvcHJpYXRlCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc0Rp ZENyYXNoKTogQ2xlYXIgbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6IEFkZCBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxs YmFja0lkcyBoYXNoIHNldC4KKwogMjAxMS0wMy0yOCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA4MjA1 OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMjMsNiArMzIzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlKCkKICAg ICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV92b2lkQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRl Q2FsbGJhY2tNYXAobV9kYXRhQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAo bV9zdHJpbmdDYWxsYmFja3MpOworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSWRz LmNsZWFyKCk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc2NyaXB0VmFsdWVDYWxsYmFj a3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2NvbXB1dGVkUGFnZXNDYWxsYmFja3Mp OwogCkBAIC0xMTE1LDYgKzExMTYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0U291cmNlRm9y RnJhbWUoV2ViCiB7CiAgICAgUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBjYWxsYmFjayA9IHBycENh bGxiYWNrOwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgp OworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSWRzLmFkZChjYWxsYmFja0lEKTsK ICAgICBtX3N0cmluZ0NhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2suZ2V0KCkpOwog ICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R2V0U291cmNlRm9yRnJhbWUo ZnJhbWUtPmZyYW1lSUQoKSwgY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKIH0KQEAgLTExMjMsNiAr MTEyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKFAKIHsKICAg ICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7CiAgICAgdWlu dDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7CisgICAgbV9sb2FkRGVw ZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMuYWRkKGNhbGxiYWNrSUQpOwogICAgIG1fc3RyaW5nQ2Fs bGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5nZXQoKSk7CiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDb250ZW50c0FzU3RyaW5nKGNhbGxiYWNrSUQpLCBt X3BhZ2VJRCk7CiB9CkBAIC0xMzk1LDYgKzEzOTgsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZEZhaWxQcm92aXNpb25hbExvYQogICAgIG1fbG9hZGVyQ2xpZW50LmRpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZSh0aGlzLCBmcmFtZSwgZXJyb3IsIHVzZXJEYXRhLmdldCgp KTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygp Cit7CisgICAgSGFzaFNldDx1aW50NjRfdD46Oml0ZXJhdG9yIGVuZCA9IG1fbG9hZERlcGVuZGVu dFN0cmluZ0NhbGxiYWNrSWRzLmVuZCgpOworICAgIGZvciAoSGFzaFNldDx1aW50NjRfdD46Oml0 ZXJhdG9yIGl0ID0gbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMuYmVnaW4oKTsgaXQg IT0gZW5kOyArK2l0KQorICAgICAgICBtX3N0cmluZ0NhbGxiYWNrcy5yZW1vdmUoKml0KTsKKyAg ICBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxsYmFja0lkcy5jbGVhcigpOworfQorCiB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGUsIGJvb2wgZnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbiwgY29u c3QgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5mbywgQ29yZUlQQzo6QXJn dW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgUmVmUHRyPEFQSU9iamVjdD4gdXNlckRh dGE7CkBAIC0xNDA5LDYgKzE0MjAsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9h ZEZvckZyYW1lCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBwcm9jZXNzKCktPndlYkZyYW1l KGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCisgICAgY2xlYXJMb2FkRGVw ZW5kZW50Q2FsbGJhY2tzKCk7CisKICAgICBmcmFtZS0+ZGlkQ29tbWl0TG9hZChtaW1lVHlwZSwg Y2VydGlmaWNhdGVJbmZvKTsKIAogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkgewpAQCAt MTQ1Nyw2ICsxNDcwLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUo dQogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2VzcygpLT53ZWJGcmFtZShmcmFtZUlE KTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAorICAgIGNsZWFyTG9hZERlcGVuZGVudENh bGxiYWNrcygpOworCiAgICAgZnJhbWUtPmRpZEZhaWxMb2FkKCk7CiAKICAgICBtX2xvYWRlckNs aWVudC5kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKHRoaXMsIGZyYW1lLCBlcnJvciwgdXNl ckRhdGEuZ2V0KCkpOwpAQCAtMjQzMSw5ICsyNDQ2LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz dHJpbmdDYWxsYmFjayhjb25zdCAKICAgICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNr ID0gbV9zdHJpbmdDYWxsYmFja3MudGFrZShjYWxsYmFja0lEKTsKICAgICBpZiAoIWNhbGxiYWNr KSB7CiAgICAgICAgIC8vIEZJWE1FOiBMb2cgZXJyb3Igb3IgYXNzZXJ0LgorICAgICAgICAvLyB0 aGlzIGNhbiB2YWxpZGx5IGhhcHBlbiBpZiBhIGxvYWQgaW52YWxpZGF0ZWQgdGhlIGNhbGxiYWNr LCB0aG91Z2gKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIG1fbG9hZERlcGVuZGVudFN0 cmluZ0NhbGxiYWNrSWRzLnJlbW92ZShjYWxsYmFja0lEKTsKKwogICAgIGNhbGxiYWNrLT5wZXJm b3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUocmVzdWx0U3RyaW5nLmltcGwoKSk7CiB9CiAKQEAg LTI1NTUsNiArMjU3Myw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzRGlkQ3Jhc2goKQog ICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3ZvaWRDYWxsYmFja3MpOwogICAgIGludmFsaWRh dGVDYWxsYmFja01hcChtX2RhdGFDYWxsYmFja3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01h cChtX3N0cmluZ0NhbGxiYWNrcyk7CisgICAgbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJ ZHMuY2xlYXIoKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9zY3JpcHRWYWx1ZUNhbGxi YWNrcyk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fY29tcHV0ZWRQYWdlc0NhbGxiYWNr cyk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fdmFsaWRhdGVDb21tYW5kQ2FsbGJhY2tz KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9u IDgyMDU5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02NTYsNiArNjU2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlY29yZEF1 dG9jb3JyZWN0aW9uUmVzcG9uc2UoaW50MzJfdCByZXNwb25zZVR5cGUsIGNvbnN0IFN0cmluZyYg cmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVwbGFjZW1lbnRTdHJpbmcpOwogI2VuZGlm CiAKKyAgICB2b2lkIGNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpOworCiAgICAgUGFnZUNs aWVudCogbV9wYWdlQ2xpZW50OwogICAgIFdlYkxvYWRlckNsaWVudCBtX2xvYWRlckNsaWVudDsK ICAgICBXZWJQb2xpY3lDbGllbnQgbV9wb2xpY3lDbGllbnQ7CkBAIC02ODgsNiArNjkwLDcgQEAg cHJpdmF0ZToKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8Vm9pZENhbGxiYWNrPiA+IG1f dm9pZENhbGxiYWNrczsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8RGF0YUNhbGxiYWNr PiA+IG1fZGF0YUNhbGxiYWNrczsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8U3RyaW5n Q2FsbGJhY2s+ID4gbV9zdHJpbmdDYWxsYmFja3M7CisgICAgSGFzaFNldDx1aW50NjRfdD4gbV9s b2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHM7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVm UHRyPFNjcmlwdFZhbHVlQ2FsbGJhY2s+ID4gbV9zY3JpcHRWYWx1ZUNhbGxiYWNrczsKICAgICBI YXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8Q29tcHV0ZWRQYWdlc0NhbGxiYWNrPiA+IG1fY29tcHV0 ZWRQYWdlc0NhbGxiYWNrczsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8VmFsaWRhdGVD b21tYW5kQ2FsbGJhY2s+ID4gbV92YWxpZGF0ZUNvbW1hbmRDYWxsYmFja3M7Cg== 87272 2011-03-29 00:07:52 -0700 2011-03-29 00:21:42 -0700 Patch bug-57305-20110329000751.patch text/plain 6048 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMjAxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMjggIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXS1BhZ2VHZXRTb3VyY2VGb3JGcmFtZSBhbmQgV0tQYWdlR2V0 Q29udGVudHNBc1N0cmluZyBzaG91bGQgdGhyb3cgYW4gZXJyb3IgaW4gY2FzZSBvZiBhIHJhY2Ug d2l0aCBwYWdlIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU3MzA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzM4MDYwPiwgPHJkYXI6 Ly9wcm9ibGVtLzg3ODAxNjg+CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbG9zZSk6IENsZWFyIG1fbG9hZERl cGVuZGVudFN0cmluZ0NhbGxiYWNrSWRzCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0U291cmNlRm9yRnJhbWUpOiB0cmFjayB0aGUgY2FsbGJhY2sgYXMgbG9hZCBkZXBlbmRlbnQK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKTogZGl0 dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxs YmFja3MpOiBJbnZhbGlkYXRlIGFsbCBsb2FkIGRlcGVuZGVudCBjYWxsYmFja3MKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOiBDYWxsIGNsZWFy TG9hZERlcGVuZGVudENhbGxiYWNrcworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZEZhaWxMb2FkRm9yRnJhbWUpOiBkaXR0bworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnN0cmluZ0NhbGxiYWNrKTogUmVtb3ZlIGNhbGxiYWNrIGZyb20gbG9hZCBkZXBlbmRlbnQgc2V0 IGlmIGFwcHJvcHJpYXRlCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc0Rp ZENyYXNoKTogQ2xlYXIgbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6IEFkZCBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxs YmFja0lkcyBoYXNoIHNldC4KKwogMjAxMS0wMy0yOCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA4MjA1 OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMjMsNiArMzIzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlKCkKICAg ICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV92b2lkQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRl Q2FsbGJhY2tNYXAobV9kYXRhQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAo bV9zdHJpbmdDYWxsYmFja3MpOworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSWRz LmNsZWFyKCk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc2NyaXB0VmFsdWVDYWxsYmFj a3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2NvbXB1dGVkUGFnZXNDYWxsYmFja3Mp OwogCkBAIC0xMTE1LDYgKzExMTYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0U291cmNlRm9y RnJhbWUoV2ViCiB7CiAgICAgUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBjYWxsYmFjayA9IHBycENh bGxiYWNrOwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgp OworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSWRzLmFkZChjYWxsYmFja0lEKTsK ICAgICBtX3N0cmluZ0NhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2suZ2V0KCkpOwog ICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R2V0U291cmNlRm9yRnJhbWUo ZnJhbWUtPmZyYW1lSUQoKSwgY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKIH0KQEAgLTExMjMsNiAr MTEyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKFAKIHsKICAg ICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7CiAgICAgdWlu dDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7CisgICAgbV9sb2FkRGVw ZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMuYWRkKGNhbGxiYWNrSUQpOwogICAgIG1fc3RyaW5nQ2Fs bGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5nZXQoKSk7CiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDb250ZW50c0FzU3RyaW5nKGNhbGxiYWNrSUQpLCBt X3BhZ2VJRCk7CiB9CkBAIC0xMzk1LDYgKzEzOTgsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZEZhaWxQcm92aXNpb25hbExvYQogICAgIG1fbG9hZGVyQ2xpZW50LmRpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZSh0aGlzLCBmcmFtZSwgZXJyb3IsIHVzZXJEYXRhLmdldCgp KTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygp Cit7CisgICAgSGFzaFNldDx1aW50NjRfdD46Oml0ZXJhdG9yIGVuZCA9IG1fbG9hZERlcGVuZGVu dFN0cmluZ0NhbGxiYWNrSWRzLmVuZCgpOworICAgIGZvciAoSGFzaFNldDx1aW50NjRfdD46Oml0 ZXJhdG9yIGl0ID0gbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMuYmVnaW4oKTsgaXQg IT0gZW5kOyArK2l0KSB7CisgICAgICAgIFJlZlB0cjxTdHJpbmdDYWxsYmFjaz4gY2FsbGJhY2sg PSBtX3N0cmluZ0NhbGxiYWNrcy50YWtlKCppdCk7CisgICAgICAgIGNhbGxiYWNrLT5pbnZhbGlk YXRlKCk7CisgICAgfQorICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSWRzLmNsZWFy KCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgYm9vbCBmcmFtZUhhc0N1c3RvbVJl cHJlc2VudGF0aW9uLCBjb25zdCBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJ bmZvLCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAgICBSZWZQdHI8 QVBJT2JqZWN0PiB1c2VyRGF0YTsKQEAgLTE0MDksNiArMTQyMiw4IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHBy b2Nlc3MoKS0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAK KyAgICBjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKTsKKwogICAgIGZyYW1lLT5kaWRDb21t aXRMb2FkKG1pbWVUeXBlLCBjZXJ0aWZpY2F0ZUluZm8pOwogCiAgICAgaWYgKGZyYW1lLT5pc01h aW5GcmFtZSgpKSB7CkBAIC0xNDU3LDYgKzE0NzIsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk RmFpbExvYWRGb3JGcmFtZSh1CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBwcm9jZXNzKCkt PndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCisgICAgY2xl YXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tzKCk7CisKICAgICBmcmFtZS0+ZGlkRmFpbExvYWQoKTsK IAogICAgIG1fbG9hZGVyQ2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUodGhpcywg ZnJhbWUsIGVycm9yLCB1c2VyRGF0YS5nZXQoKSk7CkBAIC0yNDMxLDkgKzI0NDgsMTIgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnN0cmluZ0NhbGxiYWNrKGNvbnN0IAogICAgIFJlZlB0cjxTdHJpbmdD YWxsYmFjaz4gY2FsbGJhY2sgPSBtX3N0cmluZ0NhbGxiYWNrcy50YWtlKGNhbGxiYWNrSUQpOwog ICAgIGlmICghY2FsbGJhY2spIHsKICAgICAgICAgLy8gRklYTUU6IExvZyBlcnJvciBvciBhc3Nl cnQuCisgICAgICAgIC8vIHRoaXMgY2FuIHZhbGlkbHkgaGFwcGVuIGlmIGEgbG9hZCBpbnZhbGlk YXRlZCB0aGUgY2FsbGJhY2ssIHRob3VnaAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg bV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJZHMucmVtb3ZlKGNhbGxiYWNrSUQpOworCiAg ICAgY2FsbGJhY2stPnBlcmZvcm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShyZXN1bHRTdHJpbmcu aW1wbCgpKTsKIH0KIApAQCAtMjU1NSw2ICsyNTc1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnBy b2Nlc3NEaWRDcmFzaCgpCiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fdm9pZENhbGxiYWNr cyk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fZGF0YUNhbGxiYWNrcyk7CiAgICAgaW52 YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc3RyaW5nQ2FsbGJhY2tzKTsKKyAgICBtX2xvYWREZXBlbmRl bnRTdHJpbmdDYWxsYmFja0lkcy5jbGVhcigpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcCht X3NjcmlwdFZhbHVlQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9jb21w dXRlZFBhZ2VzQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV92YWxpZGF0 ZUNvbW1hbmRDYWxsYmFja3MpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAkocmV2aXNpb24gODIwNTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTY1Niw2ICs2NTYsOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgcmVjb3JkQXV0b2NvcnJlY3Rpb25SZXNwb25zZShpbnQzMl90IHJlc3BvbnNlVHlw ZSwgY29uc3QgU3RyaW5nJiByZXBsYWNlZFN0cmluZywgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVu dFN0cmluZyk7CiAjZW5kaWYKIAorICAgIHZvaWQgY2xlYXJMb2FkRGVwZW5kZW50Q2FsbGJhY2tz KCk7CisKICAgICBQYWdlQ2xpZW50KiBtX3BhZ2VDbGllbnQ7CiAgICAgV2ViTG9hZGVyQ2xpZW50 IG1fbG9hZGVyQ2xpZW50OwogICAgIFdlYlBvbGljeUNsaWVudCBtX3BvbGljeUNsaWVudDsKQEAg LTY4OCw2ICs2OTAsNyBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxW b2lkQ2FsbGJhY2s+ID4gbV92b2lkQ2FsbGJhY2tzOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJl ZlB0cjxEYXRhQ2FsbGJhY2s+ID4gbV9kYXRhQ2FsbGJhY2tzOwogICAgIEhhc2hNYXA8dWludDY0 X3QsIFJlZlB0cjxTdHJpbmdDYWxsYmFjaz4gPiBtX3N0cmluZ0NhbGxiYWNrczsKKyAgICBIYXNo U2V0PHVpbnQ2NF90PiBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxsYmFja0lkczsKICAgICBIYXNo TWFwPHVpbnQ2NF90LCBSZWZQdHI8U2NyaXB0VmFsdWVDYWxsYmFjaz4gPiBtX3NjcmlwdFZhbHVl Q2FsbGJhY2tzOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxDb21wdXRlZFBhZ2VzQ2Fs bGJhY2s+ID4gbV9jb21wdXRlZFBhZ2VzQ2FsbGJhY2tzOwogICAgIEhhc2hNYXA8dWludDY0X3Qs IFJlZlB0cjxWYWxpZGF0ZUNvbW1hbmRDYWxsYmFjaz4gPiBtX3ZhbGlkYXRlQ29tbWFuZENhbGxi YWNrczsK 87273 2011-03-29 00:21:45 -0700 2011-03-29 00:22:31 -0700 Patch bug-57305-20110329002144.patch text/plain 6077 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMjAxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMjggIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXS1BhZ2VHZXRTb3VyY2VGb3JGcmFtZSBhbmQgV0tQYWdlR2V0 Q29udGVudHNBc1N0cmluZyBzaG91bGQgdGhyb3cgYW4gZXJyb3IgaW4gY2FzZSBvZiBhIHJhY2Ug d2l0aCBwYWdlIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU3MzA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NzM4MDYwPiwgPHJkYXI6 Ly9wcm9ibGVtLzg3ODAxNjg+CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbG9zZSk6IENsZWFyIG1fbG9hZERl cGVuZGVudFN0cmluZ0NhbGxiYWNrSURzCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0U291cmNlRm9yRnJhbWUpOiB0cmFjayB0aGUgY2FsbGJhY2sgYXMgbG9hZCBkZXBlbmRlbnQK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKTogZGl0 dG8KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjbGVhckxvYWREZXBlbmRlbnRDYWxs YmFja3MpOiBJbnZhbGlkYXRlIGFsbCBsb2FkIGRlcGVuZGVudCBjYWxsYmFja3MKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOiBDYWxsIGNsZWFy TG9hZERlcGVuZGVudENhbGxiYWNrcworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp ZEZhaWxMb2FkRm9yRnJhbWUpOiBkaXR0bworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnN0cmluZ0NhbGxiYWNrKTogUmVtb3ZlIGNhbGxiYWNrIGZyb20gbG9hZCBkZXBlbmRlbnQgc2V0 IGlmIGFwcHJvcHJpYXRlCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc0Rp ZENyYXNoKTogQ2xlYXIgbV9sb2FkRGVwZW5kZW50U3RyaW5nQ2FsbGJhY2tJRHMKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6IEFkZCBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxs YmFja0lEcyBoYXNoIHNldC4KKwogMjAxMS0wMy0yOCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJv Z2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA4MjA1 OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMjMsNiArMzIzLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlKCkKICAg ICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV92b2lkQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRl Q2FsbGJhY2tNYXAobV9kYXRhQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAo bV9zdHJpbmdDYWxsYmFja3MpOworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSURz LmNsZWFyKCk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc2NyaXB0VmFsdWVDYWxsYmFj a3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX2NvbXB1dGVkUGFnZXNDYWxsYmFja3Mp OwogCkBAIC0xMTE1LDYgKzExMTYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0U291cmNlRm9y RnJhbWUoV2ViCiB7CiAgICAgUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBjYWxsYmFjayA9IHBycENh bGxiYWNrOwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgp OworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSURzLmFkZChjYWxsYmFja0lEKTsK ICAgICBtX3N0cmluZ0NhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2suZ2V0KCkpOwog ICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R2V0U291cmNlRm9yRnJhbWUo ZnJhbWUtPmZyYW1lSUQoKSwgY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKIH0KQEAgLTExMjMsNiAr MTEyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRDb250ZW50c0FzU3RyaW5nKFAKIHsKICAg ICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7CiAgICAgdWlu dDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7CisgICAgbV9sb2FkRGVw ZW5kZW50U3RyaW5nQ2FsbGJhY2tJRHMuYWRkKGNhbGxiYWNrSUQpOwogICAgIG1fc3RyaW5nQ2Fs bGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5nZXQoKSk7CiAgICAgcHJvY2VzcygpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDb250ZW50c0FzU3RyaW5nKGNhbGxiYWNrSUQpLCBt X3BhZ2VJRCk7CiB9CkBAIC0xMzk1LDYgKzEzOTgsMTkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRp ZEZhaWxQcm92aXNpb25hbExvYQogICAgIG1fbG9hZGVyQ2xpZW50LmRpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZSh0aGlzLCBmcmFtZSwgZXJyb3IsIHVzZXJEYXRhLmdldCgp KTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygp Cit7CisgICAgVmVjdG9yPHVpbnQ2NF90PiBjYWxsYmFja0lEc0NvcHk7CisgICAgY29weVRvVmVj dG9yKG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSURzLCBjYWxsYmFja0lEc0NvcHkpOwor ICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSURzLmNsZWFyKCk7CisKKyAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGNhbGxiYWNrSURzQ29weS5zaXplKCk7ICsraSkgeworICAgICAg ICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gbV9zdHJpbmdDYWxsYmFja3MudGFr ZShjYWxsYmFja0lEc0NvcHlbaV0pOworICAgICAgICBpZiAoY2FsbGJhY2spCisgICAgICAgICAg ICBjYWxsYmFjay0+aW52YWxpZGF0ZSgpOworICAgIH0KK30KKwogdm9pZCBXZWJQYWdlUHJveHk6 OmRpZENvbW1pdExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBib29sIGZyYW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb24sIGNvbnN0IFBsYXRmb3Jt Q2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZpY2F0ZUluZm8sIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rl ciogYXJndW1lbnRzKQogewogICAgIFJlZlB0cjxBUElPYmplY3Q+IHVzZXJEYXRhOwpAQCAtMTQw OSw2ICsxNDI1LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZQog ICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gcHJvY2VzcygpLT53ZWJGcmFtZShmcmFtZUlEKTsK ICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAorICAgIGNsZWFyTG9hZERlcGVuZGVudENhbGxi YWNrcygpOworCiAgICAgZnJhbWUtPmRpZENvbW1pdExvYWQobWltZVR5cGUsIGNlcnRpZmljYXRl SW5mbyk7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpIHsKQEAgLTE0NTcsNiArMTQ3 NSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKHUKICAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3MoKS0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVT U0FHRV9DSEVDSyhmcmFtZSk7CiAKKyAgICBjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKTsK KwogICAgIGZyYW1lLT5kaWRGYWlsTG9hZCgpOwogCiAgICAgbV9sb2FkZXJDbGllbnQuZGlkRmFp bExvYWRXaXRoRXJyb3JGb3JGcmFtZSh0aGlzLCBmcmFtZSwgZXJyb3IsIHVzZXJEYXRhLmdldCgp KTsKQEAgLTI0MzEsOSArMjQ1MSwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3RyaW5nQ2FsbGJh Y2soY29uc3QgCiAgICAgUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiBjYWxsYmFjayA9IG1fc3RyaW5n Q2FsbGJhY2tzLnRha2UoY2FsbGJhY2tJRCk7CiAgICAgaWYgKCFjYWxsYmFjaykgewogICAgICAg ICAvLyBGSVhNRTogTG9nIGVycm9yIG9yIGFzc2VydC4KKyAgICAgICAgLy8gdGhpcyBjYW4gdmFs aWRseSBoYXBwZW4gaWYgYSBsb2FkIGludmFsaWRhdGVkIHRoZSBjYWxsYmFjaywgdGhvdWdoCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBtX2xvYWREZXBlbmRlbnRTdHJpbmdDYWxsYmFj a0lEcy5yZW1vdmUoY2FsbGJhY2tJRCk7CisKICAgICBjYWxsYmFjay0+cGVyZm9ybUNhbGxiYWNr V2l0aFJldHVyblZhbHVlKHJlc3VsdFN0cmluZy5pbXBsKCkpOwogfQogCkBAIC0yNTU1LDYgKzI1 NzgsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNoKCkKICAgICBpbnZhbGlk YXRlQ2FsbGJhY2tNYXAobV92b2lkQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tN YXAobV9kYXRhQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJhY2tNYXAobV9zdHJpbmdD YWxsYmFja3MpOworICAgIG1fbG9hZERlcGVuZGVudFN0cmluZ0NhbGxiYWNrSURzLmNsZWFyKCk7 CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc2NyaXB0VmFsdWVDYWxsYmFja3MpOwogICAg IGludmFsaWRhdGVDYWxsYmFja01hcChtX2NvbXB1dGVkUGFnZXNDYWxsYmFja3MpOwogICAgIGlu dmFsaWRhdGVDYWxsYmFja01hcChtX3ZhbGlkYXRlQ29tbWFuZENhbGxiYWNrcyk7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4MjA1OSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpA QCAtNjU2LDYgKzY1Niw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZWNvcmRBdXRvY29ycmVjdGlv blJlc3BvbnNlKGludDMyX3QgcmVzcG9uc2VUeXBlLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VkU3Ry aW5nLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VtZW50U3RyaW5nKTsKICNlbmRpZgogCisgICAgdm9p ZCBjbGVhckxvYWREZXBlbmRlbnRDYWxsYmFja3MoKTsKKwogICAgIFBhZ2VDbGllbnQqIG1fcGFn ZUNsaWVudDsKICAgICBXZWJMb2FkZXJDbGllbnQgbV9sb2FkZXJDbGllbnQ7CiAgICAgV2ViUG9s aWN5Q2xpZW50IG1fcG9saWN5Q2xpZW50OwpAQCAtNjg4LDYgKzY5MCw3IEBAIHByaXZhdGU6CiAg ICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFZvaWRDYWxsYmFjaz4gPiBtX3ZvaWRDYWxsYmFj a3M7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPERhdGFDYWxsYmFjaz4gPiBtX2RhdGFD YWxsYmFja3M7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFN0cmluZ0NhbGxiYWNrPiA+ IG1fc3RyaW5nQ2FsbGJhY2tzOworICAgIEhhc2hTZXQ8dWludDY0X3Q+IG1fbG9hZERlcGVuZGVu dFN0cmluZ0NhbGxiYWNrSURzOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxTY3JpcHRW YWx1ZUNhbGxiYWNrPiA+IG1fc2NyaXB0VmFsdWVDYWxsYmFja3M7CiAgICAgSGFzaE1hcDx1aW50 NjRfdCwgUmVmUHRyPENvbXB1dGVkUGFnZXNDYWxsYmFjaz4gPiBtX2NvbXB1dGVkUGFnZXNDYWxs YmFja3M7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFZhbGlkYXRlQ29tbWFuZENhbGxi YWNrPiA+IG1fdmFsaWRhdGVDb21tYW5kQ2FsbGJhY2tzOwo=