190137 2018-10-01 06:57:16 -0700 [JSC] Add a C++ callable overload of objectConstructorSeal 2018-10-03 05:06:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189947 1 koby.b webkit-unassigned commit-queue fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1464994 0 koby.b 2018-10-01 06:57:16 -0700 Hi, In node-jsc, I needed to be able to seal an object from c++. Thus, I've added a objectConstructorSeal overload which receives a JSObject, and refactor the existing objectConstructorSeal to use it (similar to objectConstructorFreeze). I'm attaching the patch. 1464996 1 351244 koby.b 2018-10-01 07:04:55 -0700 Created attachment 351244 Patch 1465008 2 351244 ysuzuki 2018-10-01 08:08:55 -0700 Comment on attachment 351244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351244&action=review > Source/JavaScriptCore/runtime/ObjectConstructor.cpp:795 > if (UNLIKELY(!success)) { > - throwTypeError(exec, scope, "Unable to prevent extension in Object.seal"_s); > - return encodedJSValue(); > + return throwTypeError(exec, scope, "Unable to prevent extension in Object.seal"_s); > } Remove `{` and `}`. > Source/JavaScriptCore/runtime/ObjectConstructor.cpp:803 > + VM& vm = exec->vm(); > + auto scope = DECLARE_THROW_SCOPE(vm); In this case (expression which can cause an error is the last expression, and we do not have the other expressions which can cause an error), we don't need it. > Source/JavaScriptCore/runtime/ObjectConstructor.cpp:811 > + JSObject* result = objectConstructorSeal(exec, asObject(obj)); > + RETURN_IF_EXCEPTION(scope, encodedJSValue()); > + return JSValue::encode(result); In this case, we can just do return JSValue::enccode(objectConstructorSeal(exec, asObject(obj))); 1465074 3 koby.b 2018-10-01 10:26:18 -0700 Will upload a new patch. Note that your last two comments are also relevant to objectConstructorFreeze which follows (and which I basically copied). Should modify it too and upload a patch (maybe in a separate bug)? 1465172 4 351244 keith_miller 2018-10-01 12:35:05 -0700 Comment on attachment 351244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351244&action=review >> Source/JavaScriptCore/runtime/ObjectConstructor.cpp:803 >> + auto scope = DECLARE_THROW_SCOPE(vm); > > In this case (expression which can cause an error is the last expression, and we do not have the other expressions which can cause an error), we don't need it. I'm personally of the belief that we should have the scope anyway as the code can change in the future. It's good to be safe. >> Source/JavaScriptCore/runtime/ObjectConstructor.cpp:811 >> + return JSValue::encode(result); > > In this case, we can just do > > return JSValue::enccode(objectConstructorSeal(exec, asObject(obj))); If you decide to keep the scope, I would do: scope.release(); return JSValue::enccode(objectConstructorSeal(exec, asObject(obj))); Maybe we should have a macro for releasing then returning? We seem to do it a lot. 1465426 5 koby.b 2018-10-02 00:39:34 -0700 @Yusuke what do you think? should I remove the scope or leave it and use the new RELEASE_AND_RETURN? 1465500 6 ysuzuki 2018-10-02 04:46:29 -0700 (In reply to Koby from comment #5) > @Yusuke what do you think? should I remove the scope or leave it and use the > new RELEASE_AND_RETURN? Both are OK to me if you use RETURN_AND_RELEASE (which is already defined in runtime/ExceptionScope.h). 1465520 7 koby.b 2018-10-02 06:06:32 -0700 OK, i'll update the code. Just one more thing that I've noticed and wanted to be sure about: In both objectConstructorSeal and objectConstructorFreeze, if setIntegrityLevel throws an exception an empty value is returned, while if it returns false, an exception is (thrown and) returned. Is this desirable? just making sure. 1465523 8 ysuzuki 2018-10-02 06:16:12 -0700 (In reply to Koby from comment #7) > OK, i'll update the code. > Just one more thing that I've noticed and wanted to be sure about: In both > objectConstructorSeal and objectConstructorFreeze, if setIntegrityLevel > throws an exception an empty value is returned, while if it returns false, > an exception is (thrown and) returned. Is this desirable? just making sure. Except for some intentional cases (for optimization, see EXCEPTION_ASSERT code in JSC :) ), it is OK that the returned value of the function causing an exception is anything. 1466011 9 351507 koby.b 2018-10-03 04:23:33 -0700 Created attachment 351507 Patch 1466013 10 351507 ysuzuki 2018-10-03 04:29:10 -0700 Comment on attachment 351507 Patch r=me 1466014 11 koby.b 2018-10-03 04:30:41 -0700 @Yusuke great, I wasn't sure :) So just a couple of notes regarding the new patch: - So now that I've removed the RETURN_IF_EXCEPTION, the javascript callable objectConstructorSeal might return the exception, instead of always returning an empty value (but in the previous comment @Yusuke wrote that it's OK). - If approved, I would do the same change (RELEASE_AND_RETURN) for objectConstructorFreeze, which is exactly the same. I didn't want to add it to this patch because it's not directly related. What do you t think? 1466018 12 351507 commit-queue 2018-10-03 05:05:55 -0700 Comment on attachment 351507 Patch Clearing flags on attachment: 351507 Committed r236791: <https://trac.webkit.org/changeset/236791> 1466019 13 commit-queue 2018-10-03 05:05:56 -0700 All reviewed patches have been landed. Closing bug. 1466020 14 webkit-bug-importer 2018-10-03 05:06:25 -0700 <rdar://problem/44970666> 351244 2018-10-01 07:04:55 -0700 2018-10-03 04:23:25 -0700 Patch bug-190137-20181001170452.patch text/plain 3615 koby.b U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx OTEyMWY4MTFjYjc3MGYxZTRiYWE4ZjVhMzQ0ZDk5NGNlYjUwYWI0Li5kY2Y3ZDg0NjE4ZWQ0ZjRi MWM5NzZhOTk2YTdlZTRiYTQxODgyNTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOC0xMC0wMSAgS29ieSBCb3lhbmdvICA8a29ieS5iQG1jZS1zeXMuY29t PgorCisgICAgICAgIFtKU0NdIEFkZCBhIEMrKyBjYWxsYWJsZSBvdmVybG9hZCBvZiBvYmplY3RD b25zdHJ1Y3RvclNlYWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5MDEzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgICogcnVudGlt ZS9PYmplY3RDb25zdHJ1Y3Rvci5oOgorCiAyMDE4LTEwLTAxICBLb2J5IEJveWFuZ28gIDxrb2J5 LmJAbWNlLXN5cy5jb20+CiAKICAgICAgICAgW0pTQ10gQWRkIGEgSlNPTlN0cmluZ2lmeSBvdmVy bG9hZCB0aGF0IHJlY2VpdmVzIGEgSlNWYWx1ZSBzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwCmluZGV4IDNmOWY4MWMzNGZk Mjk2Y2UyN2JmYmQ3MGMxOTdlYmEwODI5MGJlMDMuLmYzOGEyNzgwNjM0YjJhZWJjMjM0ODJlMWI4 NjUyNDZlNzZiZTg4ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L09iamVjdENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHAKQEAgLTc3OCwzMCArNzc4LDM3IEBAIGJvb2wgdGVzdElu dGVncml0eUxldmVsKEV4ZWNTdGF0ZSogZXhlYywgVk0mIHZtLCBKU09iamVjdCogb2JqZWN0KQog ICAgIHJldHVybiB0cnVlOwogfQogCi1FbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG9iamVj dENvbnN0cnVjdG9yU2VhbChFeGVjU3RhdGUqIGV4ZWMpCitKU09iamVjdCogb2JqZWN0Q29uc3Ry dWN0b3JTZWFsKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIG9iamVjdCkKIHsKICAgICBWTSYg dm0gPSBleGVjLT52bSgpOwogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZt KTsKIAotICAgIC8vIDEuIElmIFR5cGUoTykgaXMgbm90IE9iamVjdCwgcmV0dXJuIE8uCi0gICAg SlNWYWx1ZSBvYmogPSBleGVjLT5hcmd1bWVudCgwKTsKLSAgICBpZiAoIW9iai5pc09iamVjdCgp KQotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKG9iaik7Ci0gICAgSlNPYmplY3QqIG9i amVjdCA9IGFzT2JqZWN0KG9iaik7Ci0KICAgICBpZiAoanNEeW5hbWljQ2FzdDxKU0ZpbmFsT2Jq ZWN0Kj4odm0sIG9iamVjdCkgJiYgIWhhc0luZGV4ZWRQcm9wZXJ0aWVzKG9iamVjdC0+aW5kZXhp bmdUeXBlKCkpKSB7CiAgICAgICAgIG9iamVjdC0+c2VhbCh2bSk7Ci0gICAgICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUob2JqKTsKKyAgICAgICAgcmV0dXJuIG9iamVjdDsKICAgICB9CiAKICAg ICBib29sIHN1Y2Nlc3MgPSBzZXRJbnRlZ3JpdHlMZXZlbDxJbnRlZ3JpdHlMZXZlbDo6U2VhbGVk PihleGVjLCB2bSwgb2JqZWN0KTsKLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNv ZGVkSlNWYWx1ZSgpKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsK ICAgICBpZiAoVU5MSUtFTFkoIXN1Y2Nlc3MpKSB7Ci0gICAgICAgIHRocm93VHlwZUVycm9yKGV4 ZWMsIHNjb3BlLCAiVW5hYmxlIHRvIHByZXZlbnQgZXh0ZW5zaW9uIGluIE9iamVjdC5zZWFsIl9z KTsKLSAgICAgICAgcmV0dXJuIGVuY29kZWRKU1ZhbHVlKCk7CisgICAgICAgIHJldHVybiB0aHJv d1R5cGVFcnJvcihleGVjLCBzY29wZSwgIlVuYWJsZSB0byBwcmV2ZW50IGV4dGVuc2lvbiBpbiBP YmplY3Quc2VhbCJfcyk7CiAgICAgfQogCi0gICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShvYmop OworICAgIHJldHVybiBvYmplY3Q7Cit9CisKK0VuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwg b2JqZWN0Q29uc3RydWN0b3JTZWFsKEV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBWTSYgdm0gPSBl eGVjLT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKwor ICAgIC8vIDEuIElmIFR5cGUoTykgaXMgbm90IE9iamVjdCwgcmV0dXJuIE8uCisgICAgSlNWYWx1 ZSBvYmogPSBleGVjLT5hcmd1bWVudCgwKTsKKyAgICBpZiAoIW9iai5pc09iamVjdCgpKQorICAg ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKG9iaik7CisgICAgSlNPYmplY3QqIHJlc3VsdCA9 IG9iamVjdENvbnN0cnVjdG9yU2VhbChleGVjLCBhc09iamVjdChvYmopKTsKKyAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKKyAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKHJlc3VsdCk7CiB9CiAKIEpTT2JqZWN0KiBvYmplY3RDb25zdHJ1Y3RvckZyZWV6 ZShFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBvYmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuaAppbmRleCAwY2Q3ZTkzNzEwYjhi NmJjZmJhZDAyOTA0YmQyZGZlYjA2YTk5ZjUwLi4xMzc3OTQ5ZGNhZjYwNWRlMjY4NjI4NzUxOTgw OTU3MTZjM2YzMmYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9P YmplY3RDb25zdHJ1Y3Rvci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09i amVjdENvbnN0cnVjdG9yLmgKQEAgLTExOCw2ICsxMTgsNyBAQCBpbmxpbmUgSlNPYmplY3QqIGNv bnN0cnVjdE9iamVjdEZyb21Qcm9wZXJ0eURlc2NyaXB0b3IoRXhlY1N0YXRlKiBleGVjLCBjb25z dCBQcgogCiAKIEpTX0VYUE9SVF9QUklWQVRFIEpTT2JqZWN0KiBvYmplY3RDb25zdHJ1Y3RvckZy ZWV6ZShFeGVjU3RhdGUqLCBKU09iamVjdCopOworSlNfRVhQT1JUX1BSSVZBVEUgSlNPYmplY3Qq IG9iamVjdENvbnN0cnVjdG9yU2VhbChFeGVjU3RhdGUqLCBKU09iamVjdCopOwogSlNWYWx1ZSBv YmplY3RDb25zdHJ1Y3RvckdldE93blByb3BlcnR5RGVzY3JpcHRvcihFeGVjU3RhdGUqLCBKU09i amVjdCosIGNvbnN0IElkZW50aWZpZXImKTsKIEpTVmFsdWUgb2JqZWN0Q29uc3RydWN0b3JHZXRP d25Qcm9wZXJ0eURlc2NyaXB0b3JzKEV4ZWNTdGF0ZSosIEpTT2JqZWN0Kik7CiBKU0FycmF5KiBv d25Qcm9wZXJ0eUtleXMoRXhlY1N0YXRlKiwgSlNPYmplY3QqLCBQcm9wZXJ0eU5hbWVNb2RlLCBE b250RW51bVByb3BlcnRpZXNNb2RlKTsK 351507 2018-10-03 04:23:33 -0700 2018-10-03 05:05:55 -0700 Patch bug-190137-20181003142330.patch text/plain 3583 koby.b U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl ZjZjODFhODU3ZDAyZTlkMTA4YzA0NzA1NjY4ZDM2MWQ5MzhmOTVkLi40ZjljMWQ1ZGQwOThmZmNi MDQwYmFkMjY1YjQwNDU5MjJjNzI4YWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOC0xMC0wMSAgS29ieSBCb3lhbmdvICA8a29ieS5iQG1jZS1zeXMuY29t PgorCisgICAgICAgIFtKU0NdIEFkZCBhIEMrKyBjYWxsYWJsZSBvdmVybG9hZCBvZiBvYmplY3RD b25zdHJ1Y3RvclNlYWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5MDEzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgICogcnVudGlt ZS9PYmplY3RDb25zdHJ1Y3Rvci5oOgorCiAyMDE4LTEwLTAxICBLb2J5IEJveWFuZ28gIDxrb2J5 LmJAbWNlLXN5cy5jb20+CiAKICAgICAgICAgW0pTQ10gQWRkIGEgSlNPTlN0cmluZ2lmeSBvdmVy bG9hZCB0aGF0IHJlY2VpdmVzIGEgSlNWYWx1ZSBzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwCmluZGV4IDcyZjVjY2MxYmRh MWE3OTFlMWNkNzYyOTk5M2FiMDU3ZDcwMDE5MGYuLjkwYTM2YTkzNTU3OGYyYjhlMzEzMTEzZDI5 ZDkwYmE5ZDQ2NmE5NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L09iamVjdENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHAKQEAgLTc2NiwzMCArNzY2LDM1IEBAIGJvb2wgdGVzdElu dGVncml0eUxldmVsKEV4ZWNTdGF0ZSogZXhlYywgVk0mIHZtLCBKU09iamVjdCogb2JqZWN0KQog ICAgIHJldHVybiB0cnVlOwogfQogCi1FbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG9iamVj dENvbnN0cnVjdG9yU2VhbChFeGVjU3RhdGUqIGV4ZWMpCitKU09iamVjdCogb2JqZWN0Q29uc3Ry dWN0b3JTZWFsKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIG9iamVjdCkKIHsKICAgICBWTSYg dm0gPSBleGVjLT52bSgpOwogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZt KTsKIAotICAgIC8vIDEuIElmIFR5cGUoTykgaXMgbm90IE9iamVjdCwgcmV0dXJuIE8uCi0gICAg SlNWYWx1ZSBvYmogPSBleGVjLT5hcmd1bWVudCgwKTsKLSAgICBpZiAoIW9iai5pc09iamVjdCgp KQotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKG9iaik7Ci0gICAgSlNPYmplY3QqIG9i amVjdCA9IGFzT2JqZWN0KG9iaik7Ci0KICAgICBpZiAoanNEeW5hbWljQ2FzdDxKU0ZpbmFsT2Jq ZWN0Kj4odm0sIG9iamVjdCkgJiYgIWhhc0luZGV4ZWRQcm9wZXJ0aWVzKG9iamVjdC0+aW5kZXhp bmdUeXBlKCkpKSB7CiAgICAgICAgIG9iamVjdC0+c2VhbCh2bSk7Ci0gICAgICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUob2JqKTsKKyAgICAgICAgcmV0dXJuIG9iamVjdDsKICAgICB9CiAKICAg ICBib29sIHN1Y2Nlc3MgPSBzZXRJbnRlZ3JpdHlMZXZlbDxJbnRlZ3JpdHlMZXZlbDo6U2VhbGVk PihleGVjLCB2bSwgb2JqZWN0KTsKLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNv ZGVkSlNWYWx1ZSgpKTsKLSAgICBpZiAoVU5MSUtFTFkoIXN1Y2Nlc3MpKSB7Ci0gICAgICAgIHRo cm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCAiVW5hYmxlIHRvIHByZXZlbnQgZXh0ZW5zaW9uIGlu IE9iamVjdC5zZWFsIl9zKTsKLSAgICAgICAgcmV0dXJuIGVuY29kZWRKU1ZhbHVlKCk7Ci0gICAg fQorICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOworICAgIGlmIChVTkxJ S0VMWSghc3VjY2VzcykpCisgICAgICAgIHJldHVybiB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29w ZSwgIlVuYWJsZSB0byBwcmV2ZW50IGV4dGVuc2lvbiBpbiBPYmplY3Quc2VhbCJfcyk7CisKKyAg ICByZXR1cm4gb2JqZWN0OworfQorCitFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG9iamVj dENvbnN0cnVjdG9yU2VhbChFeGVjU3RhdGUqIGV4ZWMpCit7CisgICAgVk0mIHZtID0gZXhlYy0+ dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisKKyAgICAv LyAxLiBJZiBUeXBlKE8pIGlzIG5vdCBPYmplY3QsIHJldHVybiBPLgorICAgIEpTVmFsdWUgb2Jq ID0gZXhlYy0+YXJndW1lbnQoMCk7CisgICAgaWYgKCFvYmouaXNPYmplY3QoKSkKKyAgICAgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShvYmopOwogCi0gICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShvYmopOworICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKG9i amVjdENvbnN0cnVjdG9yU2VhbChleGVjLCBhc09iamVjdChvYmopKSkpOwogfQogCiBKU09iamVj dCogb2JqZWN0Q29uc3RydWN0b3JGcmVlemUoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogb2Jq ZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29u c3RydWN0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVj dG9yLmgKaW5kZXggMGNkN2U5MzcxMGI4YjZiY2ZiYWQwMjkwNGJkMmRmZWIwNmE5OWY1MC4uMTM3 Nzk0OWRjYWY2MDVkZTI2ODYyODc1MTk4MDk1NzE2YzNmMzJmMiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5oCkBAIC0xMTgsNiArMTE4 LDcgQEAgaW5saW5lIEpTT2JqZWN0KiBjb25zdHJ1Y3RPYmplY3RGcm9tUHJvcGVydHlEZXNjcmlw dG9yKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgUHIKIAogCiBKU19FWFBPUlRfUFJJVkFURSBKU09i amVjdCogb2JqZWN0Q29uc3RydWN0b3JGcmVlemUoRXhlY1N0YXRlKiwgSlNPYmplY3QqKTsKK0pT X0VYUE9SVF9QUklWQVRFIEpTT2JqZWN0KiBvYmplY3RDb25zdHJ1Y3RvclNlYWwoRXhlY1N0YXRl KiwgSlNPYmplY3QqKTsKIEpTVmFsdWUgb2JqZWN0Q29uc3RydWN0b3JHZXRPd25Qcm9wZXJ0eURl c2NyaXB0b3IoRXhlY1N0YXRlKiwgSlNPYmplY3QqLCBjb25zdCBJZGVudGlmaWVyJik7CiBKU1Zh bHVlIG9iamVjdENvbnN0cnVjdG9yR2V0T3duUHJvcGVydHlEZXNjcmlwdG9ycyhFeGVjU3RhdGUq LCBKU09iamVjdCopOwogSlNBcnJheSogb3duUHJvcGVydHlLZXlzKEV4ZWNTdGF0ZSosIEpTT2Jq ZWN0KiwgUHJvcGVydHlOYW1lTW9kZSwgRG9udEVudW1Qcm9wZXJ0aWVzTW9kZSk7Cg==