97519 2012-09-24 21:21:42 -0700 Remove JSObject::unwrappedGlobalObject(), JSObject::unwrappedObject() 2012-09-25 02:53:33 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97529 1 barraclough webkit-unassigned cdumez ossy zarvai oldest_to_newest 727255 0 barraclough 2012-09-24 21:21:42 -0700 This will allow us to turn JSGlobalThis into a more generic proxy. 727261 1 165513 barraclough 2012-09-24 21:30:35 -0700 Created attachment 165513 Fix 727269 2 165513 ggaren 2012-09-24 21:36:37 -0700 Comment on attachment 165513 Fix r=me 727282 3 barraclough 2012-09-24 21:52:09 -0700 Fixed in r129456 727304 4 cdumez 2012-09-24 22:56:21 -0700 After this patch it seems, http/tests/security/xss-eval.html started failing on EFL port with the following diff: --- /home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/layout-test-results/http/tests/security/xss-eval-expected.txt +++ /home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/layout-test-results/http/tests/security/xss-eval-actual.txt @@ -5,7 +5,7 @@ If the test passes, you'll see a pass message below. PASS: eval.call(frames[0], 'document') should be EvalError and is. -PASS: childEval.call(frames[0], 'document') should be EvalError and is. +FAIL: childEval.call(frames[0], 'document') should be EvalError but instead is [object HTMLDocument]. PASS: childEvalCaller('document') should be TypeError and is. -PASS: childLocalEvalCaller('document') should be EvalError and is. +FAIL: childLocalEvalCaller('document') should be EvalError but instead is [object HTMLDocument]. 727305 5 cdumez 2012-09-24 22:58:04 -0700 (In reply to comment #4) > After this patch it seems, http/tests/security/xss-eval.html started failing on EFL port with the following diff: > --- /home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/layout-test-results/http/tests/security/xss-eval-expected.txt > +++ /home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/layout-test-results/http/tests/security/xss-eval-actual.txt > @@ -5,7 +5,7 @@ > If the test passes, you'll see a pass message below. > > PASS: eval.call(frames[0], 'document') should be EvalError and is. > -PASS: childEval.call(frames[0], 'document') should be EvalError and is. > +FAIL: childEval.call(frames[0], 'document') should be EvalError but instead is [object HTMLDocument]. > PASS: childEvalCaller('document') should be TypeError and is. > -PASS: childLocalEvalCaller('document') should be EvalError and is. > +FAIL: childLocalEvalCaller('document') should be EvalError but instead is [object HTMLDocument]. Same on mac: http://build.webkit.org/builders/Apple%20Lion%20Release%20WK1%20%28Tests%29/builds/3958 727351 6 zarvai 2012-09-25 00:23:04 -0700 (In reply to comment #5) > Same on mac: > http://build.webkit.org/builders/Apple%20Lion%20Release%20WK1%20%28Tests%29/builds/3958 And same on Qt: http://build.webkit.org/builders/Qt%20Linux%20Release/builds/52514 727446 7 ossy 2012-09-25 02:53:33 -0700 new bug report to track the regression: https://bugs.webkit.org/show_bug.cgi?id=97529 165513 2012-09-24 21:30:35 -0700 2012-09-24 21:36:36 -0700 Fix 97519.patch text/plain 8878 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI5NDQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDEyLTA5LTI0ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBSZW1vdmUgSlNPYmplY3Q6OnVud3JhcHBlZEdsb2JhbE9iamVjdCgpLCBKU09i amVjdDo6dW53cmFwcGVkT2JqZWN0KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk3NTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgdW53cmFwcGVkR2xvYmFsT2JqZWN0KCkgd2FzIG9ubHkgbmVlZGVkIGJl Y2F1c2UgZ2xvYmFsT2JqZWN0KCkgZG9lc24ndCBhbHdheXMgcmV0dXJuIGEgaGVscGZ1bCByZXN1 bHQgLQorICAgICAgICBzcGVjaWZpY2FsbHkgZm9yIFdlYkNvcmUncyB3aW5kb3cgc2hlbGwgdGhl IHN0cnVjdHVyZSdzIGdsb2JhbE9iamVjdCBpcyBzZXQgdG8gbnVsbC4gV2UgY2FuIGZpeCB0aGlz IGJ5CisgICAgICAgIHNpbXBseSBrZWVwaW5nIHRoZSBzdHJ1Y3R1cmUgdXAgdG8gZGF0ZSBhcyB0 aGUgd2luZG93IG5hdmlnYXRlcywgb2J2aWF0aW5nIHRoZSBuZWVkIGZvciB0aGlzIGZ1bmN0aW9u LgorCisgICAgICAgIFRoZSBvbmx5IG90aGVyIHVzZSBvZiB1bndyYXBwZWRPYmplY3QoKSBjYW1l IGZyb20gZ2xvYmFsRnVuY0V2YWwoKSwgYW5kIHRoaXMgY2FuIGJlIHRyaXZpYWxseSByZW1vdmVk CisgICAgICAgIGJ5IGZsaXBwaW5nIHRoZSB3YXkgd2UgcGVyZm9ybSB0aGlzIGdsb2JhbE9iamVj dCBjaGVjayAod2hpY2ggd2UgbWF5IGFsc28gYmUgYWJsZSB0byByZW1vdmUhKSAtIGluc3RlYWQK KyAgICAgICAgb2YgZ2V0dGluZyB0aGUgZ2xvYmFsT2JqZWN0IGZyb20gdGhlIHByb3ZpZGVkIHRo aXMgdmFsdWUgJiBjb21wYXJpbmcgdG8gdGhlIGV4cGVjdGVkIGdsb2JhbE9iamVjdCwgd2UKKyAg ICAgICAgY2FuIGdldCB0aGUgdGhpcyB2YWx1ZSBmcm9tIHRoZSBleHBlY3RlZCBnbG9iYWxPYmpl Y3QsIGFuZCBjb21wYXJlIHRvIHRoYXQgcHJvdmlkZWQuCisKKyAgICAgICAgKiBydW50aW1lL0pT R2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAgICAgIC0gQ2FsbCBnbG9iYWxPYmplY3QoKSBpbnN0 ZWFkIG9mIHVud3JhcHBlZEdsb2JhbE9iamVjdCgpLgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9i YWxPYmplY3RGdW5jdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpnbG9iYWxGdW5jRXZhbCk6Cisg ICAgICAgICAgICAtIENoYW5nZWQgdG8gY29tcGFyZSB0aGlzIG9iamVjdCB2YWx1ZXMsIGluc3Rl YWQgb2YgZ2xvYmFsT2JqZWN0cyAtCisgICAgICAgICAgICAgIHRoaXMgbWVhbnMgd2Ugb25seSBu ZWVkIHRvIGJlIGFibGUgdG8gbWFwIGdsb2JhbE9iamVjdCAtPiB0aGlzLAorICAgICAgICAgICAg ICBhbmQgbm90IHZpY2UgdmVyc2EuCisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6OkpTT2JqZWN0OjphbGxvd3NBY2Nlc3NGcm9tKToKKyAgICAgICAgKEpTQzo6 SlNPYmplY3Q6OmNyZWF0ZUluaGVyaXRvcklEKToKKyAgICAgICAgICAgIC0gQ2FsbCBnbG9iYWxP YmplY3QoKSBpbnN0ZWFkIG9mIHVud3JhcHBlZEdsb2JhbE9iamVjdCgpLgorICAgICAgICAqIHJ1 bnRpbWUvSlNPYmplY3QuaDoKKyAgICAgICAgKEpTT2JqZWN0KToKKyAgICAgICAgICAgIC0gUmVt b3ZlZCB1bndyYXBwZWRHbG9iYWxPYmplY3QoKSwgdW53cmFwcGVkT2JqZWN0KCkuCisKIDIwMTIt MDktMjQgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBOZXN0ZWQg dHJ5L2ZpbmFsbHkgc2hvdWxkIG5vdCBjb25mdXNlIHRoZSBmaW5hbGx5IHVucG9wcGVyIGluIEJ5 dGVjb2RlR2VuZXJhdG9yOjplbWl0Q29tcGxleEp1bXBTY29wZXMKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAJKHJldmlzaW9uIDEy OTQzNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzczLDcgKzM3Myw3IEBAIHZvaWQgT2JqZWN0c1dpdGhCcm9r ZW5JbmRleGluZ0ZpbmRlcjo6b3AKICAgICAvLyBhIGRpZmZlcmVudCBnbG9iYWwgb2JqZWN0IHRo YXQgaGF2ZSBwcm90b3R5cGVzIGZyb20gb3VyIGdsb2JhbCBvYmplY3QuCiAgICAgYm9vbCBmb3Vu ZEdsb2JhbE9iamVjdCA9IGZhbHNlOwogICAgIGZvciAoSlNPYmplY3QqIGN1cnJlbnQgPSBvYmpl Y3Q7IDspIHsKLSAgICAgICAgaWYgKGN1cnJlbnQtPnVud3JhcHBlZEdsb2JhbE9iamVjdCgpID09 IG1fZ2xvYmFsT2JqZWN0KSB7CisgICAgICAgIGlmIChjdXJyZW50LT5nbG9iYWxPYmplY3QoKSA9 PSBtX2dsb2JhbE9iamVjdCkgewogICAgICAgICAgICAgZm91bmRHbG9iYWxPYmplY3QgPSB0cnVl OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0RnVuY3Rpb25zLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdEZ1bmN0aW9ucy5jcHAJ KHJldmlzaW9uIDEyOTQzNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xv YmFsT2JqZWN0RnVuY3Rpb25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDk4LDggKzQ5OCw4IEBA IHN0YXRpYyBkb3VibGUgcGFyc2VGbG9hdChjb25zdCBTdHJpbmcmIHMKIEVuY29kZWRKU1ZhbHVl IEpTQ19IT1NUX0NBTEwgZ2xvYmFsRnVuY0V2YWwoRXhlY1N0YXRlKiBleGVjKQogewogICAgIEpT T2JqZWN0KiB0aGlzT2JqZWN0ID0gZXhlYy0+aG9zdFRoaXNWYWx1ZSgpLnRvVGhpc09iamVjdChl eGVjKTsKLSAgICBKU09iamVjdCogdW53cmFwcGVkT2JqZWN0ID0gdGhpc09iamVjdC0+dW53cmFw cGVkT2JqZWN0KCk7Ci0gICAgaWYgKCF1bndyYXBwZWRPYmplY3QtPmlzR2xvYmFsT2JqZWN0KCkg fHwganNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4odW53cmFwcGVkT2JqZWN0KS0+ZXZhbEZ1bmN0aW9u KCkgIT0gZXhlYy0+Y2FsbGVlKCkpCisgICAgSlNHbG9iYWxPYmplY3QqIGNhbGxlZUdsb2JhbE9i amVjdCA9IGV4ZWMtPmNhbGxlZSgpLT5nbG9iYWxPYmplY3QoKTsKKyAgICBpZiAodGhpc09iamVj dCAhPSBleGVjLT5jYWxsZWUoKS0+Z2xvYmFsT2JqZWN0KCktPmdsb2JhbFRoaXMoKSkKICAgICAg ICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVFdmFsRXJyb3IoZXhlYywgQVNDSUlM aXRlcmFsKCJUaGUgXCJ0aGlzXCIgdmFsdWUgcGFzc2VkIHRvIGV2YWwgbXVzdCBiZSB0aGUgZ2xv YmFsIG9iamVjdCBmcm9tIHdoaWNoIGV2YWwgb3JpZ2luYXRlZCIpKSk7CiAKICAgICBKU1ZhbHVl IHggPSBleGVjLT5hcmd1bWVudCgwKTsKQEAgLTUxOSwxMSArNTE5LDExIEBAIEVuY29kZWRKU1Zh bHVlIEpTQ19IT1NUX0NBTEwgZ2xvYmFsRnVuY0UKICAgICB9CiAKICAgICBFdmFsRXhlY3V0YWJs ZSogZXZhbCA9IEV2YWxFeGVjdXRhYmxlOjpjcmVhdGUoZXhlYywgbWFrZVNvdXJjZShzKSwgZmFs c2UpOwotICAgIEpTT2JqZWN0KiBlcnJvciA9IGV2YWwtPmNvbXBpbGUoZXhlYywganNDYXN0PEpT R2xvYmFsT2JqZWN0Kj4odW53cmFwcGVkT2JqZWN0KSk7CisgICAgSlNPYmplY3QqIGVycm9yID0g ZXZhbC0+Y29tcGlsZShleGVjLCBjYWxsZWVHbG9iYWxPYmplY3QpOwogICAgIGlmIChlcnJvcikK ICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBlcnJvcik7CiAKLSAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKGV4ZWMtPmludGVycHJldGVyKCktPmV4ZWN1dGUoZXZhbCwgZXhlYywg dGhpc09iamVjdCwganNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4odW53cmFwcGVkT2JqZWN0KSkpOwor ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoZXhlYy0+aW50ZXJwcmV0ZXIoKS0+ZXhlY3V0ZShl dmFsLCBleGVjLCB0aGlzT2JqZWN0LCBjYWxsZWVHbG9iYWxPYmplY3QpKTsKIH0KIAogRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBnbG9iYWxGdW5jUGFyc2VJbnQoRXhlY1N0YXRlKiBleGVj KQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAkocmV2 aXNpb24gMTI5NDM3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3Qu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MDEsNyArNjAxLDcgQEAgU3RydWN0dXJlKiBKU09iamVj dDo6aW5oZXJpdG9ySUQoSlNHbG9iYQogCiBib29sIEpTT2JqZWN0OjphbGxvd3NBY2Nlc3NGcm9t KEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0g dW53cmFwcGVkR2xvYmFsT2JqZWN0KCk7CisgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVj dCA9IHRoaXMtPmdsb2JhbE9iamVjdCgpOwogICAgIHJldHVybiBnbG9iYWxPYmplY3QtPmdsb2Jh bE9iamVjdE1ldGhvZFRhYmxlKCktPmFsbG93c0FjY2Vzc0Zyb20oZ2xvYmFsT2JqZWN0LCBleGVj KTsKIH0KIApAQCAtOTI0LDEzICs5MjQsNiBAQCBKU09iamVjdCogSlNPYmplY3Q6OnRvVGhpc09i amVjdChKU0NlbGwqCiAgICAgcmV0dXJuIGpzQ2FzdDxKU09iamVjdCo+KGNlbGwpOwogfQogCi1K U09iamVjdCogSlNPYmplY3Q6OnVud3JhcHBlZE9iamVjdCgpCi17Ci0gICAgaWYgKGlzR2xvYmFs VGhpcygpKQotICAgICAgICByZXR1cm4ganNDYXN0PEpTR2xvYmFsVGhpcyo+KHRoaXMpLT51bndy YXBwZWRPYmplY3QoKTsKLSAgICByZXR1cm4gdGhpczsKLX0KLQogdm9pZCBKU09iamVjdDo6c2Vh bChKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpCiB7CiAgICAgaWYgKGlzU2VhbGVkKGdsb2JhbERh dGEpKQpAQCAtOTU0LDEzICs5NDcsNiBAQCB2b2lkIEpTT2JqZWN0OjpwcmV2ZW50RXh0ZW5zaW9u cyhKU0dsb2JhCiAgICAgICAgIHNldFN0cnVjdHVyZShnbG9iYWxEYXRhLCBTdHJ1Y3R1cmU6OnBy ZXZlbnRFeHRlbnNpb25zVHJhbnNpdGlvbihnbG9iYWxEYXRhLCBzdHJ1Y3R1cmUoKSkpOwogfQog Ci1KU0dsb2JhbE9iamVjdCogSlNPYmplY3Q6OnVud3JhcHBlZEdsb2JhbE9iamVjdCgpCi17Ci0g ICAgaWYgKGlzR2xvYmFsVGhpcygpKQotICAgICAgICByZXR1cm4ganNDYXN0PEpTR2xvYmFsVGhp cyo+KHRoaXMpLT51bndyYXBwZWRPYmplY3QoKTsKLSAgICByZXR1cm4gc3RydWN0dXJlKCktPmds b2JhbE9iamVjdCgpOwotfQotCiAvLyBUaGlzIHByZXNlbnRseSB3aWxsIGZsYXR0ZW4gdG8gYW4g dW5jYWNoYWJsZSBkaWN0aW9uYXJ5OyB0aGlzIGlzIHN1aXRhYmxlCiAvLyBmb3IgdXNlIGluIGRl bGV0ZSwgd2UgbWF5IHdhbnQgdG8gZG8gc29tZXRoaW5nIGRpZmZlcmVudCBlbHNld2hlcmUuCiB2 b2lkIEpTT2JqZWN0OjpyZWlmeVN0YXRpY0Z1bmN0aW9uc0ZvckRlbGV0ZShFeGVjU3RhdGUqIGV4 ZWMpCkBAIC0xMDUyLDcgKzEwMzgsNyBAQCB2b2lkIEpTT2JqZWN0Ojpub3RpZnlVc2VkQXNQcm90 b3R5cGUoSlNHCiAKIFN0cnVjdHVyZSogSlNPYmplY3Q6OmNyZWF0ZUluaGVyaXRvcklEKEpTR2xv YmFsRGF0YSYgZ2xvYmFsRGF0YSkKIHsKLSAgICBTdHJ1Y3R1cmUqIGluaGVyaXRvcklEID0gY3Jl YXRlRW1wdHlPYmplY3RTdHJ1Y3R1cmUoZ2xvYmFsRGF0YSwgdW53cmFwcGVkR2xvYmFsT2JqZWN0 KCksIHRoaXMpOworICAgIFN0cnVjdHVyZSogaW5oZXJpdG9ySUQgPSBjcmVhdGVFbXB0eU9iamVj dFN0cnVjdHVyZShnbG9iYWxEYXRhLCBnbG9iYWxPYmplY3QoKSwgdGhpcyk7CiAgICAgQVNTRVJU KGluaGVyaXRvcklELT5pc0VtcHR5KCkpOwogCiAgICAgUHV0UHJvcGVydHlTbG90IHNsb3Q7Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHJldmlzaW9uIDEy OTQzNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJKHdvcmtp bmcgY29weSkKQEAgLTM0Myw3ICszNDMsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgLy8g Tk9URTogSlNPYmplY3QgYW5kIGl0cyBzdWJjbGFzc2VzIG11c3QgYmUgYWJsZSB0byBncmFjZWZ1 bGx5IGhhbmRsZSBFeGVjU3RhdGUqID0gMCwKICAgICAgICAgLy8gYmVjYXVzZSB0aGlzIGNhbGwg bWF5IGNvbWUgZnJvbSBpbnNpZGUgdGhlIGNvbXBpbGVyLgogICAgICAgICBKU19FWFBPUlRfUFJJ VkFURSBzdGF0aWMgSlNPYmplY3QqIHRvVGhpc09iamVjdChKU0NlbGwqLCBFeGVjU3RhdGUqKTsK LSAgICAgICAgSlNPYmplY3QqIHVud3JhcHBlZE9iamVjdCgpOwogCiAgICAgICAgIGJvb2wgZ2V0 UHJvcGVydHlTcGVjaWZpY1ZhbHVlKEV4ZWNTdGF0ZSosIFByb3BlcnR5TmFtZSwgSlNDZWxsKiYg c3BlY2lmaWNGdW5jdGlvbikgY29uc3Q7CiAKQEAgLTQ4MiwxMSArNDgxLDYgQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgICAgICByZXR1cm4gc3RydWN0dXJlKCktPmdsb2JhbE9iamVjdCgpOwog ICAgICAgICB9CiAgICAgICAgIAotICAgICAgICAvLyBEb2VzIGV2ZXJ5dGhpbmcgcG9zc2libGUg dG8gcmV0dXJuIHRoZSBnbG9iYWwgb2JqZWN0LiBJZiBpdCBlbmNvdW50ZXJzIGFuIG9iamVjdAot ICAgICAgICAvLyB0aGF0IGRvZXMgbm90IGhhdmUgYSBnbG9iYWwgb2JqZWN0LCBpdCByZXR1cm5z IDAgaW5zdGVhZCAoZm9yIGV4YW1wbGUKLSAgICAgICAgLy8gSlNOb3RBbk9iamVjdCkuCi0gICAg ICAgIEpTR2xvYmFsT2JqZWN0KiB1bndyYXBwZWRHbG9iYWxPYmplY3QoKTsKLSAgICAgICAgCiAg ICAgICAgIHZvaWQgc3dpdGNoVG9TbG93UHV0QXJyYXlTdG9yYWdlKEpTR2xvYmFsRGF0YSYpOwog ICAgICAgICAKICAgICAgICAgLy8gVGhlIHJlY2VpdmVyIGlzIHRoZSBwcm90b3R5cGUgaW4gdGhp cyBjYXNlLiBUaGUgZm9sbG93aW5nOgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI5NDQ1KQor KysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDktMjQgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29t PgorCisgICAgICAgIFJlbW92ZSBKU09iamVjdDo6dW53cmFwcGVkR2xvYmFsT2JqZWN0KCksIEpT T2JqZWN0Ojp1bndyYXBwZWRPYmplY3QoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc1MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBKU0RPTVdpbmRvd1NoZWxsOjpzZXRXaW5kb3cgc2hvdWxkIHVwZGF0 ZSB0aGUgc3RydWN0dXJlJ3MgZ2xvYmFsT2JqZWN0LgorCisgICAgICAgICogYmluZGluZ3MvanMv SlNET01XaW5kb3dTaGVsbC5oOgorICAgICAgICAoV2ViQ29yZTo6SlNET01XaW5kb3dTaGVsbDo6 c2V0V2luZG93KToKKyAgICAgICAgICAgIC0gVXBkYXRlIHRoZSBKU0RPTVdpbmRvd1NoZWxsJ3Mg c3RydWN0dXJlJ3MgZ2xvYmFsT2JqZWN0IHdoZW4gdGhlCisgICAgICAgICAgICAgIHdpbmRvdyBj aGFuZ2VzLgorCiAyMDEyLTA5LTI0ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCBHZW9sb2NhdGlvbiBlcnJvciByZXBvcnRpbmcgaW4gdGhlIHRl c3Qgc3VwcG9ydApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dT aGVsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2lu ZG93U2hlbGwuaAkocmV2aXNpb24gMTI5NDM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNET01XaW5kb3dTaGVsbC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUX0FSRyh3aW5k b3csIHdpbmRvdyk7CiAgICAgICAgICAgICBzZXRVbndyYXBwZWRPYmplY3QoZ2xvYmFsRGF0YSwg d2luZG93KTsKKyAgICAgICAgICAgIHN0cnVjdHVyZSgpLT5zZXRHbG9iYWxPYmplY3QoKkpTRE9N V2luZG93Ojpjb21tb25KU0dsb2JhbERhdGEoKSwgd2luZG93KTsKICAgICAgICAgfQogICAgICAg ICB2b2lkIHNldFdpbmRvdyhQYXNzUmVmUHRyPERPTVdpbmRvdz4pOwogCg==