47777 2010-10-17 03:03:24 -0700 FrameLoader doesn't need an explicit userGesture parameter 2010-10-17 11:10:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue eric jnd pkasting oldest_to_newest 295206 0 abarth 2010-10-17 03:03:24 -0700 FrameLoader doesn't need an explicit userGesture parameter 295207 1 70970 abarth 2010-10-17 03:06:12 -0700 Created attachment 70970 Patch 295219 2 70970 dglazkov 2010-10-17 08:22:46 -0700 Comment on attachment 70970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70970&action=review > WebCore/loader/NavigationScheduler.cpp:@ > void NavigationScheduler::scheduleLocati Might as well remove the remaining places where wasUserGesture is passed in and yank that param out. 295220 3 70970 dglazkov 2010-10-17 08:41:12 -0700 Comment on attachment 70970 Patch I guess that could be done in follow-up patch. 295222 4 70970 commit-queue 2010-10-17 09:03:03 -0700 Comment on attachment 70970 Patch Clearing flags on attachment: 70970 Committed r69924: <http://trac.webkit.org/changeset/69924> 295223 5 commit-queue 2010-10-17 09:03:09 -0700 All reviewed patches have been landed. Closing bug. 295237 6 abarth 2010-10-17 11:10:02 -0700 (In reply to comment #2) > (From update of attachment 70970 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=70970&action=review > > > WebCore/loader/NavigationScheduler.cpp:@ > > void NavigationScheduler::scheduleLocati > > Might as well remove the remaining places where wasUserGesture is passed in and yank that param out. Yep. 70970 2010-10-17 03:06:12 -0700 2010-10-17 09:03:03 -0700 Patch bug-47777-20101017030610.patch text/plain 21062 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTkyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDEgQEAKKzIwMTAtMTAtMTcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcmFt ZUxvYWRlciBkb2Vzbid0IG5lZWQgYW4gZXhwbGljaXQgdXNlckdlc3R1cmUgcGFyYW1ldGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzc3NworCisg ICAgICAgIFdlIHVzZWQgdG8gcGFzcyBhcm91bmQgdGhlIHVzZXIgZ2VzdHVyZSBzdGF0ZSBleHBs aWNpdGx5LiAgTm93IHdlIHVzZQorICAgICAgICBzdGF0aWMgc3RhdGUuICBFeHBsaWNpdGx5IHBh c3NpbmcgdGhlIHVzZXIgZ2VzdHVyZSBzdGF0ZSB0byBGcmFtZUxvYWRlcgorICAgICAgICBpbiB0 aGVzZSBtZXRob2RzIGlzIHByZXR0eSBvdXQtZGF0ZWQuCisKKyAgICAgICAgKiBiaW5kaW5ncy9T Y3JpcHRDb250cm9sbGVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpleGVjdXRlSWZKYXZhU2NyaXB0VVJMKToKKyAgICAgICAgKiBiaW5kaW5ncy9nZW5lcmlj L0JpbmRpbmdET01XaW5kb3cuaDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6Y3JlYXRlV2luZG93KToK KyAgICAgICAgKFdlYkNvcmU6Ojo6b3Blbik6CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01X aW5kb3dDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlV2luZG93KToKKyAgICAg ICAgKFdlYkNvcmU6OkpTRE9NV2luZG93OjpvcGVuKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0RvY3VtZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRG9jdW1lbnQ6OnNldExv Y2F0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmg6CisgICAg ICAgICogYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5oOgorICAgICAgICAqIGh0bWwvSFRN TEFuY2hvckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFuZGxlTGlua0NsaWNrKToK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpvcGVuSW5JbnNwZWN0ZWRXaW5kb3cpOgorICAg ICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlcjo6Y2hhbmdlTG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnVy bFNlbGVjdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzdWJtaXRGb3JtKToK KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvTmF2aWdh dGlvblNjaGVkdWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY2hlZHVsZWRVUkxOYXZpZ2F0 aW9uOjpmaXJlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjaGVkdWxlZFJlZnJlc2g6OmZpcmUpOgor ICAgICAgICAoV2ViQ29yZTo6U2NoZWR1bGVkSGlzdG9yeU5hdmlnYXRpb246OmZpcmUpOgorICAg ICAgICAoV2ViQ29yZTo6TmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVMb2NhdGlvbkNoYW5n ZSk6CisKIDIwMTAtMTAtMTYgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFdlYkNvcmUvYmluZGlu Z3MvU2NyaXB0Q29udHJvbGxlckJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGlu Z3MvU2NyaXB0Q29udHJvbGxlckJhc2UuY3BwCShyZXZpc2lvbiA2OTkyMSkKKysrIFdlYkNvcmUv YmluZGluZ3MvU2NyaXB0Q29udHJvbGxlckJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3 ICs2Nyw3IEBAIFNjcmlwdFZhbHVlIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVTY3IKICAgICBy ZXR1cm4gcmVzdWx0OwogfQogCi1ib29sIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFT Y3JpcHRVUkwoY29uc3QgS1VSTCYgdXJsLCBib29sIHVzZXJHZXN0dXJlLCBTaG91bGRSZXBsYWNl RG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgc2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0 VVJMKQorYm9vbCBTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlSWZKYXZhU2NyaXB0VVJMKGNvbnN0 IEtVUkwmIHVybCwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHNob3VsZFJl cGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCkKIHsKICAgICBpZiAoIXByb3RvY29sSXNKYXZh U2NyaXB0KHVybCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTkwLDcgKzkwLDcgQEAgYm9v bCBTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlSWZKYXZhU2NyaQogICAgIFN0cmluZyBkZWNvZGVk VVJMID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVybC5zdHJpbmcoKSk7CiAgICAgU2NyaXB0 VmFsdWUgcmVzdWx0OwogICAgIGlmICh4c3NBdWRpdG9yKCktPmNhbkV2YWx1YXRlSmF2YVNjcmlw dFVSTChkZWNvZGVkVVJMKSkKLSAgICAgICAgcmVzdWx0ID0gZXhlY3V0ZVNjcmlwdChkZWNvZGVk VVJMLnN1YnN0cmluZyhqYXZhc2NyaXB0U2NoZW1lTGVuZ3RoKSwgdXNlckdlc3R1cmUsIEFsbG93 WFNTKTsKKyAgICAgICAgcmVzdWx0ID0gZXhlY3V0ZVNjcmlwdChkZWNvZGVkVVJMLnN1YnN0cmlu ZyhqYXZhc2NyaXB0U2NoZW1lTGVuZ3RoKSwgcHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCksIEFsbG93 WFNTKTsKIAogICAgIC8vIElmIGV4ZWN1dGluZyBzY3JpcHQgY2F1c2VkIHRoaXMgZnJhbWUgdG8g YmUgcmVtb3ZlZCBmcm9tIHRoZSBwYWdlLCB3ZQogICAgIC8vIGRvbid0IHdhbnQgdG8gdHJ5IHRv IHJlcGxhY2UgaXRzIGRvY3VtZW50IQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9nZW5lcmljL0Jp bmRpbmdET01XaW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2dlbmVyaWMv QmluZGluZ0RPTVdpbmRvdy5oCShyZXZpc2lvbiA2OTkyMSkKKysrIFdlYkNvcmUvYmluZGluZ3Mv Z2VuZXJpYy9CaW5kaW5nRE9NV2luZG93LmgJKHdvcmtpbmcgY29weSkKQEAgLTExOSwxMiArMTE5 LDEwIEBAIEZyYW1lKiBCaW5kaW5nRE9NV2luZG93PEJpbmRpbmc+OjpjcmVhdGUKICAgICBpZiAo IXByb3RvY29sSXNKYXZhU2NyaXB0KHVybCkgfHwgQmluZGluZ1NlY3VyaXR5PEJpbmRpbmc+Ojpj YW5BY2Nlc3NGcmFtZShzdGF0ZSwgbmV3RnJhbWUsIHRydWUpKSB7CiAgICAgICAgIEtVUkwgY29t cGxldGVkVXJsID0KICAgICAgICAgICAgIHVybC5pc0VtcHR5KCkgPyBLVVJMKFBhcnNlZFVSTFN0 cmluZywgIiIpIDogY29tcGxldGVVUkwoc3RhdGUsIHVybCk7Ci0gICAgICAgIGJvb2wgdXNlckdl c3R1cmUgPSBzdGF0ZS0+cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCk7Ci0KICAgICAgICAgaWYgKGNy ZWF0ZWQpCi0gICAgICAgICAgICBuZXdGcmFtZS0+bG9hZGVyKCktPmNoYW5nZUxvY2F0aW9uKGNv bXBsZXRlZFVybCwgcmVmZXJyZXIsIGZhbHNlLCBmYWxzZSwgdXNlckdlc3R1cmUpOworICAgICAg ICAgICAgbmV3RnJhbWUtPmxvYWRlcigpLT5jaGFuZ2VMb2NhdGlvbihjb21wbGV0ZWRVcmwsIHJl ZmVycmVyLCBmYWxzZSwgZmFsc2UpOwogICAgICAgICBlbHNlIGlmICghdXJsLmlzRW1wdHkoKSkK LSAgICAgICAgICAgIG5ld0ZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9j YXRpb25DaGFuZ2UoY29tcGxldGVkVXJsLnN0cmluZygpLCByZWZlcnJlciwgZmFsc2UsIGZhbHNl LCB1c2VyR2VzdHVyZSk7CisgICAgICAgICAgICBuZXdGcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxl cigpLT5zY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKGNvbXBsZXRlZFVybC5zdHJpbmcoKSwgcmVmZXJy ZXIsIGZhbHNlLCBmYWxzZSk7CiAgICAgfQogCiAgICAgcmV0dXJuIG5ld0ZyYW1lOwpAQCAtMTg3 LDEzICsxODUsMTEgQEAgV2ViQ29yZTo6RE9NV2luZG93KiBCaW5kaW5nRE9NV2luZG93PEJpbgog ICAgICAgICBpZiAoIWNvbXBsZXRlZFVybC5pc0VtcHR5KCkKICAgICAgICAgICAgICYmICghcHJv dG9jb2xJc0phdmFTY3JpcHQoY29tcGxldGVkVXJsKQogICAgICAgICAgICAgICAgIHx8IEJpbmRp bmdTZWN1cml0eTxCaW5kaW5nPjo6Y2FuQWNjZXNzRnJhbWUoc3RhdGUsIGZyYW1lLCB0cnVlKSkp IHsKLSAgICAgICAgICAgIGJvb2wgdXNlckdlc3R1cmUgPSBzdGF0ZS0+cHJvY2Vzc2luZ1VzZXJH ZXN0dXJlKCk7Ci0KICAgICAgICAgICAgIC8vIEZvciB3aGF0ZXZlciByZWFzb24sIEZpcmVmb3gg dXNlcyB0aGUgZmlyc3QgZnJhbWUgdG8gZGV0ZXJtaW5lCiAgICAgICAgICAgICAvLyB0aGUgb3V0 Z29pbmdSZWZlcnJlci4gIFdlIHJlcGxpY2F0ZSB0aGF0IGJlaGF2aW9yIGhlcmUuCiAgICAgICAg ICAgICBTdHJpbmcgcmVmZXJyZXIgPSBmaXJzdEZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZl cnJlcigpOwogCi0gICAgICAgICAgICBmcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLT5zY2hl ZHVsZUxvY2F0aW9uQ2hhbmdlKGNvbXBsZXRlZFVybCwgcmVmZXJyZXIsIGZhbHNlLCBmYWxzZSwg dXNlckdlc3R1cmUpOworICAgICAgICAgICAgZnJhbWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+ c2NoZWR1bGVMb2NhdGlvbkNoYW5nZShjb21wbGV0ZWRVcmwsIHJlZmVycmVyLCBmYWxzZSwgZmFs c2UpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmcmFtZS0+ZG9tV2luZG93KCk7CiAgICAg fQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAJKHJldmlz aW9uIDY5OTIxKQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTcwMCwxMiArNzAwLDEwIEBAIHN0YXRpYyBGcmFtZSogY3JlYXRl V2luZG93KEV4ZWNTdGF0ZSogZXgKIAogICAgIGlmICghcHJvdG9jb2xJc0phdmFTY3JpcHQodXJs KSB8fCBuZXdXaW5kb3ctPmFsbG93c0FjY2Vzc0Zyb20oZXhlYykpIHsKICAgICAgICAgS1VSTCBj b21wbGV0ZWRVUkwgPSB1cmwuaXNFbXB0eSgpID8gS1VSTChQYXJzZWRVUkxTdHJpbmcsICIiKSA6 IGNvbXBsZXRlVVJMKGV4ZWMsIHVybCk7Ci0gICAgICAgIGJvb2wgdXNlckdlc3R1cmUgPSBwcm9j ZXNzaW5nVXNlckdlc3R1cmUoKTsKLQogICAgICAgICBpZiAoY3JlYXRlZCkKLSAgICAgICAgICAg IG5ld0ZyYW1lLT5sb2FkZXIoKS0+Y2hhbmdlTG9jYXRpb24oY29tcGxldGVkVVJMLCByZWZlcnJl ciwgZmFsc2UsIGZhbHNlLCB1c2VyR2VzdHVyZSk7CisgICAgICAgICAgICBuZXdGcmFtZS0+bG9h ZGVyKCktPmNoYW5nZUxvY2F0aW9uKGNvbXBsZXRlZFVSTCwgcmVmZXJyZXIsIGZhbHNlLCBmYWxz ZSk7CiAgICAgICAgIGVsc2UgaWYgKCF1cmwuaXNFbXB0eSgpKQotICAgICAgICAgICAgbmV3RnJh bWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlvbkNoYW5nZShjb21wbGV0 ZWRVUkwuc3RyaW5nKCksIHJlZmVycmVyLCAhbGV4aWNhbEZyYW1lLT5zY3JpcHQoKS0+YW55UGFn ZUlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCksIGZhbHNlLCB1c2VyR2VzdHVyZSk7CisgICAgICAg ICAgICBuZXdGcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLT5zY2hlZHVsZUxvY2F0aW9uQ2hh bmdlKGNvbXBsZXRlZFVSTC5zdHJpbmcoKSwgcmVmZXJyZXIsICFsZXhpY2FsRnJhbWUtPnNjcmlw dCgpLT5hbnlQYWdlSXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKSwgZmFsc2UpOwogICAgIH0KIAog ICAgIHJldHVybiBuZXdGcmFtZTsKQEAgLTc2MywxNCArNzYxLDEyIEBAIEpTVmFsdWUgSlNET01X aW5kb3c6Om9wZW4oRXhlY1N0YXRlKiBleGUKIAogICAgICAgICBjb25zdCBKU0RPTVdpbmRvdyog dGFyZ2V0ZWRXaW5kb3cgPSB0b0pTRE9NV2luZG93KGZyYW1lLCBjdXJyZW50V29ybGQoZXhlYykp OwogICAgICAgICBpZiAoIWNvbXBsZXRlZFVSTC5pc0VtcHR5KCkgJiYgKCFwcm90b2NvbElzSmF2 YVNjcmlwdChjb21wbGV0ZWRVUkwpIHx8ICh0YXJnZXRlZFdpbmRvdyAmJiB0YXJnZXRlZFdpbmRv dy0+YWxsb3dzQWNjZXNzRnJvbShleGVjKSkpKSB7Ci0gICAgICAgICAgICBib29sIHVzZXJHZXN0 dXJlID0gcHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCk7Ci0KICAgICAgICAgICAgIC8vIEZvciB3aGF0 ZXZlciByZWFzb24sIEZpcmVmb3ggdXNlcyB0aGUgZHluYW1pY0dsb2JhbE9iamVjdCB0bwogICAg ICAgICAgICAgLy8gZGV0ZXJtaW5lIHRoZSBvdXRnb2luZ1JlZmVycmVyLiAgV2UgcmVwbGljYXRl IHRoYXQgYmVoYXZpb3IKICAgICAgICAgICAgIC8vIGhlcmUuCiAgICAgICAgICAgICBTdHJpbmcg cmVmZXJyZXIgPSBkeW5hbWljRnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCk7CiAK LSAgICAgICAgICAgIGZyYW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9jYXRp b25DaGFuZ2UoY29tcGxldGVkVVJMLCByZWZlcnJlciwgIWxleGljYWxGcmFtZS0+c2NyaXB0KCkt PmFueVBhZ2VJc1Byb2Nlc3NpbmdVc2VyR2VzdHVyZSgpLCBmYWxzZSwgdXNlckdlc3R1cmUpOwor ICAgICAgICAgICAgZnJhbWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlv bkNoYW5nZShjb21wbGV0ZWRVUkwsIHJlZmVycmVyLCAhbGV4aWNhbEZyYW1lLT5zY3JpcHQoKS0+ YW55UGFnZUlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCksIGZhbHNlKTsKICAgICAgICAgfQogICAg ICAgICByZXR1cm4gdG9KUyhleGVjLCBmcmFtZS0+ZG9tV2luZG93KCkpOwogICAgIH0KSW5kZXg6 IFdlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24gNjk5MjEp CisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRG9jdW1lbnRDdXN0b20uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04OCw4ICs4OCw3IEBAIHZvaWQgSlNEb2N1bWVudDo6c2V0TG9jYXRpb24oRXhlY1N0 YXRlKiAKICAgICBpZiAoYWN0aXZlRnJhbWUpCiAgICAgICAgIHN0ciA9IGFjdGl2ZUZyYW1lLT5k b2N1bWVudCgpLT5jb21wbGV0ZVVSTChzdHIpLnN0cmluZygpOwogCi0gICAgYm9vbCB1c2VyR2Vz dHVyZSA9IFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpOwotICAgIGZy YW1lLT5uYXZpZ2F0aW9uU2NoZWR1bGVyKCktPnNjaGVkdWxlTG9jYXRpb25DaGFuZ2Uoc3RyLCBh Y3RpdmVGcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSwgIWFjdGl2ZUZyYW1lLT5z Y3JpcHQoKS0+YW55UGFnZUlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCksIGZhbHNlLCB1c2VyR2Vz dHVyZSk7CisgICAgZnJhbWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlv bkNoYW5nZShzdHIsIGFjdGl2ZUZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLCAh YWN0aXZlRnJhbWUtPnNjcmlwdCgpLT5hbnlQYWdlSXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKSwg ZmFsc2UpOwogfQogCiBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBEb2N1bWVudCogZG9jdW1lbnQpCkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRp bmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAkocmV2aXNpb24gNjk5MjEpCisrKyBXZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtOTgsNyArOTgs NyBAQCBwdWJsaWM6CiAgICAgU2NyaXB0VmFsdWUgZXhlY3V0ZVNjcmlwdEluV29ybGQoRE9NV3Jh cHBlcldvcmxkKiB3b3JsZCwgY29uc3QgU3RyaW5nJiBzY3JpcHQsIGJvb2wgZm9yY2VVc2VyR2Vz dHVyZSA9IGZhbHNlLCBTaG91bGRBbGxvd1hTUyBzaG91bGRBbGxvd1hTUyA9IERvTm90QWxsb3dY U1MpOwogCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIGFyZ3VtZW50IGlzIGEgSmF2YVNjcmlwdCBV UkwuCi0gICAgYm9vbCBleGVjdXRlSWZKYXZhU2NyaXB0VVJMKGNvbnN0IEtVUkwmLCBib29sIHVz ZXJHZXN0dXJlID0gZmFsc2UsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBz aG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgPSBSZXBsYWNlRG9jdW1lbnRJZkph dmFTY3JpcHRVUkwpOworICAgIGJvb2wgZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChjb25zdCBLVVJM JiwgU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHNob3VsZFJlcGxhY2VEb2N1 bWVudElmSmF2YVNjcmlwdFVSTCA9IFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCk7CiAK ICAgICAvLyBUaGlzIGZ1bmN0aW9uIG11c3QgYmUgY2FsbGVkIGZyb20gdGhlIG1haW4gdGhyZWFk LiBJdCBpcyBzYWZlIHRvIGNhbGwgaXQgcmVwZWF0ZWRseS4KICAgICAvLyBEYXJ3aW4gaXMgYW4g ZXhjZXB0aW9uIHRvIHRoaXMgcnVsZTogaXQgaXMgT0sgdG8gY2FsbCB0aGlzIGZ1bmN0aW9uIGZy b20gYW55IHRocmVhZCwgZXZlbiByZWVudHJhbnRseS4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvdjgv U2NyaXB0Q29udHJvbGxlci5oCShyZXZpc2lvbiA2OTkyMSkKKysrIFdlYkNvcmUvYmluZGluZ3Mv djgvU2NyaXB0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIHB1 YmxpYzoKICAgICBTY3JpcHRWYWx1ZSBleGVjdXRlU2NyaXB0KGNvbnN0IFN0cmluZyYgc2NyaXB0 LCBib29sIGZvcmNlVXNlckdlc3R1cmUgPSBmYWxzZSwgU2hvdWxkQWxsb3dYU1Mgc2hvdWxkQWxs b3dYU1MgPSBEb05vdEFsbG93WFNTKTsKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiBhcmd1bWVu dCBpcyBhIEphdmFTY3JpcHQgVVJMLgotICAgIGJvb2wgZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChj b25zdCBLVVJMJiwgYm9vbCB1c2VyR2VzdHVyZSA9IGZhbHNlLCBTaG91bGRSZXBsYWNlRG9jdW1l bnRJZkphdmFTY3JpcHRVUkwgc2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMID0g UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKKyAgICBib29sIGV4ZWN1dGVJZkphdmFT Y3JpcHRVUkwoY29uc3QgS1VSTCYsIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVS TCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgPSBSZXBsYWNlRG9jdW1lbnRJ ZkphdmFTY3JpcHRVUkwpOwogCiAgICAgLy8gVGhpcyBmdW5jdGlvbiBtdXN0IGJlIGNhbGxlZCBm cm9tIHRoZSBtYWluIHRocmVhZC4gSXQgaXMgc2FmZSB0byBjYWxsIGl0IHJlcGVhdGVkbHkuCiAg ICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVRocmVhZGluZygpOwpJbmRleDogV2ViQ29yZS9odG1s L0hUTUxBbmNob3JFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTEFu Y2hvckVsZW1lbnQuY3BwCShyZXZpc2lvbiA2OTkyMSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MQW5j aG9yRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRl ICJSZW5kZXJJbWFnZS5oIgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlLmgiCiAjaW5jbHVkZSAi U2V0dGluZ3MuaCIKKyNpbmNsdWRlICJVc2VyR2VzdHVyZUluZGljYXRvci5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKQEAgLTU1MCw3ICs1NTEsOSBAQCB2b2lkIGhhbmRsZUxpbmtDbGljayhF dmVudCogZXZlbnQsIERvY3VtCiAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCk7 CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotICAgIGZyYW1lLT5sb2FkZXIoKS0+ dXJsU2VsZWN0ZWQoZG9jdW1lbnQtPmNvbXBsZXRlVVJMKHVybCksIHRhcmdldCwgZXZlbnQsIGZh bHNlLCBmYWxzZSwgdHJ1ZSwgaGlkZVJlZmVycmVyID8gTm9SZWZlcnJlciA6IFNlbmRSZWZlcnJl cik7CisgICAgLy8gRklYTUU6IFRoaXMgc2VlbXMgd3JvbmcuICBXaHkgYXJlIHdlIG1hbnVmYWN0 dWluZyBhIHVzZXIgZ2VzdHVyZT8KKyAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3Io RGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSk7CisgICAgZnJhbWUtPmxvYWRlcigpLT51 cmxTZWxlY3RlZChkb2N1bWVudC0+Y29tcGxldGVVUkwodXJsKSwgdGFyZ2V0LCBldmVudCwgZmFs c2UsIGZhbHNlLCBoaWRlUmVmZXJyZXIgPyBOb1JlZmVycmVyIDogU2VuZFJlZmVycmVyKTsKIH0K IAogfQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHJl dmlzaW9uIDY5OTIxKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTkzLDYgKzkzLDcgQEAKICNpbmNsdWRlICJTaGFyZWRCdWZm ZXIuaCIKICNpbmNsdWRlICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3Iu aCIKKyNpbmNsdWRlICJVc2VyR2VzdHVyZUluZGljYXRvci5oIgogI2luY2x1ZGUgIldpbmRvd0Zl YXR1cmVzLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQ29uY2F0ZW5hdGUuaD4KICNpbmNs dWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KQEAgLTE5ODgsOSArMTk4OSwxMCBAQCB2b2lkIEluc3Bl Y3RvckNvbnRyb2xsZXI6Om9wZW5Jbkluc3BlY3RlCiAgICAgaWYgKCFuZXdGcmFtZSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgaW5kaWNhdG9yKERlZmluaXRl bHlQcm9jZXNzaW5nVXNlckdlc3R1cmUpOwogICAgIG5ld0ZyYW1lLT5sb2FkZXIoKS0+c2V0T3Bl bmVyKG1haW5GcmFtZSk7CiAgICAgbmV3RnJhbWUtPnBhZ2UoKS0+c2V0T3BlbmVkQnlET00oKTsK LSAgICBuZXdGcmFtZS0+bG9hZGVyKCktPmNoYW5nZUxvY2F0aW9uKG5ld0ZyYW1lLT5sb2FkZXIo KS0+Y29tcGxldGVVUkwodXJsKSwgIiIsIGZhbHNlLCBmYWxzZSwgdHJ1ZSk7CisgICAgbmV3RnJh bWUtPmxvYWRlcigpLT5jaGFuZ2VMb2NhdGlvbihuZXdGcmFtZS0+bG9hZGVyKCktPmNvbXBsZXRl VVJMKHVybCksICIiLCBmYWxzZSwgZmFsc2UpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xs ZXI6OmNvdW50KGNvbnN0IFN0cmluZyYgdGl0bGUsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0 IFN0cmluZyYgc291cmNlSUQpCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA2 OTkyMSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjY0LDI3ICsyNjQsMjcgQEAgYm9vbCBGcmFtZUxvYWRlcjo6Y2FuSGFuZGxlUmVxdWVzdChj b25zdAogICAgIHJldHVybiBtX2NsaWVudC0+Y2FuSGFuZGxlUmVxdWVzdChyZXF1ZXN0KTsKIH0K IAotdm9pZCBGcmFtZUxvYWRlcjo6Y2hhbmdlTG9jYXRpb24oY29uc3QgS1VSTCYgdXJsLCBjb25z dCBTdHJpbmcmIHJlZmVycmVyLCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2Fy ZExpc3QsIGJvb2wgdXNlckdlc3R1cmUsIGJvb2wgcmVmcmVzaCkKK3ZvaWQgRnJhbWVMb2FkZXI6 OmNoYW5nZUxvY2F0aW9uKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwg Ym9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0LCBib29sIHJlZnJlc2gp CiB7CiAgICAgUmVmUHRyPEZyYW1lPiBwcm90ZWN0KG1fZnJhbWUpOwogCiAgICAgUmVzb3VyY2VS ZXF1ZXN0IHJlcXVlc3QodXJsLCByZWZlcnJlciwgcmVmcmVzaCA/IFJlbG9hZElnbm9yaW5nQ2Fj aGVEYXRhIDogVXNlUHJvdG9jb2xDYWNoZVBvbGljeSk7CiAgICAgCi0gICAgdXJsU2VsZWN0ZWQo cmVxdWVzdCwgIl9zZWxmIiwgMCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHVz ZXJHZXN0dXJlLCBTZW5kUmVmZXJyZXIsIFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCk7 CisgICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgIl9zZWxmIiwgMCwgbG9ja0hpc3RvcnksIGxvY2tC YWNrRm9yd2FyZExpc3QsIFNlbmRSZWZlcnJlciwgUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0 VVJMKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgS1VSTCYgdXJs LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgUGFzc1JlZlB0cjxFdmVudD4gdHJpZ2dlcmlu Z0V2ZW50LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIGJvb2wg dXNlckdlc3R1cmUsIFJlZmVycmVyUG9saWN5IHJlZmVycmVyUG9saWN5KQordm9pZCBGcmFtZUxv YWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHBhc3NlZFRh cmdldCwgUGFzc1JlZlB0cjxFdmVudD4gdHJpZ2dlcmluZ0V2ZW50LCBib29sIGxvY2tIaXN0b3J5 LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIFJlZmVycmVyUG9saWN5IHJlZmVycmVyUG9saWN5 KQogewotICAgIHVybFNlbGVjdGVkKFJlc291cmNlUmVxdWVzdCh1cmwpLCBwYXNzZWRUYXJnZXQs IHRyaWdnZXJpbmdFdmVudCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHVzZXJH ZXN0dXJlLCByZWZlcnJlclBvbGljeSwgRG9Ob3RSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRV UkwpOworICAgIHVybFNlbGVjdGVkKFJlc291cmNlUmVxdWVzdCh1cmwpLCBwYXNzZWRUYXJnZXQs IHRyaWdnZXJpbmdFdmVudCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHJlZmVy cmVyUG9saWN5LCBEb05vdFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCk7CiB9CiAKIC8v IFRoZSBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwgcGFyYW1ldGVyIHdpbGwg Z28gYXdheSB3aGVuIHRoZSBGSVhNRSB0byBlbGltaW5hdGUgdGhlCiAvLyBjb3JyZXNwb25kaW5n IHBhcmFtZXRlciBmcm9tIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwo KSBpcyBhZGRyZXNzZWQuCi12b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcGFzc2VkVGFyZ2V0LCBQYXNzUmVm UHRyPEV2ZW50PiB0cmlnZ2VyaW5nRXZlbnQsIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJyZXJQb2xpY3kgcmVmZXJyZXJQ b2xpY3ksIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNl RG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpCit2b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcGFzc2VkVGFyZ2V0 LCBQYXNzUmVmUHRyPEV2ZW50PiB0cmlnZ2VyaW5nRXZlbnQsIGJvb2wgbG9ja0hpc3RvcnksIGJv b2wgbG9ja0JhY2tGb3J3YXJkTGlzdCwgUmVmZXJyZXJQb2xpY3kgcmVmZXJyZXJQb2xpY3ksIFNo b3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJ ZkphdmFTY3JpcHRVUkwpCiB7CiAgICAgQVNTRVJUKCFtX3N1cHByZXNzT3BlbmVySW5OZXdGcmFt ZSk7CiAKLSAgICBpZiAobV9mcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwo cmVxdWVzdC51cmwoKSwgdXNlckdlc3R1cmUsIHNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNj cmlwdFVSTCkpCisgICAgaWYgKG1fZnJhbWUtPnNjcmlwdCgpLT5leGVjdXRlSWZKYXZhU2NyaXB0 VVJMKHJlcXVlc3QudXJsKCksIHNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZyB0YXJnZXQgPSBwYXNzZWRUYXJnZXQ7CkBA IC0zMjQsNyArMzI0LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3VibWl0Rm9ybShQYXNzUmVmUHRy PAogCiAgICAgaWYgKHByb3RvY29sSXNKYXZhU2NyaXB0KHN1Ym1pc3Npb24tPmFjdGlvbigpKSkg ewogICAgICAgICBtX2lzRXhlY3V0aW5nSmF2YVNjcmlwdEZvcm1BY3Rpb24gPSB0cnVlOwotICAg ICAgICBtX2ZyYW1lLT5zY3JpcHQoKS0+ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChzdWJtaXNzaW9u LT5hY3Rpb24oKSwgZmFsc2UsIERvTm90UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsK KyAgICAgICAgbV9mcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoc3VibWlz c2lvbi0+YWN0aW9uKCksIERvTm90UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKICAg ICAgICAgbV9pc0V4ZWN1dGluZ0phdmFTY3JpcHRGb3JtQWN0aW9uID0gZmFsc2U7CiAgICAgICAg IHJldHVybjsKICAgICB9CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHJldmlzaW9uIDY5OTIxKQor KysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjExLDgg KzIxMSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKIAot ICAgIHZvaWQgY2hhbmdlTG9jYXRpb24oY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYgcmVmZXJy ZXIsIGJvb2wgbG9ja0hpc3RvcnkgPSB0cnVlLCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSB0 cnVlLCBib29sIHVzZXJHZXN0dXJlID0gZmFsc2UsIGJvb2wgcmVmcmVzaCA9IGZhbHNlKTsKLSAg ICB2b2lkIHVybFNlbGVjdGVkKGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHRhcmdldCwgUGFz c1JlZlB0cjxFdmVudD4sIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3YXJkTGlz dCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJyZXJQb2xpY3kpOworICAgIHZvaWQgY2hhbmdlTG9j YXRpb24oY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGJvb2wgbG9ja0hpc3Rv cnkgPSB0cnVlLCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QgPSB0cnVlLCBib29sIHJlZnJlc2gg PSBmYWxzZSk7CisgICAgdm9pZCB1cmxTZWxlY3RlZChjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5n JiB0YXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tC YWNrRm9yd2FyZExpc3QsIFJlZmVycmVyUG9saWN5KTsKIAogICAgIHZvaWQgc3VibWl0Rm9ybShQ YXNzUmVmUHRyPEZvcm1TdWJtaXNzaW9uPik7CiAKQEAgLTM5MCw3ICszOTAsNyBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKIAotICAgIHZvaWQgdXJsU2Vs ZWN0ZWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NS ZWZQdHI8RXZlbnQ+LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3Qs IGJvb2wgdXNlckdlc3R1cmUsIFJlZmVycmVyUG9saWN5LCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJ ZkphdmFTY3JpcHRVUkwpOworICAgIHZvaWQgdXJsU2VsZWN0ZWQoY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiwgY29uc3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+LCBib29sIGxvY2tI aXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIFJlZmVycmVyUG9saWN5LCBTaG91bGRS ZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOwogCiAgICAgdm9pZCBsb2FkV2l0aERvY3Vt ZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiwgRnJhbWVMb2FkVHlwZSwgUGFzc1JlZlB0cjxGb3Jt U3RhdGU+KTsgLy8gQ2FsbHMgY29udGludWVMb2FkQWZ0ZXJOYXZpZ2F0aW9uUG9saWN5CiAgICAg dm9pZCBsb2FkKERvY3VtZW50TG9hZGVyKik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gQ2FsbHMgbG9hZFdpdGhEb2N1bWVudExvYWRl ciAgIApJbmRleDogV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAJKHJldmlzaW9u IDY5OTIxKQorKysgV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTk4LDcgKzk4LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGZp cmUoRnJhbWUqIGZyYW1lKQogICAgIHsKLSAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5jaGFuZ2VM b2NhdGlvbihLVVJMKFBhcnNlZFVSTFN0cmluZywgbV91cmwpLCBtX3JlZmVycmVyLCBsb2NrSGlz dG9yeSgpLCBsb2NrQmFja0ZvcndhcmRMaXN0KCksIHdhc1VzZXJHZXN0dXJlKCksIGZhbHNlKTsK KyAgICAgICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRvcih3YXNVc2VyR2Vz dHVyZSgpID8gRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSA6IERlZmluaXRlbHlOb3RQ cm9jZXNzaW5nVXNlckdlc3R1cmUpOworICAgICAgICBmcmFtZS0+bG9hZGVyKCktPmNoYW5nZUxv Y2F0aW9uKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBtX3VybCksIG1fcmVmZXJyZXIsIGxvY2tIaXN0 b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgZmFsc2UpOwogICAgIH0KIAogICAgIHZpcnR1 YWwgdm9pZCBkaWRTdGFydFRpbWVyKEZyYW1lKiBmcmFtZSwgVGltZXI8TmF2aWdhdGlvblNjaGVk dWxlcj4qIHRpbWVyKQpAQCAtMTQ2LDcgKzE0Nyw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg dm9pZCBmaXJlKEZyYW1lKiBmcmFtZSkKICAgICB7Ci0gICAgICAgIGZyYW1lLT5sb2FkZXIoKS0+ Y2hhbmdlTG9jYXRpb24oS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCgpKSwgcmVmZXJyZXIoKSwg bG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3YXJkTGlzdCgpLCB3YXNVc2VyR2VzdHVyZSgpLCB0 cnVlKTsKKyAgICAgICAgVXNlckdlc3R1cmVJbmRpY2F0b3IgZ2VzdHVyZUluZGljYXRvcih3YXNV c2VyR2VzdHVyZSgpID8gRGVmaW5pdGVseVByb2Nlc3NpbmdVc2VyR2VzdHVyZSA6IERlZmluaXRl bHlOb3RQcm9jZXNzaW5nVXNlckdlc3R1cmUpOworICAgICAgICBmcmFtZS0+bG9hZGVyKCktPmNo YW5nZUxvY2F0aW9uKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwoKSksIHJlZmVycmVyKCksIGxv Y2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgdHJ1ZSk7CiAgICAgfQogfTsKIApA QCAtMTYyLDcgKzE2NCw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX2hpc3RvcnlTdGVwcykg ewogICAgICAgICAgICAgLy8gU3BlY2lhbCBjYXNlIGZvciBnbygwKSBmcm9tIGEgZnJhbWUgLT4g cmVsb2FkIG9ubHkgdGhlIGZyYW1lCiAgICAgICAgICAgICAvLyBUbyBmb2xsb3cgRmlyZWZveCBh bmQgSUUncyBiZWhhdmlvciwgaGlzdG9yeSByZWxvYWQgY2FuIG9ubHkgbmF2aWdhdGUgdGhlIHNl bGYgZnJhbWUuCi0gICAgICAgICAgICBsb2FkZXItPnVybFNlbGVjdGVkKGxvYWRlci0+dXJsKCks ICJfc2VsZiIsIDAsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2FyZExpc3QoKSwgd2FzVXNl ckdlc3R1cmUoKSwgU2VuZFJlZmVycmVyKTsKKyAgICAgICAgICAgIGxvYWRlci0+dXJsU2VsZWN0 ZWQobG9hZGVyLT51cmwoKSwgIl9zZWxmIiwgMCwgbG9ja0hpc3RvcnkoKSwgbG9ja0JhY2tGb3J3 YXJkTGlzdCgpLCBTZW5kUmVmZXJyZXIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIC8vIGdvKGkhPTApIGZyb20gYSBmcmFtZSBuYXZpZ2F0ZXMgaW50byB0aGUgaGlz dG9yeSBvZiB0aGUgZnJhbWUgb25seSwKQEAgLTI5Miw3ICsyOTQsNyBAQCB2b2lkIE5hdmlnYXRp b25TY2hlZHVsZXI6OnNjaGVkdWxlTG9jYXRpCiAgICAgLy8gZnJhZ21lbnQgcGFydCwgd2UgZG9u J3QgbmVlZCB0byBzY2hlZHVsZSB0aGUgbG9jYXRpb24gY2hhbmdlLgogICAgIEtVUkwgcGFyc2Vk VVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKTsKICAgICBpZiAocGFyc2VkVVJMLmhhc0ZyYWdtZW50 SWRlbnRpZmllcigpICYmIGVxdWFsSWdub3JpbmdGcmFnbWVudElkZW50aWZpZXIobG9hZGVyLT51 cmwoKSwgcGFyc2VkVVJMKSkgewotICAgICAgICBsb2FkZXItPmNoYW5nZUxvY2F0aW9uKGxvYWRl ci0+Y29tcGxldGVVUkwodXJsKSwgcmVmZXJyZXIsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0Zvcndh cmRMaXN0LCB3YXNVc2VyR2VzdHVyZSk7CisgICAgICAgIGxvYWRlci0+Y2hhbmdlTG9jYXRpb24o bG9hZGVyLT5jb21wbGV0ZVVSTCh1cmwpLCByZWZlcnJlciwgbG9ja0hpc3RvcnksIGxvY2tCYWNr Rm9yd2FyZExpc3QpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkluZGV4OiBXZWJLaXQvd2lu L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24g Njk5MjEpCisrKyBXZWJLaXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE1IEBACisyMDEwLTEwLTE3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJhbWVMb2FkZXIg ZG9lc24ndCBuZWVkIGFuIGV4cGxpY2l0IHVzZXJHZXN0dXJlIHBhcmFtZXRlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc3NzcKKworICAgICAgICBV cGRhdGUgZm9yIHRoZSBuZXcgQVBJLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQuY3BwOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNlYXJj aFdpdGhHb29nbGUpOgorCiAyMDEwLTEwLTE1ICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAJ KHJldmlzaW9uIDY5OTIxKQorKysgV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0 TWVudUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUNsaWVudC5oIgogCisjaW5jbHVk ZSAiVXNlckdlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJXZWJFbGVtZW50UHJvcGVydHlC YWcuaCIKICNpbmNsdWRlICJXZWJMb2NhbGl6YWJsZVN0cmluZ3MuaCIKICNpbmNsdWRlICJXZWJW aWV3LmgiCkBAIC0xNDAsOCArMTQxLDEwIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNl YXJjaFdpdGhHb28KICAgICB1cmwuYXBwZW5kKGVuY29kZWQpOwogICAgIHVybC5hcHBlbmQoIiZp ZT1VVEYtOCZvZT1VVEYtOCIpOwogCi0gICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgp KQotICAgICAgICBwYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVyKCktPnVybFNlbGVjdGVkKEtVUkwo UGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBTdHJpbmcoKSwgMCwgZmFsc2UsIGZhbHNlLCB0cnVlLCBT ZW5kUmVmZXJyZXIpOworICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgeworICAg ICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoRGVmaW5pdGVseVByb2Nlc3NpbmdV c2VyR2VzdHVyZSk7CisgICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5sb2FkZXIoKS0+dXJsU2Vs ZWN0ZWQoS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybCksIFN0cmluZygpLCAwLCBmYWxzZSwgZmFs c2UsIFNlbmRSZWZlcnJlcik7CisgICAgfQogfQogCiB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50 Ojpsb29rVXBJbkRpY3Rpb25hcnkoRnJhbWUqKQo=