139724 2014-12-17 01:50:50 -0800 AsyncRequestImpl casting in AsyncRequest::completeRequest() is incorrect 2015-01-21 11:14:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 139491 1 zan zan andersca beidson cgarcia commit-queue darin oldest_to_newest 1056293 0 zan 2014-12-17 01:50:50 -0800 AsyncRequestImpl casting in AsyncRequest::completeRequest() is incorrect 1056295 1 243431 zan 2014-12-17 02:13:46 -0800 Created attachment 243431 Patch 1056298 2 commit-queue 2014-12-17 02:16:13 -0800 Attachment 243431 did not pass style-queue: ERROR: Source/WebKit2/Shared/AsyncRequest.h:62: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Shared/AsyncRequest.h:67: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Shared/AsyncRequest.h:85: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Shared/AsyncRequest.h:97: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1062760 3 243431 darin 2015-01-20 09:06:51 -0800 Comment on attachment 243431 Patch Why no test? What was the incorrect symptom before? 1062776 4 cgarcia 2015-01-20 09:31:19 -0800 (In reply to comment #3) > Comment on attachment 243431 [details] > Patch > > Why no test? What was the incorrect symptom before? I don't know why it works with clang, but with gcc I got a lot of layout tests failures when I implemented the database process sopport for GTK port. So, at the beginning I thought it was a compiler bug, see the discussion here https://bugs.webkit.org/show_bug.cgi?id=139491 1063100 5 zan 2015-01-21 10:57:53 -0800 (In reply to comment #3) > Comment on attachment 243431 [details] > Patch > > Why no test? What was the incorrect symptom before? Because of incorrect casting of the std::function<> object (through AsyncRequestImpl) the argument for the uint32_t parameter was passed in as a reference when invoking the wrapped function, while the function expected an argument that was passed in by value. Because of that the uint32_t argument actually held the address of the relevant uint32_t object, instead of the value. This was only occurring when compiling with GCC. Getting the IDB tests running in GCC-compiled builds would show that this works as intended. 1063107 6 243431 zan 2015-01-21 11:13:55 -0800 Comment on attachment 243431 Patch Clearing flags on attachment: 243431 Committed r178850: <http://trac.webkit.org/changeset/178850> 1063108 7 zan 2015-01-21 11:14:11 -0800 All reviewed patches have been landed. Closing bug. 243431 2014-12-17 02:13:46 -0800 2015-01-21 11:13:55 -0800 Patch bug-139724-20141217021606.patch text/plain 11874 zan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzQ0MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDE0LTEyLTE3ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBBc3luY1JlcXVlc3RJbXBs IGNhc3RpbmcgaW4gQXN5bmNSZXF1ZXN0Ojpjb21wbGV0ZVJlcXVlc3QoKSBpcyBpbmNvcnJlY3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTcyNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzeW5jUmVx dWVzdEltcGwgY2FzdGluZyBpbiBBc3luY1JlcXVlc3Q6OmNvbXBsZXRlUmVxdWVzdCgpIHJlbGll cyBvbgorICAgICAgICB0aGUgcGFyYW1ldGVyIHBhY2sgdG8gcHJvcGVybHkgZGV0ZXJtaW5lIHRo ZSB0eXBlIG9mIHRoZSBBc3luY1JlcXVlc3RJbXBsCisgICAgICAgIG9iamVjdC4gVGhlIGNhc3Rp bmcgcmVzdWx0IGNhbiBiZSBpbmNvcnJlY3Qgd2hlbiBhbiBhcmd1bWVudCBpcyBwYXNzZWQKKyAg ICAgICAgYnkgcmVmZXJlbmNlIHdoaWxlIHRoZSBvcmlnaW5hbCBvYmplY3Qgd2FzIGNvbnN0cnVj dGVkIHdpdGggYSBjYWxsYmFjaworICAgICAgICB0aGF0IGV4cGVjdHMgYW4gYXJndW1lbnQgdGhh dCdzIHBhc3NlZCBieSB2YWx1ZS4KKworICAgICAgICBUbyBhdm9pZCB0aGlzIHRoZSBBc3luY1Jl cXVlc3RJbXBsIHRlbXBsYXRlIGlzIG5vdyBpbnN0YW50aWF0ZWQgd2l0aAorICAgICAgICByYXcg dHlwZXMsIHdpdGggY2FsbGJhY2sgcGFyYW1ldGVycyByZW1haW5pbmcgcmF3IHR5cGVzIGluIGNh c2UKKyAgICAgICAgb2YgYmVpbmcgaW50ZWdyYWwgKGVuZm9yY2luZyBwYXNzaW5nLWJ5LXZhbHVl IHRoZXNlIGFyZ3VtZW50cyB3aGVuCisgICAgICAgIGRpc3BhdGNoaW5nKSwgYW5kIGNvbnN0IHJl ZmVyZW5jZXMgYmVpbmcgdXNlZCBvdGhlcndpc2UgKGVuZm9yY2luZworICAgICAgICBwYXNzaW5n LWJ5LXJlZmVyZW5jZSkuCisKKyAgICAgICAgVGhpcyBlbmFibGVzIGNhc3RpbmcgQXN5bmNSZXF1 ZXN0IG9iamVjdHMgdG8gdGhlIGNvcnJlY3QgQXN5bmNSZXF1ZXN0SW1wbDw+CisgICAgICAgIGJ5 IHJ1bm5pbmcgdGhlIHBhcmFtZXRlciBwYWNrIHRocm91Z2ggc3RkOjpkZWNheS4KKworICAgICAg ICAqIERhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZTo6cHV0UmVjb3JkKToKKyAgICAgICAgKFdl YktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmdldFJlY29yZCk6CisgICAgICAgIChXZWJLaXQ6OlVu aXF1ZUlEQkRhdGFiYXNlOjpvcGVuQ3Vyc29yKToKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURC RGF0YWJhc2U6OmN1cnNvckFkdmFuY2UpOgorICAgICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRh YmFzZTo6Y3Vyc29ySXRlcmF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlVuaXF1ZUlEQkRhdGFiYXNl Ojpjb3VudCk6CisgICAgICAgIChXZWJLaXQ6OlVuaXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVSYW5n ZSk6CisgICAgICAgICogU2hhcmVkL0FzeW5jUmVxdWVzdC5oOgorICAgICAgICAoV2ViS2l0OjpB c3luY1JlcXVlc3Q6OmNvbXBsZXRlUmVxdWVzdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0 YWRhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpnZXQpOgor CiAyMDE0LTEyLTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLiBGaXggR1RLKyBidWlsZCBhZnRlciByMTc3NDI3LgpJbmRl eDogU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRh YmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0lu ZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5jcHAJKHJldmlzaW9uIDE3NzQzOSkKKysrIFNvdXJj ZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01NjgsNyArNTY4LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFz ZTo6cHV0UmVjb3JkKGNvbnN0CiAKICAgICBBU1NFUlQobV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVz LmNvbnRhaW5zKG9iamVjdFN0b3JlSUQpKTsKIAotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJl cXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPGNvbnN0IElEQktleURhdGEmLCB1aW50MzJfdCwgY29u c3QgU3RyaW5nJj46OmNyZWF0ZShbdGhpcywgY2FsbGJhY2tdKGNvbnN0IElEQktleURhdGEmIGtl eURhdGEsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpIHsK KyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxJREJL ZXlEYXRhLCB1aW50MzJfdCwgU3RyaW5nPjo6Y3JlYXRlKFt0aGlzLCBjYWxsYmFja10oY29uc3Qg SURCS2V5RGF0YSYga2V5RGF0YSwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkgewogICAgICAgICBjYWxsYmFjayhrZXlEYXRhLCBlcnJvckNvZGUsIGVycm9y TWVzc2FnZSk7CiAgICAgfSwgW3RoaXMsIGNhbGxiYWNrXSB7CiAgICAgICAgIGNhbGxiYWNrKElE QktleURhdGEoKSwgSU5WQUxJRF9TVEFURV9FUlIsICJVbmFibGUgdG8gcHV0IHJlY29yZCBpbnRv IGRhdGFiYXNlIik7CkBAIC01OTEsNyArNTkxLDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6 Z2V0UmVjb3JkKGNvbnN0CiAKICAgICBBU1NFUlQobV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVzLmNv bnRhaW5zKG9iamVjdFN0b3JlSUQpKTsKIAotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVl c3QgPSBBc3luY1JlcXVlc3RJbXBsPGNvbnN0IElEQkdldFJlc3VsdCYsIHVpbnQzMl90LCBjb25z dCBTdHJpbmcmPjo6Y3JlYXRlKFt0aGlzLCBjYWxsYmFja10oY29uc3QgSURCR2V0UmVzdWx0JiBy ZXN1bHQsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpIHsK KyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxJREJH ZXRSZXN1bHQsIHVpbnQzMl90LCBTdHJpbmc+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNrXShjb25z dCBJREJHZXRSZXN1bHQmIHJlc3VsdCwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcm IGVycm9yTWVzc2FnZSkgewogICAgICAgICBjYWxsYmFjayhyZXN1bHQsIGVycm9yQ29kZSwgZXJy b3JNZXNzYWdlKTsKICAgICB9LCBbdGhpcywgY2FsbGJhY2tdIHsKICAgICAgICAgY2FsbGJhY2so SURCR2V0UmVzdWx0KCksIElOVkFMSURfU1RBVEVfRVJSLCAiVW5hYmxlIHRvIGdldCByZWNvcmQg ZnJvbSBkYXRhYmFzZSIpOwpAQCAtNjE0LDcgKzYxNCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJh c2U6Om9wZW5DdXJzb3IoY29uc3QKIAogICAgIEFTU0VSVChtX21ldGFkYXRhLT5vYmplY3RTdG9y ZXMuY29udGFpbnMob2JqZWN0U3RvcmVJRCkpOwogCi0gICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4g cmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8aW50NjRfdCwgY29uc3QgSURCS2V5RGF0YSYsIGNv bnN0IElEQktleURhdGEmLCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4sIHVpbnQzMl90LCBjb25z dCBTdHJpbmcmPjo6Y3JlYXRlKFt0aGlzLCBjYWxsYmFja10oaW50NjRfdCBjdXJzb3JJRCwgY29u c3QgSURCS2V5RGF0YSYga2V5LCBjb25zdCBJREJLZXlEYXRhJiBwcmltYXJ5S2V5LCBQYXNzUmVm UHRyPFNoYXJlZEJ1ZmZlcj4gdmFsdWUsIHVpbnQzMl90IGVycm9yQ29kZSwgY29uc3QgU3RyaW5n JiBlcnJvck1lc3NhZ2UpIHsKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5 bmNSZXF1ZXN0SW1wbDxpbnQ2NF90LCBJREJLZXlEYXRhLCBJREJLZXlEYXRhLCBQYXNzUmVmUHRy PFNoYXJlZEJ1ZmZlcj4sIHVpbnQzMl90LCBTdHJpbmc+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNr XShpbnQ2NF90IGN1cnNvcklELCBjb25zdCBJREJLZXlEYXRhJiBrZXksIGNvbnN0IElEQktleURh dGEmIHByaW1hcnlLZXksIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiB2YWx1ZSwgdWludDMyX3Qg ZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgewogICAgICAgICBjYWxsYmFj ayhjdXJzb3JJRCwga2V5LCBwcmltYXJ5S2V5LCB2YWx1ZSwgZXJyb3JDb2RlLCBlcnJvck1lc3Nh Z2UpOwogICAgIH0sIFt0aGlzLCBjYWxsYmFja10gewogICAgICAgICBjYWxsYmFjaygwLCBudWxs cHRyLCBudWxscHRyLCBudWxscHRyLCBJTlZBTElEX1NUQVRFX0VSUiwgIlVuYWJsZSB0byBnZXQg cmVjb3JkIGZyb20gZGF0YWJhc2UiKTsKQEAgLTYzNSw3ICs2MzUsNyBAQCB2b2lkIFVuaXF1ZUlE QkRhdGFiYXNlOjpjdXJzb3JBZHZhbmNlKGNvCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAg ICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxjb25zdCBJ REJLZXlEYXRhJiwgY29uc3QgSURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiwg dWludDMyX3QsIGNvbnN0IFN0cmluZyY+OjpjcmVhdGUoW3RoaXMsIGNhbGxiYWNrXShjb25zdCBJ REJLZXlEYXRhJiBrZXksIGNvbnN0IElEQktleURhdGEmIHByaW1hcnlLZXksIFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiB2YWx1ZSwgdWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIGVy cm9yTWVzc2FnZSkgeworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBBc3luY1Jl cXVlc3RJbXBsPElEQktleURhdGEsIElEQktleURhdGEsIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVy PiwgdWludDMyX3QsIFN0cmluZz46OmNyZWF0ZShbdGhpcywgY2FsbGJhY2tdKGNvbnN0IElEQktl eURhdGEmIGtleSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFyeUtleSwgUGFzc1JlZlB0cjxTaGFy ZWRCdWZmZXI+IHZhbHVlLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JN ZXNzYWdlKSB7CiAgICAgICAgIGNhbGxiYWNrKGtleSwgcHJpbWFyeUtleSwgdmFsdWUsIGVycm9y Q29kZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9LCBbdGhpcywgY2FsbGJhY2tdIHsKICAgICAgICAg Y2FsbGJhY2sobnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0ciwgSU5WQUxJRF9TVEFURV9FUlIsICJV bmFibGUgdG8gYWR2YW5jZSBjdXJzb3IgaW4gZGF0YWJhc2UiKTsKQEAgLTY1Niw3ICs2NTYsNyBA QCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjdXJzb3JJdGVyYXRlKGNvCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1 ZXN0SW1wbDxjb25zdCBJREJLZXlEYXRhJiwgY29uc3QgSURCS2V5RGF0YSYsIFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiwgdWludDMyX3QsIGNvbnN0IFN0cmluZyY+OjpjcmVhdGUoW3RoaXMsIGNh bGxiYWNrXShjb25zdCBJREJLZXlEYXRhJiBrZXksIGNvbnN0IElEQktleURhdGEmIHByaW1hcnlL ZXksIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiB2YWx1ZSwgdWludDMyX3QgZXJyb3JDb2RlLCBj b25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgeworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJl cXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPElEQktleURhdGEsIElEQktleURhdGEsIFBhc3NSZWZQ dHI8U2hhcmVkQnVmZmVyPiwgdWludDMyX3QsIFN0cmluZz46OmNyZWF0ZShbdGhpcywgY2FsbGJh Y2tdKGNvbnN0IElEQktleURhdGEmIGtleSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFyeUtleSwg UGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IHZhbHVlLCB1aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0 IFN0cmluZyYgZXJyb3JNZXNzYWdlKSB7CiAgICAgICAgIGNhbGxiYWNrKGtleSwgcHJpbWFyeUtl eSwgdmFsdWUsIGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9LCBbdGhpcywgY2FsbGJh Y2tdIHsKICAgICAgICAgY2FsbGJhY2sobnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0ciwgSU5WQUxJ RF9TVEFURV9FUlIsICJVbmFibGUgdG8gaXRlcmF0ZSBjdXJzb3IgaW4gZGF0YWJhc2UiKTsKQEAg LTY3Nyw3ICs2NzcsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjb3VudChjb25zdCBJREJJ CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1 ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxpbnQ2NF90LCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJj46 OmNyZWF0ZShbdGhpcywgY2FsbGJhY2tdKGludDY0X3QgY291bnQsIHVpbnQzMl90IGVycm9yQ29k ZSwgY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpIHsKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0 PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxpbnQ2NF90LCB1aW50MzJfdCwgU3RyaW5nPjo6 Y3JlYXRlKFt0aGlzLCBjYWxsYmFja10oaW50NjRfdCBjb3VudCwgdWludDMyX3QgZXJyb3JDb2Rl LCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgewogICAgICAgICBjYWxsYmFjayhjb3VudCwg ZXJyb3JDb2RlLCBlcnJvck1lc3NhZ2UpOwogICAgIH0sIFt0aGlzLCBjYWxsYmFja10gewogICAg ICAgICBjYWxsYmFjaygwLCBJTlZBTElEX1NUQVRFX0VSUiwgIlVuYWJsZSB0byBnZXQgY291bnQg ZnJvbSBkYXRhYmFzZSIpOwpAQCAtNjk4LDcgKzY5OCw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJh c2U6OmRlbGV0ZVJhbmdlKGNvbnMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFJlZlB0 cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPHVpbnQzMl90LCBjb25z dCBTdHJpbmcmPjo6Y3JlYXRlKFtjYWxsYmFja10odWludDMyX3QgZXJyb3JDb2RlLCBjb25zdCBT dHJpbmcmIGVycm9yTWVzc2FnZSkgeworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3Qg PSBBc3luY1JlcXVlc3RJbXBsPHVpbnQzMl90LCBTdHJpbmc+OjpjcmVhdGUoW2NhbGxiYWNrXSh1 aW50MzJfdCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKSB7CiAgICAgICAg IGNhbGxiYWNrKGVycm9yQ29kZSwgZXJyb3JNZXNzYWdlKTsKICAgICB9LCBbY2FsbGJhY2tdIHsK ICAgICAgICAgY2FsbGJhY2soSU5WQUxJRF9TVEFURV9FUlIsICJVbmFibGUgdG8gZGVsZXRlUmFu Z2UgZnJvbSBkYXRhYmFzZSIpOwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0FzeW5jUmVx dWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Bc3luY1JlcXVlc3Qu aAkocmV2aXNpb24gMTc3NDM5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0FzeW5jUmVxdWVz dC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NywxMiArNTcsMTQgQEAgcHJpdmF0ZToKIHRlbXBsYXRl IDx0eXBlbmFtZS4uLiBBcmd1bWVudHM+CiBjbGFzcyBBc3luY1JlcXVlc3RJbXBsIGZpbmFsIDog cHVibGljIEFzeW5jUmVxdWVzdCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8QXN5 bmNSZXF1ZXN0PiBjcmVhdGUoc3RkOjpmdW5jdGlvbjx2b2lkIChBcmd1bWVudHMuLi4pPiBjb21w bGV0aW9uSGFuZGxlcikKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB1c2luZyBBcmd1bWVudFR5 cGUgPSBzdGQ6OmNvbmRpdGlvbmFsPHN0ZDo6aXNfaW50ZWdyYWw8VD46OnZhbHVlLCBULCBjb25z dCBUJj47CisKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxBc3luY1JlcXVlc3Q+IGNyZWF0ZShzdGQ6 OmZ1bmN0aW9uPHZvaWQgKHR5cGVuYW1lIEFyZ3VtZW50VHlwZTxBcmd1bWVudHM+Ojp0eXBlLi4u KT4gY29tcGxldGlvbkhhbmRsZXIpCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IEFzeW5jUmVxdWVzdEltcGw8QXJndW1lbnRzLi4uPihXVEY6Om1vdmUoY29tcGxldGlvbkhhbmRs ZXIpLCBudWxscHRyKSk7CiAgICAgfQogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8QXN5bmNSZXF1 ZXN0PiBjcmVhdGUoc3RkOjpmdW5jdGlvbjx2b2lkIChBcmd1bWVudHMuLi4pPiBjb21wbGV0aW9u SGFuZGxlciwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBhYm9ydEhhbmRsZXIpCisgICAgc3RhdGlj IFBhc3NSZWZQdHI8QXN5bmNSZXF1ZXN0PiBjcmVhdGUoc3RkOjpmdW5jdGlvbjx2b2lkICh0eXBl bmFtZSBBcmd1bWVudFR5cGU8QXJndW1lbnRzPjo6dHlwZS4uLik+IGNvbXBsZXRpb25IYW5kbGVy LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGFib3J0SGFuZGxlcikKICAgICB7CiAgICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgQXN5bmNSZXF1ZXN0SW1wbDxBcmd1bWVudHMuLi4+KFdURjo6bW92 ZShjb21wbGV0aW9uSGFuZGxlciksIFdURjo6bW92ZShhYm9ydEhhbmRsZXIpKSk7CiAgICAgfQpA QCAtNzIsMTQgKzc0LDE1IEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKCFtX2NvbXBsZXRpb25I YW5kbGVyKTsKICAgICB9CiAKLSAgICB2b2lkIGNvbXBsZXRlUmVxdWVzdChBcmd1bWVudHMmJi4u LiBhcmd1bWVudHMpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUuLi4gUmVxdWVzdEFyZ3VtZW50cz4K KyAgICB2b2lkIGNvbXBsZXRlUmVxdWVzdChSZXF1ZXN0QXJndW1lbnRzJiYuLi4gYXJndW1lbnRz KQogICAgIHsKLSAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihzdGQ6OmZvcndhcmQ8QXJndW1l bnRzPihhcmd1bWVudHMpLi4uKTsKKyAgICAgICAgbV9jb21wbGV0aW9uSGFuZGxlcihzdGQ6OmZv cndhcmQ8UmVxdWVzdEFyZ3VtZW50cz4oYXJndW1lbnRzKS4uLik7CiAgICAgICAgIG1fY29tcGxl dGlvbkhhbmRsZXIgPSBudWxscHRyOwogICAgIH0KIAogcHJpdmF0ZToKLSAgICBBc3luY1JlcXVl c3RJbXBsKHN0ZDo6ZnVuY3Rpb248dm9pZCAoQXJndW1lbnRzLi4uKT4gY29tcGxldGlvbkhhbmRs ZXIsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gYWJvcnRIYW5kbGVyKQorICAgIEFzeW5jUmVxdWVz dEltcGwoc3RkOjpmdW5jdGlvbjx2b2lkICh0eXBlbmFtZSBBcmd1bWVudFR5cGU8QXJndW1lbnRz Pjo6dHlwZS4uLik+IGNvbXBsZXRpb25IYW5kbGVyLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGFi b3J0SGFuZGxlcikKICAgICAgICAgOiBBc3luY1JlcXVlc3QoV1RGOjptb3ZlKGFib3J0SGFuZGxl cikpCiAgICAgICAgICwgbV9jb21wbGV0aW9uSGFuZGxlcihXVEY6Om1vdmUoY29tcGxldGlvbkhh bmRsZXIpKQogICAgIHsKQEAgLTkxLDEyICs5NCwxMiBAQCBwcml2YXRlOgogICAgICAgICBtX2Nv bXBsZXRpb25IYW5kbGVyID0gbnVsbHB0cjsKICAgICB9CiAKLSAgICBzdGQ6OmZ1bmN0aW9uPHZv aWQgKEFyZ3VtZW50cy4uLik+IG1fY29tcGxldGlvbkhhbmRsZXI7CisgICAgc3RkOjpmdW5jdGlv bjx2b2lkICh0eXBlbmFtZSBBcmd1bWVudFR5cGU8QXJndW1lbnRzPjo6dHlwZS4uLik+IG1fY29t cGxldGlvbkhhbmRsZXI7CiB9OwogCiB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBBcmd1bWVudHM+IHZv aWQgQXN5bmNSZXF1ZXN0Ojpjb21wbGV0ZVJlcXVlc3QoQXJndW1lbnRzJiYuLi4gYXJndW1lbnRz KQogewotICAgIEFzeW5jUmVxdWVzdEltcGw8QXJndW1lbnRzLi4uPiogcmVxdWVzdCA9IHN0YXRp Y19jYXN0PEFzeW5jUmVxdWVzdEltcGw8QXJndW1lbnRzLi4uPio+KHRoaXMpOworICAgIGF1dG8q IHJlcXVlc3QgPSBzdGF0aWNfY2FzdDxBc3luY1JlcXVlc3RJbXBsPHR5cGVuYW1lIHN0ZDo6ZGVj YXk8QXJndW1lbnRzPjo6dHlwZS4uLj4qPih0aGlzKTsKICAgICByZXF1ZXN0LT5jb21wbGV0ZVJl cXVlc3Qoc3RkOjpmb3J3YXJkPEFyZ3VtZW50cz4oYXJndW1lbnRzKS4uLik7CiAgICAgbV9hYm9y dEhhbmRsZXIgPSBudWxscHRyOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9E YXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJT ZXJ2ZXJDb25uZWN0aW9uLmNwcAkocmV2aXNpb24gMTc3NDM5KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTQsNyArMTE0LDcgQEAgdm9pZCBXZWJJREJTZXJ2ZXJDb25u ZWN0aW9uOjpkaWREZWxldGVEYQogCiB2b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmdldE9y RXN0YWJsaXNoSURCRGF0YWJhc2VNZXRhZGF0YShHZXRJREJEYXRhYmFzZU1ldGFkYXRhRnVuY3Rp b24gY29tcGxldGlvbkNhbGxiYWNrKQogewotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZl clJlcXVlc3QgPSBBc3luY1JlcXVlc3RJbXBsPGNvbnN0IElEQkRhdGFiYXNlTWV0YWRhdGEmLCBi b29sPjo6Y3JlYXRlKGNvbXBsZXRpb25DYWxsYmFjayk7CisgICAgUmVmUHRyPEFzeW5jUmVxdWVz dD4gc2VydmVyUmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8SURCRGF0YWJhc2VNZXRhZGF0YSwg Ym9vbD46OmNyZWF0ZShjb21wbGV0aW9uQ2FsbGJhY2spOwogCiAgICAgc2VydmVyUmVxdWVzdC0+ c2V0QWJvcnRIYW5kbGVyKFtjb21wbGV0aW9uQ2FsbGJhY2tdIHsKICAgICAgICAgSURCRGF0YWJh c2VNZXRhZGF0YSBtZXRhZGF0YTsKQEAgLTM5OSw3ICszOTksNyBAQCB2b2lkIFdlYklEQlNlcnZl ckNvbm5lY3Rpb246OmRpZERlbGV0ZUluCiAKIHZvaWQgV2ViSURCU2VydmVyQ29ubmVjdGlvbjo6 Z2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYgdHJhbnNhY3Rpb24sIGNvbnN0IEdldE9wZXJhdGlv biYgb3BlcmF0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IElEQkdldFJlc3VsdCYsIFBh c3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spCiB7Ci0gICAg UmVmUHRyPEFzeW5jUmVxdWVzdD4gc2VydmVyUmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8Y29u c3QgSURCR2V0UmVzdWx0JiwgUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPj46OmNyZWF0ZShj b21wbGV0aW9uQ2FsbGJhY2spOworICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHNlcnZlclJlcXVl c3QgPSBBc3luY1JlcXVlc3RJbXBsPElEQkdldFJlc3VsdCwgUGFzc1JlZlB0cjxJREJEYXRhYmFz ZUVycm9yPj46OmNyZWF0ZShjb21wbGV0aW9uQ2FsbGJhY2spOwogCiAgICAgc2VydmVyUmVxdWVz dC0+c2V0QWJvcnRIYW5kbGVyKFtjb21wbGV0aW9uQ2FsbGJhY2tdIHsKICAgICAgICAgY29tcGxl dGlvbkNhbGxiYWNrKElEQkdldFJlc3VsdCgpLCBJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUoSURC RGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgIlVua25vd24gZXJyb3Igb2NjdXJlZCBn ZXR0aW5nIHJlY29yZCIpKTsK