44989 2010-08-31 14:37:39 -0700 Make RefPtr complain if you use them after they are released 2022-09-19 10:15:55 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All ASSIGNED P2 Normal --- 1 darin webkit-unassigned ahmad.saleem792 ap bfulgham darin oldest_to_newest 272383 0 darin 2010-08-31 14:37:39 -0700 Anders had a great idea: Once you pass the value of a PassRefPtr you should get an assertion if you try to use it. Idiomatically, we don’t use PassRefPtr after passing its value along. Its value is zero then, but in debug versions it could instead have a “known bad” value so we can catch incorrect uses. RefPtr could use the same feature. As could PassOwnPtr and OwnPtr. 272538 1 66153 andersca 2010-08-31 17:50:17 -0700 Created attachment 66153 Patch Here's a patch that does this for PassRefPtr. One thing we should figure out if it's valid to assign into a pointer that has been released. (See the editing change) 1899259 2 ahmad.saleem792 2022-09-17 16:57:01 -0700 PassRefPtr is not used anymore but if this need to be extended for RefPtr then please decide accordingly. Else this can be marked as "RESOLVED WONTFIX". Thanks! 1899396 3 ap 2022-09-18 17:18:52 -0700 We now have ASan poisoning that serves a similar purpose (only in ASan builds, but it's good to avoid slowing down debug builds). Not in RefPtr though, but it's zeroed when moved out, so I'm not sure how this is applicable to RefPtr. 1899520 4 darin 2022-09-19 10:04:17 -0700 I think it depends if we want our code to treat RefPtr as "zeroed after moved out" or "invalid to read after moved out". When we want it actually zeroed we could use std::exchange(a, nullptr). But if we want to have the "can rely on it being zero" then we should leave it as is. 66153 2010-08-31 17:50:17 -0700 2010-08-31 17:50:17 -0700 Patch bug-44989-20100831175016.patch text/plain 8136 andersca ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBjZGEwNjY0YmNhNTg3YjdhNWQ1MWU0M2U1MWE0YmQwNmNhYWFjZWE2Li4z YWUxNDI2OWVkMGRmZDBmNDU5OTM4ZDk0YjM0YzkzMWNlNWYxYzE4IDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjUgQEAKKzIwMTAtMDgtMzEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIFBhc3NSZWZQdHIgY29tcGxhaW4gaWYgeW91IHVzZSB0aGVtIGFmdGVyIHRoZXkgYXJlIHJl bGVhc2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NDk4OQorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajoKKyAgICAgICAgKiB3dGYvUGFzc1JlZlB0ci5oOgorICAgICAgICAoV1RGOjpQYXNzUmVmUHRy Ojp+UGFzc1JlZlB0cik6CisgICAgICAgIChXVEY6OlBhc3NSZWZQdHI6OmdldCk6CisgICAgICAg IChXVEY6OlBhc3NSZWZQdHI6Om9wZXJhdG9yKik6CisgICAgICAgIChXVEY6OlBhc3NSZWZQdHI6 Om9wZXJhdG9yLT4pOgorICAgICAgICAoV1RGOjpQYXNzUmVmUHRyOjpvcGVyYXRvciEpOgorICAg ICAgICAoV1RGOjpQYXNzUmVmUHRyOjpvcGVyYXRvciBVbnNwZWNpZmllZEJvb2xUeXBlKToKKyAg ICAgICAgKFdURjo6UGFzc1JlZlB0cjo6aGFzQmVlblJlbGVhc2VkKToKKyAgICAgICAgKFdURjo6 UGFzc1JlZlB0cjo6bWFya1JlbGVhc2VkKToKKyAgICAgICAgKFdURjo6OjpQYXNzUmVmUHRyKToK KyAgICAgICAgKFdURjo6OjpjbGVhcik6CisgICAgICAgIChXVEY6Ojo6bGVha1JlZik6CisgICAg ICAgIChXVEY6Ojo6b3BlcmF0b3IpOgorCiAyMDEwLTA4LTMxICBEYXJpbiBBZGxlciAgPGRhcmlu QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYg LS1naXQgYS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qIGIvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCBmOWE1NDdlMTI5MTZhNDIzOThiZTY1M2I2OTkzODhjZjgwYjg3MWM2Li5i NmRjOTkwNDdjYWYyYWRjMGM1ZjJkMTA4ZDljMjM0ZDJiNDlhMWQxIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBi L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK QEAgLTIzMzgsNyArMjMzOCw2IEBACiAJCQlpc2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRDb25m aWd1cmF0aW9uTGlzdCA9IDE0OUMyNzcxMDg5MDJBRkUwMDhBOUVGQyAvKiBCdWlsZCBjb25maWd1 cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3QgIkphdmFTY3JpcHRDb3JlIiAqLzsKIAkJCWNvbXBh dGliaWxpdHlWZXJzaW9uID0gIlhjb2RlIDIuNCI7Ci0JCQlkZXZlbG9wbWVudFJlZ2lvbiA9IEVu Z2xpc2g7CiAJCQloYXNTY2FubmVkRm9yRW5jb2RpbmdzID0gMTsKIAkJCWtub3duUmVnaW9ucyA9 ICgKIAkJCQlFbmdsaXNoLApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL1Bhc3NSZWZQ dHIuaCBiL0phdmFTY3JpcHRDb3JlL3d0Zi9QYXNzUmVmUHRyLmgKaW5kZXggYjQzYzViYWE2OTIy Y2FkMDBjZTRjZjJlNTFlMWVjMDk4Y2I3MDZkMC4uY2VlZDExZTczMzBkZGVhYzM5YzJmMzUyN2E0 YWU2MTNhMmUxZTJiZCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL1Bhc3NSZWZQdHIu aAorKysgYi9KYXZhU2NyaXB0Q29yZS93dGYvUGFzc1JlZlB0ci5oCkBAIC03MCwyMyArNzAsMzQg QEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIFBhc3NSZWZQdHIoY29uc3QgUGFzc1JlZlB0ciYg bykgOiBtX3B0cihvLmxlYWtSZWYoKSkgeyB9CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+ IFBhc3NSZWZQdHIoY29uc3QgUGFzc1JlZlB0cjxVPiYgbykgOiBtX3B0cihvLmxlYWtSZWYoKSkg eyB9CiAKLSAgICAgICAgQUxXQVlTX0lOTElORSB+UGFzc1JlZlB0cigpIHsgZGVyZWZJZk5vdE51 bGwobV9wdHIpOyB9CisgICAgICAgIEFMV0FZU19JTkxJTkUgflBhc3NSZWZQdHIoKSAKKyAgICAg ICAgeyAKKyNpZiAhQVNTRVJUX0RJU0FCTEVECisgICAgICAgICAgICBpZiAoaGFzQmVlblJlbGVh c2VkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworI2VuZGlmCisgICAgICAgICAgICBkZXJl ZklmTm90TnVsbChtX3B0cik7CisgICAgICAgIH0KIAogICAgICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBVPiBQYXNzUmVmUHRyKGNvbnN0IFJlZlB0cjxVPiYpOwogICAgICAgICAKLSAgICAgICAgVCog Z2V0KCkgY29uc3QgeyByZXR1cm4gbV9wdHI7IH0KKyAgICAgICAgVCogZ2V0KCkgY29uc3QgCisg ICAgICAgIHsgCisgICAgICAgICAgICBBU1NFUlQoIWhhc0JlZW5SZWxlYXNlZCgpKTsKKyAgICAg ICAgICAgIHJldHVybiBtX3B0cjsKKyAgICAgICAgfQogCiAgICAgICAgIHZvaWQgY2xlYXIoKTsK ICAgICAgICAgVCogbGVha1JlZigpIGNvbnN0IFdBUk5fVU5VU0VEX1JFVFVSTjsKIAotICAgICAg ICBUJiBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiAqbV9wdHI7IH0KLSAgICAgICAgVCogb3Bl cmF0b3ItPigpIGNvbnN0IHsgcmV0dXJuIG1fcHRyOyB9CisgICAgICAgIFQmIG9wZXJhdG9yKigp IGNvbnN0IHsgcmV0dXJuICpnZXQoKTsgfQorICAgICAgICBUKiBvcGVyYXRvci0+KCkgY29uc3Qg eyByZXR1cm4gZ2V0KCk7IH0KIAotICAgICAgICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0 dXJuICFtX3B0cjsgfQorICAgICAgICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuICFn ZXQoKTsgfQogCiAgICAgICAgIC8vIFRoaXMgY29udmVyc2lvbiBvcGVyYXRvciBhbGxvd3MgaW1w bGljaXQgY29udmVyc2lvbiB0byBib29sIGJ1dCBub3QgdG8gb3RoZXIgaW50ZWdlciB0eXBlcy4K ICAgICAgICAgdHlwZWRlZiBUKiAoUGFzc1JlZlB0cjo6KlVuc3BlY2lmaWVkQm9vbFR5cGUpOwot ICAgICAgICBvcGVyYXRvciBVbnNwZWNpZmllZEJvb2xUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9w dHIgPyAmUGFzc1JlZlB0cjo6bV9wdHIgOiAwOyB9CisgICAgICAgIG9wZXJhdG9yIFVuc3BlY2lm aWVkQm9vbFR5cGUoKSBjb25zdCB7IHJldHVybiBnZXQoKSA/ICZQYXNzUmVmUHRyOjptX3B0ciA6 IDA7IH0KIAogICAgICAgICBQYXNzUmVmUHRyJiBvcGVyYXRvcj0oVCopOwogICAgICAgICBQYXNz UmVmUHRyJiBvcGVyYXRvcj0oY29uc3QgUGFzc1JlZlB0ciYpOwpAQCAtMTAyLDYgKzExMywxMiBA QCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgLy8gYWRvcHRpbmcgY29uc3RydWN0b3IKICAgICAg ICAgUGFzc1JlZlB0cihUKiBwdHIsIGJvb2wpIDogbV9wdHIocHRyKSB7IH0KIAorI2lmICFBU1NF UlRfRElTQUJMRUQKKyAgICAgICAgYm9vbCBoYXNCZWVuUmVsZWFzZWQoKSBjb25zdCB7IHJldHVy biBtX3B0ciA9PSByZWludGVycHJldF9jYXN0PFQqPigtMSk7IH0KKyAgICAgICAgdm9pZCBtYXJr UmVsZWFzZWQoKSBjb25zdCB7IG1fcHRyID0gcmVpbnRlcnByZXRfY2FzdDxUKj4oLTEpOyB9Cisj ZWxzZQorICAgICAgICB2b2lkIG1hcmtSZWxlYXNlZCgpIGNvbnN0IHsgfQorI2VuZGlmCiAgICAg ICAgIG11dGFibGUgVCogbV9wdHI7CiAgICAgfTsKICAgICAKQEAgLTE2NywyMSArMTg0LDIzIEBA IG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHRlbXBsYXRlPHR5cGVu YW1lIFU+IGlubGluZSBQYXNzUmVmUHRyPFQ+OjpQYXNzUmVmUHRyKGNvbnN0IFJlZlB0cjxVPiYg bykKICAgICAgICAgOiBtX3B0cihvLmdldCgpKQogICAgIHsKLSAgICAgICAgVCogcHRyID0gbV9w dHI7CisgICAgICAgIFQqIHB0ciA9IGdldCgpOwogICAgICAgICByZWZJZk5vdE51bGwocHRyKTsK ICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgdm9pZCBQYXNzUmVmUHRy PFQ+OjpjbGVhcigpCiAgICAgewotICAgICAgICBUKiBwdHIgPSBtX3B0cjsKKyAgICAgICAgVCog cHRyID0gZ2V0KCk7CiAgICAgICAgIG1fcHRyID0gMDsKICAgICAgICAgZGVyZWZJZk5vdE51bGwo cHRyKTsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgVCogUGFzc1Jl ZlB0cjxUPjo6bGVha1JlZigpIGNvbnN0CiAgICAgewotICAgICAgICBUKiBwdHIgPSBtX3B0cjsK KyAgICAgICAgVCogcHRyID0gZ2V0KCk7CiAgICAgICAgIG1fcHRyID0gMDsKKyAgICAgICAgbWFy a1JlbGVhc2VkKCk7CisKICAgICAgICAgcmV0dXJuIHB0cjsKICAgICB9CiAKQEAgLTE4OSw3ICsy MDgsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICB7CiAgICAgICAgIFQqIG9wdHIgPSBvLmdldCgp OwogICAgICAgICByZWZJZk5vdE51bGwob3B0cik7Ci0gICAgICAgIFQqIHB0ciA9IG1fcHRyOwor ICAgICAgICBUKiBwdHIgPSBnZXQoKTsKICAgICAgICAgbV9wdHIgPSBvcHRyOwogICAgICAgICBk ZXJlZklmTm90TnVsbChwdHIpOwogICAgICAgICByZXR1cm4gKnRoaXM7CkBAIC0xOTgsNyArMjE3 LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFBh c3NSZWZQdHI8VD4mIFBhc3NSZWZQdHI8VD46Om9wZXJhdG9yPShUKiBvcHRyKQogICAgIHsKICAg ICAgICAgcmVmSWZOb3ROdWxsKG9wdHIpOwotICAgICAgICBUKiBwdHIgPSBtX3B0cjsKKyAgICAg ICAgVCogcHRyID0gZ2V0KCk7CiAgICAgICAgIG1fcHRyID0gb3B0cjsKICAgICAgICAgZGVyZWZJ Zk5vdE51bGwocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlzOwpAQCAtMjA2LDcgKzIyNSw3IEBA IG5hbWVzcGFjZSBXVEYgewogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFBhc3NS ZWZQdHI8VD4mIFBhc3NSZWZQdHI8VD46Om9wZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyPFQ+JiBy ZWYpCiAgICAgewotICAgICAgICBUKiBwdHIgPSBtX3B0cjsKKyAgICAgICAgVCogcHRyID0gZ2V0 KCk7CiAgICAgICAgIG1fcHRyID0gcmVmLmxlYWtSZWYoKTsKICAgICAgICAgZGVyZWZJZk5vdE51 bGwocHRyKTsKICAgICAgICAgcmV0dXJuICp0aGlzOwpAQCAtMjE0LDcgKzIzMyw3IEBAIG5hbWVz cGFjZSBXVEYgewogICAgIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHRlbXBsYXRlPHR5cGVu YW1lIFU+IGlubGluZSBQYXNzUmVmUHRyPFQ+JiBQYXNzUmVmUHRyPFQ+OjpvcGVyYXRvcj0oY29u c3QgUGFzc1JlZlB0cjxVPiYgcmVmKQogICAgIHsKLSAgICAgICAgVCogcHRyID0gbV9wdHI7Cisg ICAgICAgIFQqIHB0ciA9IGdldCgpOwogICAgICAgICBtX3B0ciA9IHJlZi5sZWFrUmVmKCk7CiAg ICAgICAgIGRlcmVmSWZOb3ROdWxsKHB0cik7CiAgICAgICAgIHJldHVybiAqdGhpczsKQEAgLTI5 Myw3ICszMTIsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ IGlubGluZSB2b2lkIE5vbk51bGxQYXNzUmVmUHRyPFQ+OjpjbGVhcigpCiAgICAgewotICAgICAg ICBUKiBwdHIgPSBtX3B0cjsKKyAgICAgICAgVCogcHRyID0gZ2V0KCk7CiAgICAgICAgIG1fcHRy ID0gMDsKICAgICAgICAgZGVyZWZJZk5vdE51bGwocHRyKTsKICAgICB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDJiNmE5ZjNjY2JlOTg0 MTY0YjdkYTA1MWQyOTc1ZDA1MDdjNWNjNDMuLjY2ZjBkMDM4MWFlYWJlMjJjZjA5MDgyMzA1ZDdk ZGFjM2RiYjE5ZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDgtMzEgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIFBhc3NSZWZQdHIgY29tcGxhaW4gaWYgeW91IHVzZSB0aGVtIGFm dGVyIHRoZXkgYXJlIHJlbGVhc2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NDk4OQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisg ICAgICAgICogZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6cHJ1bmUpOgorICAgICAgICAqIGxvYWRlci9Qb2xp Y3lDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvbGljeUNoZWNrZXI6OmNoZWNrTmV3 V2luZG93UG9saWN5KToKKwogMjAxMC0wOC0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwIGIvV2ViQ29yZS9lZGl0 aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAppbmRleCBhYTM3MTkzZDRlMjkyNTBjZTE2ZWM4 NmEwM2M5ZWI2MDMwOWY3MWQyLi4zYjM5MzczZDFiMWE5ZmY1NDNhY2M2YjljZmYzOWI2YzE3NjVk MWVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3Bw CisrKyBiL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAKQEAgLTI0MSw4 ICsyNDEsMTAgQEAgc3RhdGljIGJvb2wgaGFzQVJlbmRlcmVkRGVzY2VuZGFudChOb2RlKiBub2Rl KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6cHJ1 bmUoUGFzc1JlZlB0cjxOb2RlPiBub2RlKQordm9pZCBDb21wb3NpdGVFZGl0Q29tbWFuZDo6cHJ1 bmUoUGFzc1JlZlB0cjxOb2RlPiBwcnBOb2RlKQogeworICAgIFJlZlB0cjxOb2RlPiBub2RlID0g cHJwTm9kZTsKKwogICAgIHdoaWxlIChub2RlKSB7CiAgICAgICAgIC8vIElmIHlvdSBjaGFuZ2Ug dGhpcyBydWxlIHlvdSBtYXkgaGF2ZSB0byBhZGQgYW4gdXBkYXRlTGF5b3V0KCkgaGVyZS4KICAg ICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL1Bv bGljeUNoZWNrZXIuY3BwCmluZGV4IDE5NmFiNGZmMzBiOGE5MmU5MDk4NDM0ZGU3NzNlMzVhOWQ5 MWNhYWUuLjZhYTI3MTFjNmNhM2M2M2YyZmNmOTk4NjUwNGFjYTA0ODY2ZTIwNDYgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVy L1BvbGljeUNoZWNrZXIuY3BwCkBAIC05Miw3ICs5Miw3IEBAIHZvaWQgUG9saWN5Q2hlY2tlcjo6 Y2hlY2tOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRG9j dW1lCiB2b2lkIFBvbGljeUNoZWNrZXI6OmNoZWNrTmV3V2luZG93UG9saWN5KGNvbnN0IE5hdmln YXRpb25BY3Rpb24mIGFjdGlvbiwgTmV3V2luZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbiBmdW5j dGlvbiwKICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9y bVN0YXRlPiBmb3JtU3RhdGUsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCB2b2lkKiBhcmd1bWVu dCkKIHsKLSAgICBtX2NhbGxiYWNrLnNldChyZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwg ZnVuY3Rpb24sIGFyZ3VtZW50KTsKKyAgICBtX2NhbGxiYWNrLnNldChyZXF1ZXN0LCBmb3JtU3Rh dGUuZ2V0KCksIGZyYW1lTmFtZSwgZnVuY3Rpb24sIGFyZ3VtZW50KTsKICAgICBtX2ZyYW1lLT5s b2FkZXIoKS0+Y2xpZW50KCktPmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9u KCZQb2xpY3lDaGVja2VyOjpjb250aW51ZUFmdGVyTmV3V2luZG93UG9saWN5LAogICAgICAgICBh Y3Rpb24sIHJlcXVlc3QsIGZvcm1TdGF0ZSwgZnJhbWVOYW1lKTsKIH0K