70464 2011-10-19 18:18:27 -0700 Add a ConstructorMode check to all existing custom V8 constructors 2011-10-19 20:52:16 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 haraken webkit-unassigned abarth dominicc japhet webkit.review.bot oldest_to_newest 487193 0 haraken 2011-10-19 18:18:27 -0700 We should add the following two lines to all existing custom V8 constructors: if (ConstructorMode::current() == ConstructorMode::WrapExistingObject) return args.Holder(); This checks whether a programmer is trying to allocate an object via "new X", or C++ is trying to allocate an object via the function template and wrap the object with a JS flavor. In the latter case, a constructor callback should not be executed (i.e. should return immediately). As for existing custom V8 constructors, no bugs have been occurring without this check for now. However, without the check, the problems that I described in the bug 70015 can happen in the future if someone changes code. In addition, if the check does not exist in existing custom constructors, people will add a new custom constructor without the check without considering the possibility of the problems, which may result in ugly bugs. 487214 1 111708 haraken 2011-10-19 18:56:58 -0700 Created attachment 111708 Patch 487216 2 111708 abarth 2011-10-19 19:00:49 -0700 Comment on attachment 111708 Patch I suspect a bunch of these cases can't actually occur, but I support adding this check everywhere as a model. 487282 3 111708 webkit.review.bot 2011-10-19 20:52:11 -0700 Comment on attachment 111708 Patch Clearing flags on attachment: 111708 Committed r97929: <http://trac.webkit.org/changeset/97929> 487283 4 webkit.review.bot 2011-10-19 20:52:16 -0700 All reviewed patches have been landed. Closing bug. 111708 2011-10-19 18:56:58 -0700 2011-10-19 20:52:11 -0700 Patch bug-70464-20111020105657.patch text/plain 14315 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogOTc5MDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMTEzMmM3ZjU3MTBmYWEx YTViNWU0MmRmNDFhYTVlY2YwMTYyMzJlLi4yN2I4YjYyNzIyNGFhNjNmYmE0ZWJhM2Y2YzJjMjc3 OGY2NTk3ODQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMTAtMTkgIEtlbnRh cm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZGVkIGEgQ29uc3Ry dWN0b3JNb2RlIGNoZWNrIHRvIGFsbCBleGlzdGluZyBjdXN0b20gVjggY29uc3RydWN0b3JzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA0NjQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IGFkZHMgdGhlIGZvbGxvd2luZyB0d28gbGluZXMgdG8gYWxsIGV4aXN0aW5nIGN1c3RvbSBWOCBj b25zdHJ1Y3RvcnM6CisKKyAgICAgICAgICAgIGlmIChDb25zdHJ1Y3Rvck1vZGU6OmN1cnJlbnQo KSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGluZ09iamVjdCkKKyAgICAgICAgICAgICAg ICByZXR1cm4gYXJncy5Ib2xkZXIoKTsKKworICAgICAgICBUaGlzIGNoZWNrcyB3aGV0aGVyIGEg cHJvZ3JhbW1lciBpcyB0cnlpbmcgdG8gYWxsb2NhdGUgYW4gb2JqZWN0IHZpYSAibmV3IFgiLAor ICAgICAgICBvciBDKysgaXMgdHJ5aW5nIHRvIGFsbG9jYXRlIGFuIG9iamVjdCB2aWEgdGhlIGZ1 bmN0aW9uIHRlbXBsYXRlIGFuZCB3cmFwIHRoZQorICAgICAgICBvYmplY3Qgd2l0aCBhIEpTIGZs YXZvci4gKFNlZSBoZXJlIGZvciBtb3JlIGRldGFpbHM6IGJ1ZyA3MDAxNSkgSW4gdGhlIGxhdHRl ciBjYXNlLAorICAgICAgICBhIGNvbnN0cnVjdG9yIGNhbGxiYWNrIHNob3VsZCBub3QgYmUgZXhl Y3V0ZWQgKGkuZS4gc2hvdWxkIHJldHVybiBpbW1lZGlhdGVseSkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhBcnJheUJ1ZmZlckN1c3RvbS5jcHA6IEFkZGVkIHRoZSBDb25zdHJ1Y3Rvck1vZGUg Y2hlY2suCisgICAgICAgIChXZWJDb3JlOjpWOEFycmF5QnVmZmVyOjpjb25zdHJ1Y3RvckNhbGxi YWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0 b20uaDogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpjb25zdHJ1Y3RXZWJHTEFycmF5KToKKyAg ICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhBdWRpb0NvbnRleHRDdXN0b20uY3BwOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OlY4QXVkaW9Db250ZXh0Ojpjb25zdHJ1Y3RvckNhbGxiYWNr KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhET01Gb3JtRGF0YUN1c3RvbS5jcHA6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VjhET01Gb3JtRGF0YTo6Y29uc3RydWN0b3JDYWxs YmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20uY3Bw OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlY4RGF0YVZpZXc6OmNvbnN0cnVjdG9yQ2FsbGJh Y2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBdWRpb0VsZW1lbnRDb25z dHJ1Y3Rvci5jcHA6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6djhIVE1MQXVkaW9FbGVtZW50 Q29uc3RydWN0b3JDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRN TEltYWdlRWxlbWVudENvbnN0cnVjdG9yLmNwcDogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjp2 OEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MT3B0aW9uRWxlbWVudENvbnN0cnVjdG9yLmNwcDogRGl0dG8uCisg ICAgICAgIChXZWJDb3JlOjp2OEhUTUxPcHRpb25FbGVtZW50Q29uc3RydWN0b3JDYWxsYmFjayk6 CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUNoYW5uZWxDb25zdHJ1Y3Rv ci5jcHA6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VjhNZXNzYWdlQ2hhbm5lbDo6Y29uc3Ry dWN0b3JDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViS2l0TXV0 YXRpb25PYnNlcnZlckN1c3RvbS5jcHA6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJL aXRNdXRhdGlvbk9ic2VydmVyOjpjb25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9jdXN0b20vVjhXZWJLaXRQb2ludENvbnN0cnVjdG9yLmNwcDogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpWOFdlYktpdFBvaW50Ojpjb25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhXZWJTb2NrZXRDdXN0b20uY3BwOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OlY4V2ViU29ja2V0Ojpjb25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdENvbnN0cnVjdG9yLmNwcDog RGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpWOFhNTEh0dHBSZXF1ZXN0Ojpjb25zdHJ1Y3RvckNh bGxiYWNrKToKKwogMjAxMS0xMC0xOSAgQWRhbSBCZXJna3Zpc3QgIDxhZGFtLmJlcmdrdmlzdEBl cmljc3Nvbi5jb20+CiAKICAgICAgICAgVXBkYXRlIE1lZGlhU3RyZWFtIHRvIHVzZSBXZWJDb3Jl IHBsYXRmb3JtIGludGVyZmFjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyQ3VzdG9tLmNwcAppbmRleCBkY2I3ZjI3MmY2MjBk OGM2YjU4YWE3YjY3MGViOWU0NDk1ODU5OGYzLi5mMGRiZDQ4NTQxMTIwMzkwNjM4MzNjMzgxNDg5 NjllNzQ1Y2I5NWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhBcnJheUJ1ZmZlckN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4QXJyYXlCdWZmZXJDdXN0b20uY3BwCkBAIC00NSw2ICs0NSw5IEBAIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBWOEFycmF5QnVmZmVyOjpjb25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0 IHY4OjpBcmd1bWVudHMmIGFyCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAg ICAgICByZXR1cm4gdGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUg Y2FsbGVkIGFzIGEgZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlmIChD b25zdHJ1Y3Rvck1vZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGlu Z09iamVjdCkKKyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICAvLyBJZiB3ZSBy ZXR1cm4gYSBwcmV2aW91c2x5IGNvbnN0cnVjdGVkIEFycmF5QnVmZmVyLAogICAgIC8vIGUuZy4g ZnJvbSB0aGUgY2FsbCB0byBBcnJheUJ1ZmZlclZpZXcuYnVmZmVyLCB0aGlzIGNvZGUgaXMgY2Fs bGVkCiAgICAgLy8gd2l0aCBhIHplcm8tbGVuZ3RoIGFyZ3VtZW50IGxpc3QuIFRoZSBWOERPTVdy YXBwZXIgd2lsbCB0aGVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhBcnJheUJ1ZmZlclZpZXdDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCmluZGV4IGFjNGIwNGVjZGY2MWU4 MTg5NzZkMTI5YWExNGY2OGEzMDNhNDQzYjMuLmZkMWUzZTI2NTYxMmMwNzRhYTk4ODkxNDNmMjYw NGUyNmQ1MzM1YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOEFycmF5QnVmZmVyVmlld0N1c3RvbS5oCkBAIC05OCw2ICs5OCw5IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBjb25zdHJ1Y3RXZWJHTEFycmF5KGNvbnN0IHY4OjpBcmd1bWVu dHMmIGFyZ3MsIFdyYXBwZXJUeXBlCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQog ICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3Qg YmUgY2FsbGVkIGFzIGEgZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlm IChDb25zdHJ1Y3Rvck1vZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlz dGluZ09iamVjdCkKKyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICBpbnQgYXJn TGVuID0gYXJncy5MZW5ndGgoKTsKICAgICBpZiAoIWFyZ0xlbikgewogICAgICAgICAvLyBUaGlz IGhhcHBlbnMgd2hlbiB3ZSByZXR1cm4gYSBwcmV2aW91c2x5IGNvbnN0cnVjdGVkCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBdWRpb0NvbnRleHRDdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4QXVkaW9Db250ZXh0 Q3VzdG9tLmNwcAppbmRleCBlZjFjZjNmY2ZlZmU5ODZjYTk1NDA4ODQwZDkyMzBhOGE5YzM0YzQ2 Li41OTUwODBlMmY5NjBlZDgyMWZjMjk4OGUxMDEwNTgwZWEwMmY1M2U0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhBdWRpb0NvbnRleHRDdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEF1ZGlvQ29udGV4dEN1 c3RvbS5jcHAKQEAgLTQ2LDYgKzQ2LDkgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4QXVkaW9D b250ZXh0Ojpjb25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGEKICAgICBp ZiAoIWFyZ3MuSXNDb25zdHJ1Y3RDYWxsKCkpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCJB dWRpb0NvbnRleHQgY29uc3RydWN0b3IgY2Fubm90IGJlIGNhbGxlZCBhcyBhIGZ1bmN0aW9uLiIs IFY4UHJveHk6OlR5cGVFcnJvcik7CiAKKyAgICBpZiAoQ29uc3RydWN0b3JNb2RlOjpjdXJyZW50 KCkgPT0gQ29uc3RydWN0b3JNb2RlOjpXcmFwRXhpc3RpbmdPYmplY3QpCisgICAgICAgIHJldHVy biBhcmdzLkhvbGRlcigpOworCiAgICAgRnJhbWUqIGZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVG cmFtZUZvckN1cnJlbnRDb250ZXh0KCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJu IHRocm93RXJyb3IoIkF1ZGlvQ29udGV4dCBjb25zdHJ1Y3RvciBhc3NvY2lhdGVkIGZyYW1lIGlz IHVuYXZhaWxhYmxlIiwgVjhQcm94eTo6UmVmZXJlbmNlRXJyb3IpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFDdXN0b20uY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NRm9ybURhdGFDdXN0b20uY3Bw CmluZGV4IDk0NDMzZTkyYWE3YzVkNGEyZTFlMTAzMzEzMTVmOGEyNWRmMzUzMjAuLmUzNGVhNmZh OGQxMGFkYzZhNWUwY2FmMTgyNzVjYzAxNjFkNDY1MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTUZvcm1EYXRhQ3VzdG9tLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01Gb3JtRGF0YUN1c3RvbS5jcHAKQEAg LTQ3LDYgKzQ3LDkgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NRm9ybURhdGE6OmNvbnN0 cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXIKICAgICBpZiAoIWFyZ3MuSXND b25zdHJ1Y3RDYWxsKCkpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCJET00gb2JqZWN0IGNv bnN0cnVjdG9yIGNhbm5vdCBiZSBjYWxsZWQgYXMgYSBmdW5jdGlvbi4iLCBWOFByb3h5OjpUeXBl RXJyb3IpOwogCisgICAgaWYgKENvbnN0cnVjdG9yTW9kZTo6Y3VycmVudCgpID09IENvbnN0cnVj dG9yTW9kZTo6V3JhcEV4aXN0aW5nT2JqZWN0KQorICAgICAgICByZXR1cm4gYXJncy5Ib2xkZXIo KTsKKwogICAgIEhUTUxGb3JtRWxlbWVudCogZm9ybSA9IDA7CiAgICAgaWYgKGFyZ3MuTGVuZ3Ro KCkgPiAwICYmIFY4SFRNTEZvcm1FbGVtZW50OjpIYXNJbnN0YW5jZShhcmdzWzBdKSkKICAgICAg ICAgZm9ybSA9IFY4SFRNTEZvcm1FbGVtZW50Ojp0b05hdGl2ZShhcmdzWzBdLT5Ub09iamVjdCgp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFW aWV3Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERhdGFW aWV3Q3VzdG9tLmNwcAppbmRleCA2NmMzOTI5YjRhZjdmYzQzNTNmYTI0NzlkNDI5Zjc0OTA1ZjJk MDQwLi45MjAzZmVkY2M3OGY0MDQ1MTk0OWEyNmFjYTI5ODRhZjAwZjk3NTY4IDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEYXRhVmlld0N1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YVZpZXdDdXN0b20u Y3BwCkBAIC00MSw2ICs0MSw5IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERhdGFWaWV3Ojpj b25zdHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgaWYgKCFh cmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiRE9NIG9i amVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUgY2FsbGVkIGFzIGEgZnVuY3Rpb24iLCBWOFByb3h5 OjpUeXBlRXJyb3IpOwogCisgICAgaWYgKENvbnN0cnVjdG9yTW9kZTo6Y3VycmVudCgpID09IENv bnN0cnVjdG9yTW9kZTo6V3JhcEV4aXN0aW5nT2JqZWN0KQorICAgICAgICByZXR1cm4gYXJncy5I b2xkZXIoKTsKKwogICAgIGlmICghYXJncy5MZW5ndGgoKSkgewogICAgICAgICAvLyBzZWUgY29u c3RydWN0V2ViR0xBcnJheSAtLSB3ZSBkb24ndCBzZWVtIHRvIGJlIGFibGUgdG8gZGlzdGluZ2lz aCBiZXR3ZWVuCiAgICAgICAgIC8vICduZXcgRGF0YVZpZXcoKScgYW5kIHRoZSBjYWxsIHVzZWQg dG8gY29uc3RydWN0IHRoZSBjYWNoZWQgRGF0YVZpZXcgb2JqZWN0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEF1ZGlvRWxlbWVudENvbnN0cnVj dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBdWRpb0Vs ZW1lbnRDb25zdHJ1Y3Rvci5jcHAKaW5kZXggOTU2ZmM2NDU3MjNiOWE3Yzk5OTQzNjcwYmJhNjk4 ZDNjMjA0ZWYyYi4uMzE4ZjFjNTRlNDM3OTgyMzVjNDI2NGU2NGEyNGExNTA3ODNiZjkzNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEF1ZGlvRWxl bWVudENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhIVE1MQXVkaW9FbGVtZW50Q29uc3RydWN0b3IuY3BwCkBAIC01Niw2ICs1Niw5IEBAIHN0 YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdjhIVE1MQXVkaW9FbGVtZW50Q29uc3RydWN0b3JD YWxsYmFjayhjb25zdCB2ODo6QXJnCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQog ICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3Qg YmUgY2FsbGVkIGFzIGEgZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlm IChDb25zdHJ1Y3Rvck1vZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlz dGluZ09iamVjdCkKKyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICBGcmFtZSog ZnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ3VycmVudENvbnRleHQoKTsKICAgICBp ZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiQXVkaW8gY29uc3RydWN0b3Ig YXNzb2NpYXRlZCBmcmFtZSBpcyB1bmF2YWlsYWJsZSIsIFY4UHJveHk6OlJlZmVyZW5jZUVycm9y KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxJ bWFnZUVsZW1lbnRDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3IuY3BwCmluZGV4IGJjZWZmYzg0MTY5 YjJlYTk5OTczM2VkYjNjZWM0ZjY2N2YyNTFhZWIuLjY3YjlkMWE1MjQzY2IyZTE5NzYyNDk1OTUz NGI4NGU1ZTU4YTgzM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yLmNwcApA QCAtNTMsNiArNTMsOSBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4SFRNTEltYWdl RWxlbWVudENvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZwogICAgIGlmICghYXJncy5J c0NvbnN0cnVjdENhbGwoKSkKICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoIkRPTSBvYmplY3Qg Y29uc3RydWN0b3IgY2Fubm90IGJlIGNhbGxlZCBhcyBhIGZ1bmN0aW9uLiIsIFY4UHJveHk6OlR5 cGVFcnJvcik7CiAKKyAgICBpZiAoQ29uc3RydWN0b3JNb2RlOjpjdXJyZW50KCkgPT0gQ29uc3Ry dWN0b3JNb2RlOjpXcmFwRXhpc3RpbmdPYmplY3QpCisgICAgICAgIHJldHVybiBhcmdzLkhvbGRl cigpOworCiAgICAgRnJhbWUqIGZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVGcmFtZUZvckN1cnJl bnRDb250ZXh0KCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIHRocm93RXJyb3Io IkltYWdlIGNvbnN0cnVjdG9yIGFzc29jaWF0ZWQgZnJhbWUgaXMgdW5hdmFpbGFibGUiLCBWOFBy b3h5OjpSZWZlcmVuY2VFcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MT3B0aW9uRWxlbWVudENvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25FbGVtZW50Q29uc3RydWN0b3Iu Y3BwCmluZGV4IDIxYWY5N2RkM2RiNjcxZTNjYjFjZDkzMzc0ODE5YWFlMzJhZmIyMGMuLjVjNzFh YjZiMmE0NDJiMGU3ZWQzMzk2Y2Y2Mzg5NmVlMWMzMmM3YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25FbGVtZW50Q29uc3RydWN0b3Iu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25F bGVtZW50Q29uc3RydWN0b3IuY3BwCkBAIC01Myw2ICs1Myw5IEBAIHN0YXRpYyB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gdjhIVE1MT3B0aW9uRWxlbWVudENvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qg djg6OkFyCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAgICAgICByZXR1cm4g dGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUgY2FsbGVkIGFzIGEg ZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlmIChDb25zdHJ1Y3Rvck1v ZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGluZ09iamVjdCkKKyAg ICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICBGcmFtZSogZnJhbWUgPSBWOFByb3h5 OjpyZXRyaWV2ZUZyYW1lRm9yQ3VycmVudENvbnRleHQoKTsKICAgICBpZiAoIWZyYW1lKQogICAg ICAgICByZXR1cm4gdGhyb3dFcnJvcigiT3B0aW9uIGNvbnN0cnVjdG9yIGFzc29jaWF0ZWQgZnJh bWUgaXMgdW5hdmFpbGFibGUiLCBWOFByb3h5OjpSZWZlcmVuY2VFcnJvcik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlQ2hhbm5lbENvbnN0 cnVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VD aGFubmVsQ29uc3RydWN0b3IuY3BwCmluZGV4IDQ4MzMwNTRiNTM4YmJlYTM4N2M2ODIwZTA3ZTA3 ODA1NWQ5Nzc1ZTMuLjZmZGE4MzE5MjYzZDIxNzU4MmUzNzc1MTQ3N2VlMGYxYjk4ZjU5MTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VDaGFu bmVsQ29uc3RydWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOE1lc3NhZ2VDaGFubmVsQ29uc3RydWN0b3IuY3BwCkBAIC01Myw2ICs1Myw5IEBAIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBWOE1lc3NhZ2VDaGFubmVsOjpjb25zdHJ1Y3RvckNhbGxiYWNrKGNv bnN0IHY4OjpBcmd1bWVudHMmCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAg ICAgICByZXR1cm4gdGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUg Y2FsbGVkIGFzIGEgZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlmIChD b25zdHJ1Y3Rvck1vZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGlu Z09iamVjdCkKKyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICAvLyBHZXQgdGhl IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgKFdvcmtlckNvbnRleHQgb3IgRG9jdW1lbnQpCiAgICAg U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCA9IGdldFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKTsKICAgICBpZiAoIWNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhXZWJLaXRNdXRhdGlvbk9ic2VydmVyQ3VzdG9tLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYktpdE11dGF0aW9uT2JzZXJ2ZXJDdXN0 b20uY3BwCmluZGV4IDg4MDY4ODNiMGU4MzNlY2VkYTYwMWEyZDA5YzY5NTE2NGQxYThjNmIuLjNl ZjExYWQzYmQ1ZTdiODY0NGM2YzFmMWFkMzNhMDMzYjIyMGFiYzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYktpdE11dGF0aW9uT2JzZXJ2ZXJDdXN0 b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYktpdE11 dGF0aW9uT2JzZXJ2ZXJDdXN0b20uY3BwCkBAIC01Myw2ICs1Myw5IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOFdlYktpdE11dGF0aW9uT2JzZXJ2ZXI6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29u c3Qgdjg6OkFyCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAgICAgICByZXR1 cm4gdGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUgY2FsbGVkIGFz IGEgZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKIAorICAgIGlmIChDb25zdHJ1Y3Rv ck1vZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGluZ09iamVjdCkK KyAgICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICBpZiAoYXJncy5MZW5ndGgoKSA8 IDEpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCJOb3QgZW5vdWdoIGFyZ3VtZW50cyIsIFY4 UHJveHk6OlR5cGVFcnJvcik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFdlYktpdFBvaW50Q29uc3RydWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViS2l0UG9pbnRDb25zdHJ1Y3Rvci5jcHAKaW5kZXggNjAz NDdkNTVlMTViOTRiNTUwYmNkNWE2ZDQ4NjE2NWNlMGNhMzA0NC4uNjlkOGIyYTU3M2MzODVmNWE5 OTYxODQzNTA4MTUyZDhiMDI0MTJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4V2ViS2l0UG9pbnRDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViS2l0UG9pbnRDb25zdHJ1Y3Rvci5jcHAKQEAg LTQ3LDYgKzQ3LDkgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4V2ViS2l0UG9pbnQ6OmNvbnN0 cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXIKICAgICBpZiAoIWFyZ3MuSXND b25zdHJ1Y3RDYWxsKCkpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCJET00gb2JqZWN0IGNv bnN0cnVjdG9yIGNhbm5vdCBiZSBjYWxsZWQgYXMgYSBmdW5jdGlvbi4iLCBWOFByb3h5OjpUeXBl RXJyb3IpOwogCisgICAgaWYgKENvbnN0cnVjdG9yTW9kZTo6Y3VycmVudCgpID09IENvbnN0cnVj dG9yTW9kZTo6V3JhcEV4aXN0aW5nT2JqZWN0KQorICAgICAgICByZXR1cm4gYXJncy5Ib2xkZXIo KTsKKwogICAgIGZsb2F0IHggPSAwOwogICAgIGZsb2F0IHkgPSAwOwogICAgIGlmIChhcmdzLkxl bmd0aCgpID4gMSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOFdlYlNvY2tldEN1c3RvbS5jcHAKaW5kZXggNzE4YWFkZTcyYzQwOTdiMmI5MjRjOTg2 M2U5NDZjM2Q4NjI3ZGUxOC4uOWI1ZTEwYjY2YWQyODk1NWNlZGVmZTRkZmQ2ZDA5ZTM5ODk5OGZh NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViU29j a2V0Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhX ZWJTb2NrZXRDdXN0b20uY3BwCkBAIC01Nyw2ICs1NywxMCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhXZWJTb2NrZXQ6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYg YXJncwogCiAgICAgaWYgKCFhcmdzLklzQ29uc3RydWN0Q2FsbCgpKQogICAgICAgICByZXR1cm4g dGhyb3dFcnJvcigiRE9NIG9iamVjdCBjb25zdHJ1Y3RvciBjYW5ub3QgYmUgY2FsbGVkIGFzIGEg ZnVuY3Rpb24uIiwgVjhQcm94eTo6VHlwZUVycm9yKTsKKworICAgIGlmIChDb25zdHJ1Y3Rvck1v ZGU6OmN1cnJlbnQoKSA9PSBDb25zdHJ1Y3Rvck1vZGU6OldyYXBFeGlzdGluZ09iamVjdCkKKyAg ICAgICAgcmV0dXJuIGFyZ3MuSG9sZGVyKCk7CisKICAgICBpZiAoYXJncy5MZW5ndGgoKSA9PSAw KQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiTm90IGVub3VnaCBhcmd1bWVudHMiLCBWOFBy b3h5OjpTeW50YXhFcnJvcik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFhNTEh0dHBSZXF1ZXN0Q29uc3RydWN0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDb25zdHJ1Y3Rvci5jcHAKaW5k ZXggYmEzZDEwM2M2YTkyMmY1ODBjOWM4OTU4MmVmYTA2YmQwMGJkZmRhMS4uNWE1YjBjNjVjZDMz YjJmMTBmMTJlNTEzNTJhMGVlZWNiMzhkMTgyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDb25zdHJ1Y3Rvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDb25zdHJ1 Y3Rvci5jcHAKQEAgLTUwLDYgKzUwLDkgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4WE1MSHR0 cFJlcXVlc3Q6OmNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYKICAgICBp ZiAoIWFyZ3MuSXNDb25zdHJ1Y3RDYWxsKCkpCiAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKCJE T00gb2JqZWN0IGNvbnN0cnVjdG9yIGNhbm5vdCBiZSBjYWxsZWQgYXMgYSBmdW5jdGlvbi4iLCBW OFByb3h5OjpUeXBlRXJyb3IpOwogCisgICAgaWYgKENvbnN0cnVjdG9yTW9kZTo6Y3VycmVudCgp ID09IENvbnN0cnVjdG9yTW9kZTo6V3JhcEV4aXN0aW5nT2JqZWN0KQorICAgICAgICByZXR1cm4g YXJncy5Ib2xkZXIoKTsKKwogICAgIC8vIEV4cGVjdCBubyBwYXJhbWV0ZXJzLgogICAgIC8vIEFs bG9jYXRlIGEgWE1MSHR0cFJlcXVlc3Qgb2JqZWN0IGFzIGl0cyBpbnRlcm5hbCBmaWVsZC4KICAg ICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0ID0gZ2V0U2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpOwo=