51510 2010-12-22 17:20:55 -0800 WebKit2 needs a way to return the main resource data 2010-12-22 17:46:21 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 325813 0 darin 2010-12-22 17:20:55 -0800 WebKit2 needs a way to return the main resource data 325815 1 77284 darin 2010-12-22 17:25:19 -0800 Created attachment 77284 Patch 325818 2 77284 andersca 2010-12-22 17:37:14 -0800 Comment on attachment 77284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77284&action=review > WebKit2/WebProcess/WebPage/WebPage.cpp:952 > + if (RefPtr<SharedBuffer> buffer = loader->mainResourceData()) It would be better to move the RefPtr<SharedBuffer> declaration out so that it has the same scope as the dataReference object itself. 325821 3 darin 2010-12-22 17:46:21 -0800 Committed r74527: <http://trac.webkit.org/changeset/74527> 77284 2010-12-22 17:25:19 -0800 2010-12-22 17:37:14 -0800 Patch bug-51510-20101222172517.patch text/plain 16712 darin SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDUyNCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDEgQEAKKzIwMTAtMTItMjIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktp dDIgbmVlZHMgYSB3YXkgdG8gcmV0dXJuIHRoZSBtYWluIHJlc291cmNlIGRhdGEKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNTEwCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5jcHA6CisgICAgICAgIChXS0ZyYW1lR2V0TWFpblJl c291cmNlRGF0YSk6IEFkZGVkLgorICAgICAgICAoY2FsbEdldE1haW5SZXNvdXJjZURhdGFCbG9j a0FuZERpc3Bvc2UpOiBBZGRlZC4KKyAgICAgICAgKFdLRnJhbWVHZXRNYWluUmVzb3VyY2VEYXRh X2IpOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oOiBBZGRlZCBX S0ZyYW1lR2V0TWFpblJlc291cmNlRGF0YS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFt ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQcm94eTo6Z2V0TWFpblJlc291 cmNlRGF0YSk6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5Lmg6IERp dHRvLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2V0TWFpblJlc291cmNlRGF0YU9mRnJhbWUpOiBBZGRlZC4K KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkYXRhQ2FsbGJhY2spOiBSZXBsYWNlZCB0 aGUgaW5kaXZpZHVhbCBjYWxsYmFja3MKKyAgICAgICAgd2l0aCBqdXN0IHRoZXNlIHR3by4KKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzdHJpbmdDYWxsYmFjayk6IERpdHRvLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDogRGl0dG8uCisgICAgICAgICogVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjogRGl0dG8uCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJ1bkph dmFTY3JpcHRJbk1haW5GcmFtZSk6IFNlbmQgdGhlIHN0cmluZyBjYWxsYmFjaworICAgICAgICBt ZXNzYWdlIGluc3RlYWQgb2YgYSBzcGVjaWZpYyBvbmUuCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmdldENvbnRlbnRzQXNTdHJpbmcpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6Z2V0UmVuZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb24pOiBEaXR0by4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6Z2V0U2VsZWN0aW9uT3JDb250ZW50c0FzU3RyaW5nKTogRGl0dG8u CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldFNvdXJjZUZvckZyYW1lKTogRGl0dG8uCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1lKTogQWRk ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldFdlYkFyY2hpdmVPZkZyYW1lKTogU2Vu ZCB0aGUgZGF0YSBjYWxsYmFjayBtZXNzYWdlCisgICAgICAgIGluc3RlYWQgb2YgYSBzcGVjaWZp YyBvbmUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDogQWRkZWQgZ2V0 TWFpblJlc291cmNlRGF0YU9mRnJhbWUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW46IERpdHRvLgorCiAyMDEwLTEyLTIyICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KIAogICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDogQWRkICNpZiB0byB0cnkgdG8gZml4IG5vbi1NYWMgYnVpbGRzLgpJbmRleDogV2ViS2l0Mi9V SVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nl c3MvV2ViRnJhbWVQcm94eS5jcHAJKHJldmlzaW9uIDc0NTIxKQorKysgV2ViS2l0Mi9VSVByb2Nl c3MvV2ViRnJhbWVQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNCw0ICsyMDQsMTQgQEAg dm9pZCBXZWJGcmFtZVByb3h5OjpnZXRXZWJBcmNoaXZlKFBhc3NSZQogICAgIG1fcGFnZS0+Z2V0 V2ViQXJjaGl2ZU9mRnJhbWUodGhpcywgY2FsbGJhY2spOwogfQogCit2b2lkIFdlYkZyYW1lUHJv eHk6OmdldE1haW5SZXNvdXJjZURhdGEoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+IGNhbGxiYWNr KQoreworICAgIGlmICghbV9wYWdlKSB7CisgICAgICAgIGNhbGxiYWNrLT5pbnZhbGlkYXRlKCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX3BhZ2UtPmdldE1haW5SZXNvdXJjZURh dGFPZkZyYW1lKHRoaXMsIGNhbGxiYWNrKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cklu ZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCShyZXZpc2lvbiA3NDUyMSkKKysrIFdlYktp dDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcs NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0Rpc3BsYXlpbmdNYXJrdXBEb2N1bWVudCgpIGNvbnN0 OwogCiAgICAgdm9pZCBnZXRXZWJBcmNoaXZlKFBhc3NSZWZQdHI8RGF0YUNhbGxiYWNrPik7Cisg ICAgdm9pZCBnZXRNYWluUmVzb3VyY2VEYXRhKFBhc3NSZWZQdHI8RGF0YUNhbGxiYWNrPik7CiAK ICAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkKGNvbnN0IFN0cmluZyYgdXJsKTsKICAg ICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZChjb25zdCBT dHJpbmcmIHVybCk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9u IDc0NTIxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtODIxLDYgKzgyMSwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0U2VsZWN0aW9u T3JDb250ZW50CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRTZWxl Y3Rpb25PckNvbnRlbnRzQXNTdHJpbmcoY2FsbGJhY2tJRCksIG1fcGFnZUlEKTsKIH0KIAordm9p ZCBXZWJQYWdlUHJveHk6OmdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1lKFdlYkZyYW1lUHJveHkq IGZyYW1lLCBQYXNzUmVmUHRyPERhdGFDYWxsYmFjaz4gcHJwQ2FsbGJhY2spCit7CisgICAgUmVm UHRyPERhdGFDYWxsYmFjaz4gY2FsbGJhY2sgPSBwcnBDYWxsYmFjazsKKyAgICB1aW50NjRfdCBj YWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKKyAgICBtX2RhdGFDYWxsYmFja3Mu c2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLmdldCgpKTsKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVz c2FnZXM6OldlYlBhZ2U6OkdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1lKGZyYW1lLT5mcmFtZUlE KCksIGNhbGxiYWNrSUQpLCBtX3BhZ2VJRCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRX ZWJBcmNoaXZlT2ZGcmFtZShXZWJGcmFtZVByb3h5KiBmcmFtZSwgUGFzc1JlZlB0cjxEYXRhQ2Fs bGJhY2s+IHBycENhbGxiYWNrKQogewogICAgIFJlZlB0cjxEYXRhQ2FsbGJhY2s+IGNhbGxiYWNr ID0gcHJwQ2FsbGJhY2s7CkBAIC0xNzEzLDUxICsxNzIxLDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRSZWNlaXZlRXZlbnQodWludDMKICAgICB9CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpk aWRHZXRDb250ZW50c0FzU3RyaW5nKGNvbnN0IFN0cmluZyYgcmVzdWx0U3RyaW5nLCB1aW50NjRf dCBjYWxsYmFja0lEKQotewotICAgIFJlZlB0cjxTdHJpbmdDYWxsYmFjaz4gY2FsbGJhY2sgPSBt X3N0cmluZ0NhbGxiYWNrcy50YWtlKGNhbGxiYWNrSUQpOwotICAgIGlmICghY2FsbGJhY2spIHsK LSAgICAgICAgLy8gRklYTUU6IExvZyBlcnJvciBvciBhc3NlcnQuCi0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICBjYWxsYmFjay0+cGVyZm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKHJl c3VsdFN0cmluZy5pbXBsKCkpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkR2V0U2VsZWN0 aW9uT3JDb250ZW50c0FzU3RyaW5nKGNvbnN0IFN0cmluZyYgcmVzdWx0U3RyaW5nLCB1aW50NjRf dCBjYWxsYmFja0lEKQotewotICAgIFJlZlB0cjxTdHJpbmdDYWxsYmFjaz4gY2FsbGJhY2sgPSBt X3N0cmluZ0NhbGxiYWNrcy50YWtlKGNhbGxiYWNrSUQpOwotICAgIGlmICghY2FsbGJhY2spIHsK LSAgICAgICAgLy8gRklYTUU6IExvZyBlcnJvciBvciBhc3NlcnQuCi0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICBjYWxsYmFjay0+cGVyZm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKHJl c3VsdFN0cmluZy5pbXBsKCkpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUnVuSmF2YVNj cmlwdEluTWFpbkZyYW1lKGNvbnN0IFN0cmluZyYgcmVzdWx0U3RyaW5nLCB1aW50NjRfdCBjYWxs YmFja0lEKQordm9pZCBXZWJQYWdlUHJveHk6OmRhdGFDYWxsYmFjayhjb25zdCBDb3JlSVBDOjpE YXRhUmVmZXJlbmNlJiBkYXRhUmVmZXJlbmNlLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAg IFJlZlB0cjxTdHJpbmdDYWxsYmFjaz4gY2FsbGJhY2sgPSBtX3N0cmluZ0NhbGxiYWNrcy50YWtl KGNhbGxiYWNrSUQpOworICAgIFJlZlB0cjxEYXRhQ2FsbGJhY2s+IGNhbGxiYWNrID0gbV9kYXRh Q2FsbGJhY2tzLnRha2UoY2FsbGJhY2tJRCk7CiAgICAgaWYgKCFjYWxsYmFjaykgewogICAgICAg ICAvLyBGSVhNRTogTG9nIGVycm9yIG9yIGFzc2VydC4KICAgICAgICAgcmV0dXJuOwogICAgIH0K IAotICAgIGNhbGxiYWNrLT5wZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUocmVzdWx0U3Ry aW5nLmltcGwoKSk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRHZXRSZW5kZXJUcmVlRXh0 ZXJuYWxSZXByZXNlbnRhdGlvbihjb25zdCBTdHJpbmcmIHJlc3VsdFN0cmluZywgdWludDY0X3Qg Y2FsbGJhY2tJRCkKLXsKLSAgICBSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+IGNhbGxiYWNrID0gbV9z dHJpbmdDYWxsYmFja3MudGFrZShjYWxsYmFja0lEKTsKLSAgICBpZiAoIWNhbGxiYWNrKSB7Ci0g ICAgICAgIC8vIEZJWE1FOiBMb2cgZXJyb3Igb3IgYXNzZXJ0LgotICAgICAgICByZXR1cm47Ci0g ICAgfQorICAgIFJlZlB0cjxXZWJEYXRhPiBkYXRhOworICAgIGlmIChzaXplX3Qgc2l6ZSA9IGRh dGFSZWZlcmVuY2Uuc2l6ZSgpKQorICAgICAgICBkYXRhID0gV2ViRGF0YTo6Y3JlYXRlKGRhdGFS ZWZlcmVuY2UuZGF0YSgpLCBzaXplKTsKIAotICAgIGNhbGxiYWNrLT5wZXJmb3JtQ2FsbGJhY2tX aXRoUmV0dXJuVmFsdWUocmVzdWx0U3RyaW5nLmltcGwoKSk7CisgICAgY2FsbGJhY2stPnBlcmZv cm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShkYXRhLmdldCgpKTsKIH0KIAotdm9pZCBXZWJQYWdl UHJveHk6OmRpZEdldFNvdXJjZUZvckZyYW1lKGNvbnN0IFN0cmluZyYgcmVzdWx0U3RyaW5nLCB1 aW50NjRfdCBjYWxsYmFja0lEKQordm9pZCBXZWJQYWdlUHJveHk6OnN0cmluZ0NhbGxiYWNrKGNv bnN0IFN0cmluZyYgcmVzdWx0U3RyaW5nLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewogICAgIFJl ZlB0cjxTdHJpbmdDYWxsYmFjaz4gY2FsbGJhY2sgPSBtX3N0cmluZ0NhbGxiYWNrcy50YWtlKGNh bGxiYWNrSUQpOwogICAgIGlmICghY2FsbGJhY2spIHsKQEAgLTE3NjgsMjEgKzE3NDcsNiBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkR2V0U291cmNlRm9yRnJhbWUoCiAgICAgY2FsbGJhY2stPnBl cmZvcm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShyZXN1bHRTdHJpbmcuaW1wbCgpKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OmRpZEdldFdlYkFyY2hpdmVPZkZyYW1lKGNvbnN0IENvcmVJUEM6 OkRhdGFSZWZlcmVuY2UmIGRhdGFSZWZlcmVuY2UsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCi17Ci0g ICAgUmVmUHRyPERhdGFDYWxsYmFjaz4gY2FsbGJhY2sgPSBtX2RhdGFDYWxsYmFja3MudGFrZShj YWxsYmFja0lEKTsKLSAgICBpZiAoIWNhbGxiYWNrKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBMb2cg ZXJyb3Igb3IgYXNzZXJ0LgotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgUmVmUHRyPFdl YkRhdGE+IGRhdGE7Ci0gICAgaWYgKHNpemVfdCBzaXplID0gZGF0YVJlZmVyZW5jZS5zaXplKCkp Ci0gICAgICAgIGRhdGEgPSBXZWJEYXRhOjpjcmVhdGUoZGF0YVJlZmVyZW5jZS5kYXRhKCksIHNp emUpOwotCi0gICAgY2FsbGJhY2stPnBlcmZvcm1DYWxsYmFja1dpdGhSZXR1cm5WYWx1ZShkYXRh LmdldCgpKTsKLX0KLQogdm9pZCBXZWJQYWdlUHJveHk6OmZvY3VzZWRGcmFtZUNoYW5nZWQodWlu dDY0X3QgZnJhbWVJRCkKIHsKICAgICBtX2ZvY3VzZWRGcmFtZSA9IGZyYW1lSUQgPyBwcm9jZXNz KCktPndlYkZyYW1lKGZyYW1lSUQpIDogMDsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CShyZXZpc2lvbiA3NDUyMSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yMzcsMTIgKzIzNywxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBoaWRl RmluZFVJKCk7CiAgICAgdm9pZCBjb3VudFN0cmluZ01hdGNoZXMoY29uc3QgU3RyaW5nJiwgRmlu ZE9wdGlvbnMsIHVuc2lnbmVkIG1heE1hdGNoQ291bnQpOwogCi0gICAgdm9pZCBydW5KYXZhU2Ny aXB0SW5NYWluRnJhbWUoY29uc3QgU3RyaW5nJiwgUGFzc1JlZlB0cjxTdHJpbmdDYWxsYmFjaz4p OwotICAgIHZvaWQgZ2V0UmVuZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb24oUGFzc1JlZlB0 cjxTdHJpbmdDYWxsYmFjaz4pOwotICAgIHZvaWQgZ2V0U291cmNlRm9yRnJhbWUoV2ViRnJhbWVQ cm94eSosIFBhc3NSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+KTsKICAgICB2b2lkIGdldENvbnRlbnRz QXNTdHJpbmcoUGFzc1JlZlB0cjxTdHJpbmdDYWxsYmFjaz4pOworICAgIHZvaWQgZ2V0TWFpblJl c291cmNlRGF0YU9mRnJhbWUoV2ViRnJhbWVQcm94eSosIFBhc3NSZWZQdHI8RGF0YUNhbGxiYWNr Pik7CisgICAgdm9pZCBnZXRSZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbihQYXNzUmVm UHRyPFN0cmluZ0NhbGxiYWNrPik7CiAgICAgdm9pZCBnZXRTZWxlY3Rpb25PckNvbnRlbnRzQXNT dHJpbmcoUGFzc1JlZlB0cjxTdHJpbmdDYWxsYmFjaz4pOworICAgIHZvaWQgZ2V0U291cmNlRm9y RnJhbWUoV2ViRnJhbWVQcm94eSosIFBhc3NSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+KTsKICAgICB2 b2lkIGdldFdlYkFyY2hpdmVPZkZyYW1lKFdlYkZyYW1lUHJveHkqLCBQYXNzUmVmUHRyPERhdGFD YWxsYmFjaz4pOworICAgIHZvaWQgcnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKGNvbnN0IFN0cmlu ZyYsIFBhc3NSZWZQdHI8U3RyaW5nQ2FsbGJhY2s+KTsKIAogICAgIHZvaWQgcmVjZWl2ZWRQb2xp Y3lEZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb24sIFdlYkZyYW1lUHJveHkqLCB1aW50NjRf dCBsaXN0ZW5lcklEKTsKIApAQCAtNDI1LDEyICs0MjYsOCBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCBkaWRSZWNlaXZlRXZlbnQodWludDMyX3Qgb3BhcXVlVHlwZSwgYm9vbCBoYW5kbGVkKTsKIAot ICAgIHZvaWQgZGlkR2V0Q29udGVudHNBc1N0cmluZyhjb25zdCBTdHJpbmcmLCB1aW50NjRfdCk7 Ci0gICAgdm9pZCBkaWRHZXRSZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbihjb25zdCBT dHJpbmcmLCB1aW50NjRfdCk7Ci0gICAgdm9pZCBkaWRHZXRTZWxlY3Rpb25PckNvbnRlbnRzQXNT dHJpbmcoY29uc3QgU3RyaW5nJiwgdWludDY0X3QpOwotICAgIHZvaWQgZGlkR2V0U291cmNlRm9y RnJhbWUoY29uc3QgU3RyaW5nJiwgdWludDY0X3QpOwotICAgIHZvaWQgZGlkR2V0V2ViQXJjaGl2 ZU9mRnJhbWUoY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYsIHVpbnQ2NF90KTsKLSAgICB2 b2lkIGRpZFJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShjb25zdCBTdHJpbmcmLCB1aW50NjRfdCk7 CisgICAgdm9pZCBkYXRhQ2FsbGJhY2soY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYsIHVp bnQ2NF90KTsKKyAgICB2b2lkIHN0cmluZ0NhbGxiYWNrKGNvbnN0IFN0cmluZyYsIHVpbnQ2NF90 KTsKIAogICAgIHZvaWQgZm9jdXNlZEZyYW1lQ2hhbmdlZCh1aW50NjRfdCBmcmFtZUlEKTsKIApJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNp b24gNzQ1MjEpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4J KHdvcmtpbmcgY29weSkKQEAgLTEwOCwxMiArMTA4LDggQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVBy b3h5IHsKICAgICBXaWxsU3VibWl0Rm9ybSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBzb3Vy Y2VGcmFtZUlELCBXZWJLaXQ6OlN0cmluZ1BhaXJWZWN0b3IgdGV4dEZpZWxkVmFsdWVzLCB1aW50 NjRfdCBsaXN0ZW5lcklELCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVy IHVzZXJEYXRhKQogCiAgICAgIyBDYWxsYmFjayBtZXNzYWdlcy4KLSAgICBEaWRHZXRDb250ZW50 c0FzU3RyaW5nKFdURjo6U3RyaW5nIHJlc3VsdFN0cmluZywgdWludDY0X3QgY2FsbGJhY2tJRCkK LSAgICBEaWRHZXRTZWxlY3Rpb25PckNvbnRlbnRzQXNTdHJpbmcoV1RGOjpTdHJpbmcgcmVzdWx0 U3RyaW5nLCB1aW50NjRfdCBjYWxsYmFja0lEKQotICAgIERpZEdldFJlbmRlclRyZWVFeHRlcm5h bFJlcHJlc2VudGF0aW9uKFdURjo6U3RyaW5nIHJlc3VsdFN0cmluZywgdWludDY0X3QgY2FsbGJh Y2tJRCkKLSAgICBEaWRHZXRTb3VyY2VGb3JGcmFtZShXVEY6OlN0cmluZyByZXN1bHRTdHJpbmcs IHVpbnQ2NF90IGNhbGxiYWNrSUQpCi0gICAgRGlkR2V0V2ViQXJjaGl2ZU9mRnJhbWUoQ29yZUlQ Qzo6RGF0YVJlZmVyZW5jZSBhcmNoaXZlRGF0YSwgdWludDY0X3QgY2FsbGJhY2tJRCkKLSAgICBE aWRSdW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoV1RGOjpTdHJpbmcgcmVzdWx0U3RyaW5nLCB1aW50 NjRfdCBjYWxsYmFja0lEKQorICAgIERhdGFDYWxsYmFjayhDb3JlSVBDOjpEYXRhUmVmZXJlbmNl IHJlc3VsdERhdGEsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCisgICAgU3RyaW5nQ2FsbGJhY2soV1RG OjpTdHJpbmcgcmVzdWx0U3RyaW5nLCB1aW50NjRfdCBjYWxsYmFja0lEKQogCiAjaWYgUExBVEZP Uk0oTUFDKQogICAgICMgS2V5Ym9hcmQgc3VwcG9ydCBtZXNzYWdlcy4KSW5kZXg6IFdlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLRnJhbWUuY3BwCShyZXZpc2lvbiA3NDUyMSkKKysrIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNiArMTIwLDI1IEBA IGJvb2wgV0tGcmFtZUlzRnJhbWVTZXQoV0tGcmFtZVJlZiBmcmFtZVIKICAgICByZXR1cm4gdG9J bXBsKGZyYW1lUmVmKS0+aXNGcmFtZVNldCgpOwogfQogCit2b2lkIFdLRnJhbWVHZXRNYWluUmVz b3VyY2VEYXRhKFdLRnJhbWVSZWYgZnJhbWVSZWYsIFdLRnJhbWVHZXRNYWluUmVzb3VyY2VEYXRh RnVuY3Rpb24gY2FsbGJhY2ssIHZvaWQqIGNvbnRleHQpCit7CisgICAgdG9JbXBsKGZyYW1lUmVm KS0+Z2V0TWFpblJlc291cmNlRGF0YShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBjYWxs YmFjaykpOworfQorCisjaWZkZWYgX19CTE9DS1NfXworc3RhdGljIHZvaWQgY2FsbEdldE1haW5S ZXNvdXJjZURhdGFCbG9ja0FuZERpc3Bvc2UoV0tEYXRhUmVmIGRhdGEsIFdLRXJyb3JSZWYgZXJy b3IsIHZvaWQqIGNvbnRleHQpCit7CisgICAgV0tGcmFtZUdldE1haW5SZXNvdXJjZURhdGFCbG9j ayBibG9jayA9IChXS0ZyYW1lR2V0TWFpblJlc291cmNlRGF0YUJsb2NrKWNvbnRleHQ7CisgICAg YmxvY2soZGF0YSwgZXJyb3IpOworICAgIEJsb2NrX3JlbGVhc2UoYmxvY2spOworfQorCit2b2lk IFdLRnJhbWVHZXRNYWluUmVzb3VyY2VEYXRhX2IoV0tGcmFtZVJlZiBmcmFtZVJlZiwgV0tGcmFt ZUdldE1haW5SZXNvdXJjZURhdGFCbG9jayBibG9jaykKK3sKKyAgICBXS0ZyYW1lR2V0TWFpblJl c291cmNlRGF0YShmcmFtZVJlZiwgY2FsbEdldE1haW5SZXNvdXJjZURhdGFCbG9ja0FuZERpc3Bv c2UsIEJsb2NrX2NvcHkoYmxvY2spKTsKK30KKyNlbmRpZgorCiB2b2lkIFdLRnJhbWVHZXRXZWJB cmNoaXZlKFdLRnJhbWVSZWYgZnJhbWVSZWYsIFdLRnJhbWVHZXRXZWJBcmNoaXZlRnVuY3Rpb24g Y2FsbGJhY2ssIHZvaWQqIGNvbnRleHQpCiB7CiAgICAgdG9JbXBsKGZyYW1lUmVmKS0+Z2V0V2Vi QXJjaGl2ZShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBjYWxsYmFjaykpOwpJbmRleDog V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLRnJhbWUuaAkocmV2aXNpb24gNzQ1MjApCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS0ZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDEzIEBA IFdLX0VYUE9SVCBib29sIFdLRnJhbWVJc0Rpc3BsYXlpbmdNYXJrdXAKIAogV0tfRVhQT1JUIGJv b2wgV0tGcmFtZUlzRnJhbWVTZXQoV0tGcmFtZVJlZiBmcmFtZSk7CiAKK3R5cGVkZWYgdm9pZCAo KldLRnJhbWVHZXRNYWluUmVzb3VyY2VEYXRhRnVuY3Rpb24pKFdLRGF0YVJlZiBkYXRhLCBXS0Vy cm9yUmVmIGVycm9yLCB2b2lkKiBmdW5jdGlvbkNvbnRleHQpOworV0tfRVhQT1JUIHZvaWQgV0tG cmFtZUdldE1haW5SZXNvdXJjZURhdGEoV0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZUdldE1haW5S ZXNvdXJjZURhdGFGdW5jdGlvbiBmdW5jdGlvbiwgdm9pZCogZnVuY3Rpb25Db250ZXh0KTsKKyNp ZmRlZiBfX0JMT0NLU19fCit0eXBlZGVmIHZvaWQgKF5XS0ZyYW1lR2V0TWFpblJlc291cmNlRGF0 YUJsb2NrKShXS0RhdGFSZWYgZGF0YSwgV0tFcnJvclJlZiBlcnJvcik7CitXS19FWFBPUlQgdm9p ZCBXS0ZyYW1lR2V0TWFpblJlc291cmNlRGF0YV9iKFdLRnJhbWVSZWYgZnJhbWUsIFdLRnJhbWVH ZXRNYWluUmVzb3VyY2VEYXRhQmxvY2sgYmxvY2spOworI2VuZGlmCisKIHR5cGVkZWYgdm9pZCAo KldLRnJhbWVHZXRXZWJBcmNoaXZlRnVuY3Rpb24pKFdLRGF0YVJlZiBhcmNoaXZlRGF0YSwgV0tF cnJvclJlZiBlcnJvciwgdm9pZCogZnVuY3Rpb25Db250ZXh0KTsKIFdLX0VYUE9SVCB2b2lkIFdL RnJhbWVHZXRXZWJBcmNoaXZlKFdLRnJhbWVSZWYgZnJhbWUsIFdLRnJhbWVHZXRXZWJBcmNoaXZl RnVuY3Rpb24gZnVuY3Rpb24sIHZvaWQqIGZ1bmN0aW9uQ29udGV4dCk7CiAjaWZkZWYgX19CTE9D S1NfXwpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9u IDc0NTIyKQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTkxMSwxOSArOTExLDE5IEBAIHZvaWQgV2ViUGFnZTo6cnVuSmF2YVNjcmlw dEluTWFpbkZyYW1lKGMKICAgICBpZiAocmVzdWx0VmFsdWUpCiAgICAgICAgIHJlc3VsdFN0cmlu ZyA9IHVzdHJpbmdUb1N0cmluZyhyZXN1bHRWYWx1ZS50b1N0cmluZyhtX21haW5GcmFtZS0+Y29y ZUZyYW1lKCktPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QobWFpblRocmVhZE5vcm1hbFdvcmxkKCkp LT5nbG9iYWxFeGVjKCkpKTsKIAotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlk UnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKHJlc3VsdFN0cmluZywgY2FsbGJhY2tJRCkpOworICAg IHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3RyaW5nQ2FsbGJhY2socmVzdWx0U3RyaW5n LCBjYWxsYmFja0lEKSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6Z2V0Q29udGVudHNBc1N0cmluZyh1 aW50NjRfdCBjYWxsYmFja0lEKQogewogICAgIFN0cmluZyByZXN1bHRTdHJpbmcgPSBtX21haW5G cmFtZS0+Y29udGVudHNBc1N0cmluZygpOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkR2V0Q29udGVudHNBc1N0cmluZyhyZXN1bHRTdHJpbmcsIGNhbGxiYWNrSUQpKTsKKyAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlN0cmluZ0NhbGxiYWNrKHJlc3VsdFN0cmlu ZywgY2FsbGJhY2tJRCkpOwogfQogCiB2b2lkIFdlYlBhZ2U6OmdldFJlbmRlclRyZWVFeHRlcm5h bFJlcHJlc2VudGF0aW9uKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7CiAgICAgU3RyaW5nIHJlc3Vs dFN0cmluZyA9IHJlbmRlclRyZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uKCk7Ci0gICAgc2VuZChN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRHZXRSZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRh dGlvbihyZXN1bHRTdHJpbmcsIGNhbGxiYWNrSUQpKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OlN0cmluZ0NhbGxiYWNrKHJlc3VsdFN0cmluZywgY2FsbGJhY2tJRCkpOwogfQog CiB2b2lkIFdlYlBhZ2U6OmdldFNlbGVjdGlvbk9yQ29udGVudHNBc1N0cmluZyh1aW50NjRfdCBj YWxsYmFja0lEKQpAQCAtOTMxLDcgKzkzMSw3IEBAIHZvaWQgV2ViUGFnZTo6Z2V0U2VsZWN0aW9u T3JDb250ZW50c0FzU3QKICAgICBTdHJpbmcgcmVzdWx0U3RyaW5nID0gbV9tYWluRnJhbWUtPnNl bGVjdGlvbkFzU3RyaW5nKCk7CiAgICAgaWYgKHJlc3VsdFN0cmluZy5pc0VtcHR5KCkpCiAgICAg ICAgIHJlc3VsdFN0cmluZyA9IG1fbWFpbkZyYW1lLT5jb250ZW50c0FzU3RyaW5nKCk7Ci0gICAg c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRHZXRDb250ZW50c0FzU3RyaW5nKHJlc3Vs dFN0cmluZywgY2FsbGJhY2tJRCkpOworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 U3RyaW5nQ2FsbGJhY2socmVzdWx0U3RyaW5nLCBjYWxsYmFja0lEKSk7CiB9CiAKIHZvaWQgV2Vi UGFnZTo6Z2V0U291cmNlRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJh Y2tJRCkKQEAgLTk0MCw3ICs5NDAsMjEgQEAgdm9pZCBXZWJQYWdlOjpnZXRTb3VyY2VGb3JGcmFt ZSh1aW50NjRfdAogICAgIGlmIChXZWJGcmFtZSogZnJhbWUgPSBXZWJQcm9jZXNzOjpzaGFyZWQo KS53ZWJGcmFtZShmcmFtZUlEKSkKICAgICAgICByZXN1bHRTdHJpbmcgPSBmcmFtZS0+c291cmNl KCk7CiAKLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEdldFNvdXJjZUZvckZy YW1lKHJlc3VsdFN0cmluZywgY2FsbGJhY2tJRCkpOworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6U3RyaW5nQ2FsbGJhY2socmVzdWx0U3RyaW5nLCBjYWxsYmFja0lEKSk7Cit9CisK K3ZvaWQgV2ViUGFnZTo6Z2V0TWFpblJlc291cmNlRGF0YU9mRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRh dGFSZWZlcmVuY2U7CisKKyAgICBpZiAoV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2hh cmVkKCkud2ViRnJhbWUoZnJhbWVJRCkpIHsKKyAgICAgICAgaWYgKERvY3VtZW50TG9hZGVyKiBs b2FkZXIgPSBmcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKSB7 CisgICAgICAgICAgICBpZiAoUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gbG9hZGVyLT5t YWluUmVzb3VyY2VEYXRhKCkpCisgICAgICAgICAgICAgICAgZGF0YVJlZmVyZW5jZSA9IENvcmVJ UEM6OkRhdGFSZWZlcmVuY2UocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oYnVmZmVy LT5kYXRhKCkpLCBidWZmZXItPnNpemUoKSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBzZW5k KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRhdGFDYWxsYmFjayhkYXRhUmVmZXJlbmNlLCBjYWxs YmFja0lEKSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6Z2V0V2ViQXJjaGl2ZU9mRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJhY2tJRCkKQEAgLTk1Nyw3ICs5NzEsNyBAQCB2b2lk IFdlYlBhZ2U6OmdldFdlYkFyY2hpdmVPZkZyYW1lKHVpbnQ2CiAgICAgfQogI2VuZGlmCiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEdldFdlYkFyY2hpdmVPZkZyYW1lKGRh dGFSZWZlcmVuY2UsIGNhbGxiYWNrSUQpKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OkRhdGFDYWxsYmFjayhkYXRhUmVmZXJlbmNlLCBjYWxsYmFja0lEKSk7CiB9CiAKIHZvaWQg V2ViUGFnZTo6cHJlZmVyZW5jZXNEaWRDaGFuZ2UoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYg c3RvcmUpCkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA3 NDUyMSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtMzE3LDYgKzMxNyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXREcmF3c1RyYW5z cGFyZW50QmFja2dyb3VuZChib29sKTsKIAogICAgIHZvaWQgZ2V0Q29udGVudHNBc1N0cmluZyh1 aW50NjRfdCBjYWxsYmFja0lEKTsKKyAgICB2b2lkIGdldE1haW5SZXNvdXJjZURhdGFPZkZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIHZvaWQgZ2V0UmVu ZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb24odWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAg dm9pZCBnZXRTZWxlY3Rpb25PckNvbnRlbnRzQXNTdHJpbmcodWludDY0X3QgY2FsbGJhY2tJRCk7 CiAgICAgdm9pZCBnZXRTb3VyY2VGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBj YWxsYmFja0lEKTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gNzQ1MjEpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC01MCw4ICs1MCw5IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIERpZFJlY2VpdmVQb2xpY3lEZWNpc2lvbih1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBsaXN0ZW5lcklELCB1aW50MzJfdCBwb2xpY3lBY3Rpb24s IHVpbnQ2NF90IGRvd25sb2FkSUQpCiAKICAgICAjIENhbGxiYWNrcy4KLSAgICBHZXRSZW5kZXJU cmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbih1aW50NjRfdCBjYWxsYmFja0lEKQogICAgIEdldENv bnRlbnRzQXNTdHJpbmcodWludDY0X3QgY2FsbGJhY2tJRCkKKyAgICBHZXRNYWluUmVzb3VyY2VE YXRhT2ZGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBjYWxsYmFja0lEKQorICAgIEdl dFJlbmRlclRyZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAg ICAgR2V0U2VsZWN0aW9uT3JDb250ZW50c0FzU3RyaW5nKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAg ICAgR2V0U291cmNlRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJhY2tJ RCkKICAgICBHZXRXZWJBcmNoaXZlT2ZGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBj YWxsYmFja0lEKQo=