87810 2012-05-29 19:16:02 -0700 [V8] Replace v8::Null() with v8::Null(isolate) or v8NullWithCheck(isolate) in non-custom bindings 2012-05-30 17:11:41 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 636736 0 haraken 2012-05-29 19:16:02 -0700 The objective is to pass Isolate around in V8 bindings. For non-custom bindings, we replace v8::Null() with v8::Null(isolate) where isolate cannot be 0, and replace v8::Null() with v8NullWithCheck(isolate) where isolate can be 0. That's it for v8::Null(). 636744 1 144679 haraken 2012-05-29 19:18:59 -0700 Created attachment 144679 Patch 637836 2 144679 webkit.review.bot 2012-05-30 17:11:37 -0700 Comment on attachment 144679 Patch Clearing flags on attachment: 144679 Committed r118999: <http://trac.webkit.org/changeset/118999> 637837 3 webkit.review.bot 2012-05-30 17:11:41 -0700 All reviewed patches have been landed. Closing bug. 144679 2012-05-29 19:18:59 -0700 2012-05-30 17:11:37 -0700 Patch bug-87810-20120530111857.patch text/plain 9393 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODRmYzNiY2MyMGRlNGRm YzZiNTFmMGY2YTE4NjY1NTgzYTczMmJkYS4uZWY2NjcwMDQ0YjFkNjJjNThjNjY5MWFkMzZlNjk3 ZWFkYzMzODg4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEyLTA1LTI5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFJlcGxhY2Ug djg6Ok51bGwoKSB3aXRoIHY4OjpOdWxsKGlzb2xhdGUpIG9yIHY4TnVsbFdpdGhDaGVjayhpc29s YXRlKSBpbiBub24tY3VzdG9tIGJpbmRpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NzgxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBvYmplY3RpdmUgaXMgdG8gcGFzcyBJc29sYXRlIGFyb3Vu ZCBpbiBWOCBiaW5kaW5ncy4KKyAgICAgICAgRm9yIG5vbi1jdXN0b20gYmluZGluZ3MsIHdlIHJl cGxhY2Ugdjg6Ok51bGwoKSB3aXRoIHY4OjpOdWxsKGlzb2xhdGUpCisgICAgICAgIHdoZXJlIGlz b2xhdGUgY2Fubm90IGJlIDAsIGFuZCByZXBsYWNlIHY4OjpOdWxsKCkgd2l0aCB2OE51bGxXaXRo Q2hlY2soaXNvbGF0ZSkKKyAgICAgICAgd2hlcmUgaXNvbGF0ZSBjYW4gYmUgMC4KKworICAgICAg ICBUaGlzIHdpbGwgYmUgdGhlIGZpbmFsIHBhdGNoIGZvciBwYXNzaW5nIElzb2xhdGUgdG8gdjg6 Ok51bGwoKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChH ZW5lcmF0ZU5vcm1hbEF0dHJHZXR0ZXIpOgorICAgICAgICAoR2VuZXJhdGVGdW5jdGlvbkNhbGxi YWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjpjb250ZW50RG9jdW1lbnRBdHRy R2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjpnZXRTVkdEb2N1 bWVudENhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRl c3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2VWOEludGVybmFsOjpjYWNoZWRWYWx1ZUF0 dHJHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUlu dGVyZmFjZVY4SW50ZXJuYWw6OmNhY2hlZFJlYWRvbmx5VmFsdWVBdHRyR2V0dGVyKToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZSk6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV3JhcHBl cjo6Y29udmVydEV2ZW50VGFyZ2V0VG9WOE9iamVjdCk6CisKKzIwMTItMDUtMjkgIEtlbnRhcm8g SGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtWOF0gUmVuYW1lIHY4TnVs bCgpIHRvIHY4TnVsbFdpdGhDaGVjaygpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NzcxMwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IGY5OWY3ODRmYjg5ODM4YjBhMjAzZGNl YzM4NmVjYTk1Y2EzN2RiZGQuLjUyNjk2Mjc5MmUwYmY3NjZjYTIxMmNmZmU0ZmIzOWZiNTI5ZmYw NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvclY4LnBtCkBAIC04NDMsNyArODQzLDcgQEAgRU5ECiAKICAgICAjIEdlbmVyYXRlIHNlY3Vy aXR5IGNoZWNrcyBpZiBuZWNlc3NhcnkKICAgICBpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5l eHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2hlY2tTZWN1cml0eUZvck5vZGUifSkgewotICAgICAgICBw dXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OnNob3Vs ZEFsbG93QWNjZXNzVG9Ob2RlKFY4QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+IiAuICRhdHRy aWJ1dGUtPnNpZ25hdHVyZS0+bmFtZSAuICIoKSkpXG4gICAgICAgIHJldHVybiB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4odjg6Ok51bGwoKSk7XG5cbiIpOworICAgICAgICBwdXNoKEBpbXBsQ29udGVu dERlY2xzLCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OnNob3VsZEFsbG93QWNjZXNzVG9O b2RlKFY4QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+IiAuICRhdHRyaWJ1dGUtPnNpZ25hdHVy ZS0+bmFtZSAuICIoKSkpXG4gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6 Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpKTtcblxuIik7CiAgICAgfQogCiAgICAgbXkgJHVzZUV4 Y2VwdGlvbnMgPSAxIGlmIEB7JGF0dHJpYnV0ZS0+Z2V0dGVyRXhjZXB0aW9uc307CkBAIC0xMDA1 LDcgKzEwMDUsNyBAQCBFTkQKICAgICAgICAgICAgIG15ICRnZXR0ZXJGdW5jID0gJGNvZGVHZW5l cmF0b3ItPldLX2xjZmlyc3QoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lKTsKICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsIDw8RU5EKTsKICAgICBTZXJpYWxpemVkU2NyaXB0 VmFsdWUqIHNlcmlhbGl6ZWQgPSBpbXAtPiR7Z2V0dGVyRnVuY30oKTsKLSAgICB2YWx1ZSA9IHNl cmlhbGl6ZWQgPyBzZXJpYWxpemVkLT5kZXNlcmlhbGl6ZSgpIDogdjg6OkhhbmRsZTx2ODo6VmFs dWU+KHY4OjpOdWxsKCkpOworICAgIHZhbHVlID0gc2VyaWFsaXplZCA/IHNlcmlhbGl6ZWQtPmRl c2VyaWFsaXplKCkgOiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6Ok51bGwoaW5mby5HZXRJc29s YXRlKCkpKTsKICAgICBpbmZvLkhvbGRlcigpLT5TZXRIaWRkZW5WYWx1ZShwcm9wZXJ0eU5hbWUs IHZhbHVlKTsKICAgICByZXR1cm4gdmFsdWU7CiBFTkQKQEAgLTE0MzgsNyArMTQzOCw3IEBAIEVO RAogCiAgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi Q2hlY2tTZWN1cml0eUZvck5vZGUifSkgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xz LCAiICAgIGlmICghVjhCaW5kaW5nU2VjdXJpdHk6OnNob3VsZEFsbG93QWNjZXNzVG9Ob2RlKFY4 QmluZGluZ1N0YXRlOjpPbmx5KCksIGltcC0+IiAuICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5uYW1l IC4gIihlYykpKVxuIik7Ci0gICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAg IHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6Ok51bGwoKSk7XG4iKTsKKyAgICAgICAg cHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZh bHVlPih2ODo6TnVsbChhcmdzLkdldElzb2xhdGUoKSkpO1xuIik7CiBFTkQKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RP YmouY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9i ai5jcHAKaW5kZXggODU2M2M0YmExNTQ1OWE0MmZlMTY3OGRhOTY5N2EyODA0ZTVmYWY2ZS4uNWVj NjM3ODgzOWNiODk4MWI5Y2ZhYzNhMGZmMTAwNmVkZTljNzdkNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHAKQEAgLTEx MzQsNyArMTEzNCw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY29udGVudERvY3Vt ZW50QXR0ckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtCiAgICAgSU5DX1NUQVRTKCJE T00uVGVzdE9iai5jb250ZW50RG9jdW1lbnQuX2dldCIpOwogICAgIFRlc3RPYmoqIGltcCA9IFY4 VGVzdE9iajo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7CiAgICAgaWYgKCFWOEJpbmRpbmdTZWN1 cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb05vZGUoVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKSwgaW1w LT5jb250ZW50RG9jdW1lbnQoKSkpCi0gICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4odjg6Ok51bGwoKSk7CisgICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6 Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpKTsKIAogICAgIHJldHVybiB0b1Y4KGltcC0+Y29udGVu dERvY3VtZW50KCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKIH0KQEAgLTE5MDQsNyArMTkwNCw3IEBA IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZ2V0U1ZHRG9jdW1lbnRDYWxsYmFjayhjb25z dCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIHsK ICAgICBpZiAoIVY4QmluZGluZ1NlY3VyaXR5OjpzaG91bGRBbGxvd0FjY2Vzc1RvTm9kZShWOEJp bmRpbmdTdGF0ZTo6T25seSgpLCBpbXAtPmdldFNWR0RvY3VtZW50KGVjKSkpCi0gICAgICAgIHJl dHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6Ok51bGwoKSk7CisgICAgICAgIHJldHVybiB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6Ok51bGwoYXJncy5HZXRJc29sYXRlKCkpKTsKICAgICBS ZWZQdHI8U1ZHRG9jdW1lbnQ+IHJlc3VsdCA9IGltcC0+Z2V0U1ZHRG9jdW1lbnQoZWMpOwogICAg IGlmIChVTkxJS0VMWShlYykpCiAgICAgICAgIGdvdG8gZmFpbDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RTZXJpYWxpemVkU2NyaXB0 VmFsdWVJbnRlcmZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Y4L1Y4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZS5jcHAKaW5kZXggNGRkNGMz YzM5NTc1NDU0NDY2MjBiYTg0MTQ5ZmEzMzBlYjI3ZWMyYi4uZDU0MzM2YTdlZjYxMzRlYjM2NWRl MzA1NWYxNGRlNDMyYjlmMGRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdFNlcmlh bGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZS5jcHAKQEAgLTc4LDcgKzc4LDcgQEAgc3RhdGljIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBjYWNoZWRWYWx1ZUF0dHJHZXR0ZXIodjg6OkxvY2FsPHY4OjpT dHJpbmc+IG5hbWUsIGMKICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIFRlc3RTZXJpYWxpemVk U2NyaXB0VmFsdWVJbnRlcmZhY2UqIGltcCA9IFY4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUlu dGVyZmFjZTo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7CiAgICAgU2VyaWFsaXplZFNjcmlwdFZh bHVlKiBzZXJpYWxpemVkID0gaW1wLT5jYWNoZWRWYWx1ZSgpOwotICAgIHZhbHVlID0gc2VyaWFs aXplZCA/IHNlcmlhbGl6ZWQtPmRlc2VyaWFsaXplKCkgOiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4o djg6Ok51bGwoKSk7CisgICAgdmFsdWUgPSBzZXJpYWxpemVkID8gc2VyaWFsaXplZC0+ZGVzZXJp YWxpemUoKSA6IHY4OjpIYW5kbGU8djg6OlZhbHVlPih2ODo6TnVsbChpbmZvLkdldElzb2xhdGUo KSkpOwogICAgIGluZm8uSG9sZGVyKCktPlNldEhpZGRlblZhbHVlKHByb3BlcnR5TmFtZSwgdmFs dWUpOwogICAgIHJldHVybiB2YWx1ZTsKIH0KQEAgLTExNiw3ICsxMTYsNyBAQCBzdGF0aWMgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGNhY2hlZFJlYWRvbmx5VmFsdWVBdHRyR2V0dGVyKHY4OjpMb2Nh bDx2ODo6U3RyaW5nPgogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgVGVzdFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZUludGVyZmFjZSogaW1wID0gVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50 ZXJmYWNlOjp0b05hdGl2ZShpbmZvLkhvbGRlcigpKTsKICAgICBTZXJpYWxpemVkU2NyaXB0VmFs dWUqIHNlcmlhbGl6ZWQgPSBpbXAtPmNhY2hlZFJlYWRvbmx5VmFsdWUoKTsKLSAgICB2YWx1ZSA9 IHNlcmlhbGl6ZWQgPyBzZXJpYWxpemVkLT5kZXNlcmlhbGl6ZSgpIDogdjg6OkhhbmRsZTx2ODo6 VmFsdWU+KHY4OjpOdWxsKCkpOworICAgIHZhbHVlID0gc2VyaWFsaXplZCA/IHNlcmlhbGl6ZWQt PmRlc2VyaWFsaXplKCkgOiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4odjg6Ok51bGwoaW5mby5HZXRJ c29sYXRlKCkpKTsKICAgICBpbmZvLkhvbGRlcigpLT5TZXRIaWRkZW5WYWx1ZShwcm9wZXJ0eU5h bWUsIHZhbHVlKTsKICAgICByZXR1cm4gdmFsdWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcAppbmRleCA3Yjc5OTYyNDhi NWY3ZWU5OWZhZGJmYjYwYWJiZDJhNzc4MTExNzBkLi5hNjRhZjM4MmQ4MWI0ZWY1ZTllZjQ3Yzc1 ZjFiNGY3YjkzZjlhOWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T ZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAKQEAgLTEyNjMsNyArMTI2Myw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgICp2YWx1ZSA9IHY4OjpVbmRlZmluZWQoKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIE51bGxUYWc6Ci0gICAgICAgICAgICAqdmFsdWUgPSB2ODo6TnVsbCgp OworICAgICAgICAgICAgKnZhbHVlID0gdjhOdWxsV2l0aENoZWNrKG1faXNvbGF0ZSk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBUcnVlVGFnOgogICAgICAgICAgICAgKnZhbHVl ID0gdjg6OlRydWUoKTsKQEAgLTE4MjgsMTUgKzE4MjgsMTUgQEAgcHVibGljOgogICAgIHY4OjpI YW5kbGU8djg6OlZhbHVlPiBkZXNlcmlhbGl6ZSgpCiAgICAgewogICAgICAgICBpZiAoIW1fcmVh ZGVyLnJlYWRWZXJzaW9uKG1fdmVyc2lvbikgfHwgbV92ZXJzaW9uID4gd2lyZUZvcm1hdFZlcnNp b24pCi0gICAgICAgICAgICByZXR1cm4gdjg6Ok51bGwoKTsKKyAgICAgICAgICAgIHJldHVybiB2 OE51bGxXaXRoQ2hlY2sobV9yZWFkZXIuZ2V0SXNvbGF0ZSgpKTsKICAgICAgICAgbV9yZWFkZXIu c2V0VmVyc2lvbihtX3ZlcnNpb24pOwogICAgICAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7CiAg ICAgICAgIHdoaWxlICghbV9yZWFkZXIuaXNFb2YoKSkgewogICAgICAgICAgICAgaWYgKCFkb0Rl c2VyaWFsaXplKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHY4OjpOdWxsKCk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIHY4TnVsbFdpdGhDaGVjayhtX3JlYWRlci5nZXRJc29sYXRlKCkpOwog ICAgICAgICB9CiAgICAgICAgIGlmIChzdGFja0RlcHRoKCkgIT0gMSB8fCBtX29wZW5Db21wb3Np dGVSZWZlcmVuY2VTdGFjay5zaXplKCkpCi0gICAgICAgICAgICByZXR1cm4gdjg6Ok51bGwoKTsK KyAgICAgICAgICAgIHJldHVybiB2OE51bGxXaXRoQ2hlY2sobV9yZWFkZXIuZ2V0SXNvbGF0ZSgp KTsKICAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IHNjb3BlLkNsb3NlKGVs ZW1lbnQoMCkpOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KQEAgLTIyNDUsNyArMjI0 NSw3IEBAIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlKGNvbnN0 IFN0cmluZyYgd2lyZURhdGEpCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gU2VyaWFsaXplZFNjcmlw dFZhbHVlOjpkZXNlcmlhbGl6ZShNZXNzYWdlUG9ydEFycmF5KiBtZXNzYWdlUG9ydHMsIHY4OjpJ c29sYXRlKiBpc29sYXRlKQogewogICAgIGlmICghbV9kYXRhLmltcGwoKSkKLSAgICAgICAgcmV0 dXJuIHY4OjpOdWxsKCk7CisgICAgICAgIHJldHVybiB2OE51bGxXaXRoQ2hlY2soaXNvbGF0ZSk7 CiAgICAgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKEJ1ZmZlclZhbHVlVHlwZSkgPT0gMiwgQnVmZmVy VmFsdWVUeXBlSXNUd29CeXRlcyk7CiAgICAgUmVhZGVyIHJlYWRlcihyZWludGVycHJldF9jYXN0 PGNvbnN0IHVpbnQ4X3QqPihtX2RhdGEuaW1wbCgpLT5jaGFyYWN0ZXJzKCkpLCAyICogbV9kYXRh Lmxlbmd0aCgpLCBpc29sYXRlKTsKICAgICBEZXNlcmlhbGl6ZXIgZGVzZXJpYWxpemVyKHJlYWRl ciwgbWVzc2FnZVBvcnRzLCBtX2FycmF5QnVmZmVyQ29udGVudHNBcnJheS5nZXQoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcAppbmRleCAzYmMwNjE0NDE0 MTM0YTU5ZTE4Njc3ZTZjNWJiMzBkOTc2NGM2ZDU3Li4wNWMxN2FiMDM5YWU4YjQwMjE5MGU1N2Ux NzI4NjQwYzc3MjY5ZjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OERPTVdyYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3Jh cHBlci5jcHAKQEAgLTI2MSw3ICsyNjEsNyBAQCBib29sIFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVy T2ZUeXBlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSwgV3JhcHBlclR5cGVJbmZvKgogdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IFY4RE9NV3JhcHBlcjo6Y29udmVydEV2ZW50VGFyZ2V0VG9WOE9i amVjdChFdmVudFRhcmdldCogdGFyZ2V0LCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKICAgICBp ZiAoIXRhcmdldCkKLSAgICAgICAgcmV0dXJuIHY4OjpOdWxsKCk7CisgICAgICAgIHJldHVybiB2 OE51bGxXaXRoQ2hlY2soaXNvbGF0ZSk7CiAKICAgICBBdG9taWNTdHJpbmcgZGVzaXJlZEludGVy ZmFjZSA9IHRhcmdldC0+aW50ZXJmYWNlTmFtZSgpOwogICAgIERPTV9FVkVOVF9UQVJHRVRfSU5U RVJGQUNFU19GT1JfRUFDSChUUllfVE9fV1JBUF9XSVRIX0lOVEVSRkFDRSkK