125699 2013-12-13 12:44:46 -0800 [WK2] Start removing calls to String::characters() 2013-12-16 15:33:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam andersca kling oldest_to_newest 959630 0 sam 2013-12-13 12:44:46 -0800 [WK2] Start removing calls to String::characters() 959631 1 219182 sam 2013-12-13 12:45:12 -0800 Created attachment 219182 Patch 959632 2 219182 andersca 2013-12-13 12:47:54 -0800 Comment on attachment 219182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219182&action=review > Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm:55 > + RetainPtr<CFStringRef> directoryCFString = directory.createCFString(); auto. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:912 > + loadDataImpl(sharedBuffer, MIMEType, ASCIILiteral("utf-8"), baseURL, unreachableURL, decoder); This has to be latin-1. 959705 3 sam 2013-12-13 15:56:03 -0800 Committed r160572: <http://trac.webkit.org/changeset/160572> 959998 4 kling 2013-12-15 22:10:52 -0800 This broke some unit tests: Tests that failed: WebKit2WillLoadTest.WKPageLoadAlternateHTMLString WebKit2WillLoadTest.WKPageLoadAlternateHTMLStringWithUserData WebKit2WillLoadTest.WKPageLoadHTMLString WebKit2WillLoadTest.WKPageLoadHTMLStringWithUserData WebKit2WillLoadTest.WKPageLoadPlainTextString WebKit2WillLoadTest.WKPageLoadPlainTextStringWithUserData Tests that timed out: WKBrowsingContextLoadDelegateTest.SimpleLoadOfHTMLString_NilHTMLStringAndBaseURL The last one is still timing out on ToT: WKBrowsingContextLoadDelegateTest.SimpleLoadOfHTMLString_NilHTMLStringAndBaseURL http://build.webkit.org/builders/Apple%20MountainLion%20Debug%20WK1%20%28Tests%29/builds/11839 960260 5 ap 2013-12-16 15:33:51 -0800 > The last one is still timing out on ToT: > WKBrowsingContextLoadDelegateTest.SimpleLoadOfHTMLString_NilHTMLStringAndBaseURL And still. Filed bug 125810 about that. 219182 2013-12-13 12:45:12 -0800 2013-12-13 12:47:54 -0800 Patch bug-125699-20131213124511.patch text/plain 12948 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDU1NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTEzICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dLMl0gU3RhcnQgcmVtb3ZpbmcgY2Fs bHMgdG8gU3RyaW5nOjpjaGFyYWN0ZXJzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMu bW06CisgICAgICAgIChDb3JlSVBDOjo6OmRlY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgICog VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luSW5mb1N0b3JlOjpkZWZhdWx0TG9hZFBvbGljeUZvclBsdWdpbik6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6ZmluZFBsdWdpbik6CisgICAgICAgICogVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMv bWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0 b3JlOjpwbHVnaW5zRGlyZWN0b3JpZXMpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3Rv cmU6OnBsdWdpblBhdGhzSW5EaXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9jZi9XZWJQ cmVmZXJlbmNlc0NGLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bWFrZUtleSk6CisgICAgICAgICog V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMvSW5qZWN0ZWRCdW5kbGVNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjpsb2FkKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRTdHJp bmdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZEhUTUxTdHJpbmcpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRQbGFpblRleHRTdHJpbmcpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpsb2FkV2ViQXJjaGl2ZURhdGEpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisKIDIwMTMtMTItMTMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIGJ1aWxkLgpJbmRleDogU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW0JKHJl dmlzaW9uIDE2MDU1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsMTEgKzE2NCw2IEBAIGJvb2wg QXJndW1lbnRDb2RlcjxDZXJ0aWZpY2F0ZUluZm8+OjpkZWMKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAotc3RhdGljIE5TU3RyaW5nKiBuc1N0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZykKLXsKLSAg ICByZXR1cm4gc3RyaW5nLmltcGwoKSA/IFtOU1N0cmluZyBzdHJpbmdXaXRoQ2hhcmFjdGVyczpy ZWludGVycHJldF9jYXN0PGNvbnN0IFVuaUNoYXIqPihzdHJpbmcuY2hhcmFjdGVycygpKSBsZW5n dGg6c3RyaW5nLmxlbmd0aCgpXSA6IEAiIjsKLX0KLQogdm9pZCBBcmd1bWVudENvZGVyPFJlc291 cmNlRXJyb3I+OjplbmNvZGVQbGF0Zm9ybURhdGEoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBj b25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVycm9yKQogewogICAgIGJvb2wgZXJyb3JJc051 bGwgPSByZXNvdXJjZUVycm9yLmlzTnVsbCgpOwpAQCAtMjQxLDcgKzIzNiw3IEBAIGJvb2wgQXJn dW1lbnRDb2RlcjxSZXNvdXJjZUVycm9yPjo6ZGVjb2QKICAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0 VmFsdWUoKENGTXV0YWJsZURpY3Rpb25hcnlSZWYpdXNlckluZm8uZ2V0KCksIENGU1RSKCJOU0Vy cm9yUGVlckNlcnRpZmljYXRlQ2hhaW5LZXkiKSwgKENGQXJyYXlSZWYpY2VydGlmaWNhdGUuY2Vy dGlmaWNhdGVDaGFpbigpKTsKICAgICB9CiAKLSAgICBSZXRhaW5QdHI8TlNFcnJvcj4gbnNFcnJv ciA9IGFkb3B0TlMoW1tOU0Vycm9yIGFsbG9jXSBpbml0V2l0aERvbWFpbjpuc1N0cmluZyhkb21h aW4pIGNvZGU6Y29kZSB1c2VySW5mbzooTlNEaWN0aW9uYXJ5ICopdXNlckluZm8uZ2V0KCldKTsK KyAgICBSZXRhaW5QdHI8TlNFcnJvcj4gbnNFcnJvciA9IGFkb3B0TlMoW1tOU0Vycm9yIGFsbG9j XSBpbml0V2l0aERvbWFpbjpkb21haW4gY29kZTpjb2RlIHVzZXJJbmZvOihOU0RpY3Rpb25hcnkg Kil1c2VySW5mby5nZXQoKV0pOwogCiAgICAgcmVzb3VyY2VFcnJvciA9IFJlc291cmNlRXJyb3Io bnNFcnJvci5nZXQoKSk7CiAgICAgcmV0dXJuIHRydWU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5jcHAJKHJldmlzaW9u IDE2MDU1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9T dG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NiwxMSArMTc2LDYgQEAgUGx1Z2luTW9kdWxl TG9hZFBvbGljeSBQbHVnaW5JbmZvU3RvcmU6OgogewogICAgIHJldHVybiBQbHVnaW5Nb2R1bGVM b2FkTm9ybWFsbHk7CiB9Ci0KLVN0cmluZyBQbHVnaW5JbmZvU3RvcmU6OmdldE1JTUVUeXBlRm9y RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKQotewotICAgIHJldHVybiBNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pOwotfQogICAgIAog UGx1Z2luTW9kdWxlSW5mbyBQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVnaW5XaXRoQnVuZGxlSWRl bnRpZmllcihjb25zdCBTdHJpbmcmKQogewpAQCAtMjA5LDcgKzIwNCw3IEBAIFBsdWdpbk1vZHVs ZUluZm8gUGx1Z2luSW5mb1N0b3JlOjpmaW5kUGwKICAgICAgICAgICAgIHJldHVybiBwbHVnaW47 CiAgICAgICAgIAogICAgICAgICAvLyBGaW5hbGx5LCB0cnkgdG8gZ2V0IHRoZSBNSU1FIHR5cGUg ZnJvbSB0aGUgZXh0ZW5zaW9uIGluIGEgcGxhdGZvcm0gc3BlY2lmaWMgbWFubmVyIGFuZCB1c2Ug dGhhdC4KLSAgICAgICAgU3RyaW5nIGV4dGVuc2lvbk1pbWVUeXBlID0gZ2V0TUlNRVR5cGVGb3JF eHRlbnNpb24oZXh0ZW5zaW9uKTsKKyAgICAgICAgU3RyaW5nIGV4dGVuc2lvbk1pbWVUeXBlID0g TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oZXh0ZW5zaW9uKTsKICAg ICAgICAgaWYgKCFleHRlbnNpb25NaW1lVHlwZS5pc051bGwoKSkgewogICAgICAgICAgICAgUGx1 Z2luTW9kdWxlSW5mbyBwbHVnaW4gPSBmaW5kUGx1Z2luRm9yTUlNRVR5cGUoZXh0ZW5zaW9uTWlt ZVR5cGUsIGFsbG93ZWRQbHVnaW5UeXBlcyk7CiAgICAgICAgICAgICBpZiAoIXBsdWdpbi5wYXRo LmlzTnVsbCgpKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVn aW5JbmZvU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAkocmV2aXNpb24gMTYwNTUwKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAg LTEwMCw5ICsxMDAsNiBAQCBwcml2YXRlOgogICAgIC8vIFJldHVybiB3aGV0aGVyIHRoaXMgcGx1 Zy1pbiBzaG91bGQgYmUgdXNlZCAoYWRkZWQgdG8gdGhlIGxpc3Qgb2YgcGx1Zy1pbnMpIG9yIG5v dC4KICAgICBzdGF0aWMgYm9vbCBzaG91bGRVc2VQbHVnaW4oVmVjdG9yPFBsdWdpbk1vZHVsZUlu Zm8+JiBhbHJlYWR5TG9hZGVkUGx1Z2lucywgY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYpOwogCi0g ICAgLy8gR2V0IHRoZSBNSU1FIHR5cGUgZm9yIHRoZSBnaXZlbiBleHRlbnNpb24uCi0gICAgc3Rh dGljIFN0cmluZyBnZXRNSU1FVHlwZUZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lv bik7Ci0KICAgICBWZWN0b3I8U3RyaW5nPiBtX2FkZGl0aW9uYWxQbHVnaW5zRGlyZWN0b3JpZXM7 CiAgICAgVmVjdG9yPFBsdWdpbk1vZHVsZUluZm8+IG1fcGx1Z2luczsKICAgICBib29sIG1fcGx1 Z2luTGlzdElzVXBUb0RhdGU7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lu cy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0JKHJldmlzaW9uIDE2 MDU1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZv U3RvcmVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ3LDIwICs0NywxMiBAQCBWZWN0b3I8U3Ry aW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnNECiAgICAgCiAgICAgcmV0dXJuIHBsdWdpbnNE aXJlY3RvcmllczsKIH0KLQotLy8gRklYTUU6IE9uY2UgdGhlIFVJIHByb2Nlc3Mga25vd3MgdGhl IGRpZmZlcmVuY2UgYmV0d2VlbiB0aGUgbWFpbiB0aHJlYWQgYW5kIHRoZSB3ZWIgdGhyZWFkIHdl IGNhbiBkcm9wIHRoaXMgYW5kIGp1c3QgdXNlCi0vLyBTdHJpbmc6OmNyZWF0ZUNGU3RyaW5nLgot c3RhdGljIENGU3RyaW5nUmVmIHNhZmVDcmVhdGVDRlN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmlu ZykKLXsKLSAgICByZXR1cm4gQ0ZTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVycygwLCByZWludGVy cHJldF9jYXN0PGNvbnN0IFVuaUNoYXIqPihzdHJpbmcuY2hhcmFjdGVycygpKSwgc3RyaW5nLmxl bmd0aCgpKTsKLX0KICAgICAKIFZlY3RvcjxTdHJpbmc+IFBsdWdpbkluZm9TdG9yZTo6cGx1Z2lu UGF0aHNJbkRpcmVjdG9yeShjb25zdCBTdHJpbmcmIGRpcmVjdG9yeSkKIHsKICAgICBWZWN0b3I8 U3RyaW5nPiBwbHVnaW5QYXRoczsKIAotICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gZGlyZWN0 b3J5Q0ZTdHJpbmcgPSBhZG9wdENGKHNhZmVDcmVhdGVDRlN0cmluZyhkaXJlY3RvcnkpKTsKLSAg ICAKKyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGRpcmVjdG9yeUNGU3RyaW5nID0gZGlyZWN0 b3J5LmNyZWF0ZUNGU3RyaW5nKCk7CiAgICAgTlNBcnJheSAqZmlsZW5hbWVzID0gW1tOU0ZpbGVN YW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjb250ZW50c09mRGlyZWN0b3J5QXRQYXRoOihOU1N0cmlu ZyAqKWRpcmVjdG9yeUNGU3RyaW5nLmdldCgpIGVycm9yOm5pbF07CiAgICAgZm9yIChOU1N0cmlu ZyAqZmlsZW5hbWUgaW4gZmlsZW5hbWVzKQogICAgICAgICBwbHVnaW5QYXRocy5hcHBlbmQoWyhO U1N0cmluZyAqKWRpcmVjdG9yeUNGU3RyaW5nLmdldCgpIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENv bXBvbmVudDpmaWxlbmFtZV0pOwpAQCAtMTEzLDE2ICsxMDUsNiBAQCBQbHVnaW5Nb2R1bGVMb2Fk UG9saWN5IFBsdWdpbkluZm9TdG9yZTo6CiAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUxvYWROb3Jt YWxseTsKIH0KIAotU3RyaW5nIFBsdWdpbkluZm9TdG9yZTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNp b24oY29uc3QgU3RyaW5nJiBleHRlbnNpb24pCi17Ci0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxk IGp1c3QgY2FsbCBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbiBhbmQg YmUKLSAgICAvLyBzdHJlbmd0aCByZWR1Y2VkIGludG8gdGhlIGNhbGxzaXRlIG9uY2Ugd2UgY2Fu IHNhZmVseSBjb252ZXJ0IFN0cmluZwotICAgIC8vIHRvIENGU3RyaW5nUmVmIG9mZiB0aGUgbWFp biB0aHJlYWQuCi0KLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGV4dGVuc2lvbkNGU3RyaW5n ID0gYWRvcHRDRihzYWZlQ3JlYXRlQ0ZTdHJpbmcoZXh0ZW5zaW9uKSk7Ci0gICAgcmV0dXJuIFdL R2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oKE5TU3RyaW5nICopZXh0ZW5zaW9uQ0ZTdHJpbmcuZ2V0 KCkpOwotfQotCiBQbHVnaW5Nb2R1bGVJbmZvIFBsdWdpbkluZm9TdG9yZTo6ZmluZFBsdWdpbldp dGhCdW5kbGVJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllcikKIHsKICAg ICBsb2FkUGx1Z2luc0lmTmVjZXNzYXJ5KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvY2YvV2ViUHJlZmVyZW5jZXNDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2NmL1dlYlByZWZlcmVuY2VzQ0YuY3BwCShyZXZpc2lvbiAxNjA1NTApCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUHJlZmVyZW5jZXNDRi5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMzLDE0ICszMyw5IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1zdGF0aWMg UmV0YWluUHRyPENGU3RyaW5nUmVmPiBjZlN0cmluZ0Zyb21XZWJDb3JlU3RyaW5nKGNvbnN0IFN0 cmluZyYgc3RyaW5nKQotewotICAgIHJldHVybiBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+ID0gYWRv cHRDRihDRlN0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29u c3QgVW5pQ2hhcio+KHN0cmluZy5jaGFyYWN0ZXJzKCkpLCBzdHJpbmcubGVuZ3RoKCkpKTsKLX0K LQogc3RhdGljIGlubGluZSBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IG1ha2VLZXkoY29uc3QgU3Ry aW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGJhc2VLZXkpCiB7Ci0gICAgcmV0dXJuIGNm U3RyaW5nRnJvbVdlYkNvcmVTdHJpbmcobWFrZVN0cmluZyhpZGVudGlmaWVyLCAiLldlYktpdDIi LCBiYXNlS2V5KSk7CisgICAgcmV0dXJuIG1ha2VTdHJpbmcoaWRlbnRpZmllciwgIi5XZWJLaXQy IiwgYmFzZUtleSkuY3JlYXRlQ0ZTdHJpbmcoKTsKIH0KIAogc3RhdGljIHZvaWQgc2V0U3RyaW5n VmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3Ry aW5nJiBiYXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv bWFjL0luamVjdGVkQnVuZGxlTWFjLm1tCShyZXZpc2lvbiAxNjA1NTApCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBAQCBib29sIEluamVjdGVkQnVuZGxlOjpsb2Fk KEFQSTo6T2JqZWN0KiBpCiAgICAgICAgIG1fc2FuZGJveEV4dGVuc2lvbiA9IDA7CiAgICAgfQog ICAgIAotICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gaW5qZWN0ZWRCdW5kbGVQYXRoU3RyID0g YWRvcHRDRihDRlN0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8 Y29uc3QgVW5pQ2hhcio+KG1fcGF0aC5jaGFyYWN0ZXJzKCkpLCBtX3BhdGgubGVuZ3RoKCkpKTsK KyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGluamVjdGVkQnVuZGxlUGF0aFN0ciA9IG1fcGF0 aC5jcmVhdGVDRlN0cmluZygpOwogICAgIGlmICghaW5qZWN0ZWRCdW5kbGVQYXRoU3RyKSB7CiAg ICAgICAgIFdURkxvZ0Fsd2F5cygiSW5qZWN0ZWRCdW5kbGU6OmxvYWQgZmFpbGVkIC0gQ291bGQg bm90IGNyZWF0ZSB0aGUgcGF0aCBzdHJpbmcuXG4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAko cmV2aXNpb24gMTYwNTUwKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MDUsNiArOTA1LDE3IEBAIHZvaWQgV2ViUGFn ZTo6bG9hZERhdGFJbXBsKFBhc3NSZWZQdHI8U2gKICAgICBtX21haW5GcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZS0+Y29yZUZyYW1l KCksIHJlcXVlc3QsIHN1YnN0aXR1dGVEYXRhKSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6bG9hZFN0 cmluZ0ltcGwoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBl LCBjb25zdCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFibGVVUkwsIENvcmVJUEM6 Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQoreworICAgIGlmIChodG1sU3RyaW5nLmlzOEJpdCgp KSB7CisgICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1 ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hh cmFjdGVyczgoKSksIGh0bWxTdHJpbmcubGVuZ3RoKCkgKiBzaXplb2YoTENoYXIpKTsKKyAgICAg ICAgbG9hZERhdGFJbXBsKHNoYXJlZEJ1ZmZlciwgTUlNRVR5cGUsIEFTQ0lJTGl0ZXJhbCgidXRm LTgiKSwgYmFzZVVSTCwgdW5yZWFjaGFibGVVUkwsIGRlY29kZXIpOworICAgIH0gZWxzZSB7Cisg ICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6 Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVy czE2KCkpLCBodG1sU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7CisgICAgICAgIGxv YWREYXRhSW1wbChzaGFyZWRCdWZmZXIsIE1JTUVUeXBlLCBBU0NJSUxpdGVyYWwoInV0Zi0xNiIp LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCwgZGVjb2Rlcik7CisgICAgfQorfQorCiB2b2lkIFdl YlBhZ2U6OmxvYWREYXRhKGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBjb25zdCBTdHJp bmcmIGJhc2VVUkxTdHJpbmcsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewog ICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3Jl YXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGRhdGEuZGF0YSgpKSwgZGF0YS5zaXpl KCkpOwpAQCAtOTE0LDI5ICs5MjUsMjYgQEAgdm9pZCBXZWJQYWdlOjpsb2FkRGF0YShjb25zdCBD b3JlSVBDOjpEYQogCiB2b2lkIFdlYlBhZ2U6OmxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYg aHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMU3RyaW5nLCBDb3JlSVBDOjpNZXNzYWdl RGVjb2RlciYgZGVjb2RlcikKIHsKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZm ZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPiho dG1sU3RyaW5nLmNoYXJhY3RlcnMoKSksIGh0bWxTdHJpbmcubGVuZ3RoKCkgKiBzaXplb2YoVUNo YXIpKTsKICAgICBVUkwgYmFzZVVSTCA9IGJhc2VVUkxTdHJpbmcuaXNFbXB0eSgpID8gYmxhbmtV UkwoKSA6IFVSTChVUkwoKSwgYmFzZVVSTFN0cmluZyk7Ci0gICAgbG9hZERhdGFJbXBsKHNoYXJl ZEJ1ZmZlciwgInRleHQvaHRtbCIsICJ1dGYtMTYiLCBiYXNlVVJMLCBVUkwoKSwgZGVjb2Rlcik7 CisgICAgbG9hZFN0cmluZ0ltcGwoaHRtbFN0cmluZywgQVNDSUlMaXRlcmFsKCJ0ZXh0L2h0bWwi KSwgYmFzZVVSTCwgVVJMKCksIGRlY29kZXIpOwogfQogCiB2b2lkIFdlYlBhZ2U6OmxvYWRBbHRl cm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMU3RyaW5nLCBDb3JlSVBD OjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKIHsKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBz aGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0 IGNoYXIqPihodG1sU3RyaW5nLmNoYXJhY3RlcnMoKSksIGh0bWxTdHJpbmcubGVuZ3RoKCkgKiBz aXplb2YoVUNoYXIpKTsKICAgICBVUkwgYmFzZVVSTCA9IGJhc2VVUkxTdHJpbmcuaXNFbXB0eSgp ID8gYmxhbmtVUkwoKSA6IFVSTChVUkwoKSwgYmFzZVVSTFN0cmluZyk7CiAgICAgVVJMIHVucmVh Y2hhYmxlVVJMID0gdW5yZWFjaGFibGVVUkxTdHJpbmcuaXNFbXB0eSgpID8gVVJMKCkgOiBVUkwo VVJMKCksIHVucmVhY2hhYmxlVVJMU3RyaW5nKTsKLSAgICBsb2FkRGF0YUltcGwoc2hhcmVkQnVm ZmVyLCAidGV4dC9odG1sIiwgInV0Zi0xNiIsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCBkZWNv ZGVyKTsKKyAgICBsb2FkU3RyaW5nSW1wbChodG1sU3RyaW5nLCBBU0NJSUxpdGVyYWwoInRleHQv aHRtbCIpLCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCwgZGVjb2Rlcik7CiB9CiAKIHZvaWQgV2Vi UGFnZTo6bG9hZFBsYWluVGV4dFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgQ29yZUlQQzo6 TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7Ci0gICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2hh cmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBj aGFyKj4oc3RyaW5nLmNoYXJhY3RlcnMoKSksIHN0cmluZy5sZW5ndGgoKSAqIHNpemVvZihVQ2hh cikpOwotICAgIGxvYWREYXRhSW1wbChzaGFyZWRCdWZmZXIsICJ0ZXh0L3BsYWluIiwgInV0Zi0x NiIsIGJsYW5rVVJMKCksIFVSTCgpLCBkZWNvZGVyKTsKKyAgICBsb2FkU3RyaW5nSW1wbChzdHJp bmcsIEFTQ0lJTGl0ZXJhbCgidGV4dC9wbGFpbiIpLCBibGFua1VSTCgpLCBVUkwoKSwgZGVjb2Rl cik7CiB9CiAKIHZvaWQgV2ViUGFnZTo6bG9hZFdlYkFyY2hpdmVEYXRhKGNvbnN0IENvcmVJUEM6 OkRhdGFSZWZlcmVuY2UmIHdlYkFyY2hpdmVEYXRhLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYg ZGVjb2RlcikKIHsKICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFy ZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPih3ZWJBcmNoaXZl RGF0YS5kYXRhKCkpLCB3ZWJBcmNoaXZlRGF0YS5zaXplKCkgKiBzaXplb2YodWludDhfdCkpOwot ICAgIGxvYWREYXRhSW1wbChzaGFyZWRCdWZmZXIsICJhcHBsaWNhdGlvbi94LXdlYmFyY2hpdmUi LCAidXRmLTE2IiwgYmxhbmtVUkwoKSwgVVJMKCksIGRlY29kZXIpOworICAgIGxvYWREYXRhSW1w bChzaGFyZWRCdWZmZXIsIEFTQ0lJTGl0ZXJhbCgiYXBwbGljYXRpb24veC13ZWJhcmNoaXZlIiks IEFTQ0lJTGl0ZXJhbCgidXRmLTE2IiksIGJsYW5rVVJMKCksIFVSTCgpLCBkZWNvZGVyKTsKIH0K IAogdm9pZCBXZWJQYWdlOjpsaW5rQ2xpY2tlZChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgV2Vi TW91c2VFdmVudCYgZXZlbnQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDE2MDU1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5OCw2ICs2OTgsNyBA QCBwcml2YXRlOgogICAgIFN0cmluZyBzb3VyY2VGb3JGcmFtZShXZWJGcmFtZSopOwogCiAgICAg dm9pZCBsb2FkRGF0YUltcGwoUGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+LCBjb25z dCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwgY29uc3QgV2Vi Q29yZTo6VVJMJiBiYXNlVVJMLCBjb25zdCBXZWJDb3JlOjpVUkwmIGZhaWxpbmdVUkwsIENvcmVJ UEM6Ok1lc3NhZ2VEZWNvZGVyJik7CisgICAgdm9pZCBsb2FkU3RyaW5nSW1wbChjb25zdCBTdHJp bmcmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBXZWJDb3JlOjpVUkwmIGJhc2VVUkws IGNvbnN0IFdlYkNvcmU6OlVSTCYgZmFpbGluZ1VSTCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXIm KTsKIAogICAgIGJvb2wgcGxhdGZvcm1IYXNMb2NhbERhdGFGb3JVUkwoY29uc3QgV2ViQ29yZTo6 VVJMJik7CiAK