55786 2011-03-04 10:45:31 -0800 JobjectWrapper should inherit from RefCounted rather than implementing its own ref counting 2011-07-20 08:50:43 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 57859 1 steveblock steveblock steveblock tonyg oldest_to_newest 362621 0 steveblock 2011-03-04 10:45:31 -0800 JobjectWrapper should inherit from RefCounted rather than implementing its own ref counting 439703 1 101444 steveblock 2011-07-20 03:23:02 -0700 Created attachment 101444 Patch 439730 2 101444 tonyg 2011-07-20 04:07:50 -0700 Comment on attachment 101444 Patch Wow, awesome cleanup, thanks! Out of curiosity, were there any leaks/bugs here, does this improve perf due to less reference churn, or was this strictly just a maintainability thing? If one of the first two, might be interesting to mention in the ChangeLog. 439733 3 steveblock 2011-07-20 04:17:15 -0700 No, no functional change, just cleanup. 439735 4 steveblock 2011-07-20 04:20:24 -0700 Committed r91355: <http://trac.webkit.org/changeset/91355> 439829 5 steveblock 2011-07-20 08:50:43 -0700 This patch broke Mac builds: http://build.webkit.org/builders/SnowLeopard%20Intel%20Debug%20%28Build%29/builds/1387 http://build.webkit.org/builders/Leopard%20Intel%20Debug%20%28Build%29/builds/37433 Speculative build fix landed: http://trac.webkit.org/changeset/91366 101444 2011-07-20 03:23:02 -0700 2011-07-20 04:07:50 -0700 Patch bug-55786-20110720112300.patch text/plain 12517 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzNTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmZDZhNzVkMTRjZDE5YWJm Y2I2NGRmYzNjMmNmZjhhMTAyNTUyM2I2Li45ODFmNjlkYWExNjZiNzA5MzFiMTEyZjg2NWY5MGU2 NWM1ZGJiNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTEtMDctMjAgIFN0ZXZl IEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgorCisgICAgICAgIEpvYmplY3RXcmFwcGVy IHNob3VsZCBpbmhlcml0IGZyb20gUmVmQ291bnRlZCByYXRoZXIgdGhhbiBpbXBsZW1lbnRpbmcg aXRzIG93biByZWYgY291bnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU1Nzg2CisKKyAgICAgICAgQWxzbyBhZGRzIHN0YXRpYyBjcmVhdGUoKSBt ZXRob2QgYW5kIGNsZWFucyB1cCB1c2Ugb2YgZGF0YSBtZW1iZXJzLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgcmVmYWN0b3Jp bmcgb25seS4KKworICAgICAgICAqIGJyaWRnZS9qbmkvSm9iamVjdFdyYXBwZXIuY3BwOgorICAg ICAgICAoSm9iamVjdFdyYXBwZXI6OkpvYmplY3RXcmFwcGVyKToKKyAgICAgICAgKiBicmlkZ2Uv am5pL0pvYmplY3RXcmFwcGVyLmg6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpKb2JqZWN0V3Jh cHBlcjo6Y3JlYXRlKToKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KYXZhQXJyYXlKU0MuY3Bw OgorICAgICAgICAoSmF2YUFycmF5OjpKYXZhQXJyYXkpOgorICAgICAgICAqIGJyaWRnZS9qbmkv anNjL0phdmFBcnJheUpTQy5oOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6SmF2YUFycmF5Ojpq YXZhQXJyYXkpOgorICAgICAgICAqIGJyaWRnZS9qbmkvanNjL0phdmFGaWVsZEpTQy5jcHA6Cisg ICAgICAgIChKYXZhRmllbGQ6OkphdmFGaWVsZCk6CisgICAgICAgIChKYXZhRmllbGQ6OmRpc3Bh dGNoVmFsdWVGcm9tSW5zdGFuY2UpOgorICAgICAgICAoSmF2YUZpZWxkOjpkaXNwYXRjaFNldFZh bHVlVG9JbnN0YW5jZSk6CisgICAgICAgICogYnJpZGdlL2puaS9qc2MvSmF2YUluc3RhbmNlSlND LmNwcDoKKyAgICAgICAgKEphdmFJbnN0YW5jZTo6SmF2YUluc3RhbmNlKToKKyAgICAgICAgKEph dmFJbnN0YW5jZTo6Z2V0Q2xhc3MpOgorICAgICAgICAoSmF2YUluc3RhbmNlOjpzdHJpbmdWYWx1 ZSk6CisgICAgICAgIChKYXZhSW5zdGFuY2U6Om51bWJlclZhbHVlKToKKyAgICAgICAgKEphdmFJ bnN0YW5jZTo6Ym9vbGVhblZhbHVlKToKKyAgICAgICAgKEphdmFJbnN0YW5jZTo6aW52b2tlTWV0 aG9kKToKKyAgICAgICAgKiBicmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuaDoKKyAgICAg ICAgKEpTQzo6QmluZGluZ3M6OkphdmFJbnN0YW5jZTo6amF2YUluc3RhbmNlKToKKyAgICAgICAg KiBicmlkZ2Uvam5pL3Y4L0phdmFGaWVsZEpvYmplY3RWOC5jcHA6CisgICAgICAgIChKYXZhRmll bGRKb2JqZWN0OjpKYXZhRmllbGRKb2JqZWN0KToKKyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4L0ph dmFJbnN0YW5jZUpvYmplY3RWOC5jcHA6CisgICAgICAgIChKYXZhSW5zdGFuY2VKb2JqZWN0OjpK YXZhSW5zdGFuY2VKb2JqZWN0KToKKyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5j ZUpvYmplY3RWOC5oOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6SmF2YUluc3RhbmNlSm9iamVj dDo6amF2YUluc3RhbmNlKToKKwogMjAxMS0wNy0yMCAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2 aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkx Mjg1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9Kb2JqZWN0V3JhcHBl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL0pvYmplY3RXcmFwcGVyLmNwcAppbmRl eCAwNDIxN2VlMDk1ODg4MmI1NjI0YjI5MDAxNzhiN2NlNzk1MDdlY2MwLi45NzNjYTA3ZjFiNGU5 Mzk5YzVmNzQzNjkwZDMzNjk5M2ExYmY1ZTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i cmlkZ2Uvam5pL0pvYmplY3RXcmFwcGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uv am5pL0pvYmplY3RXcmFwcGVyLmNwcApAQCAtMjksMTQgKzI5LDExIEBACiAKICNpZiBFTkFCTEUo SkFWQV9CUklER0UpCiAKLSNpbmNsdWRlIDxhc3NlcnQuaD4KLQogdXNpbmcgbmFtZXNwYWNlIEpT Qzo6QmluZGluZ3M7CiAKIEpvYmplY3RXcmFwcGVyOjpKb2JqZWN0V3JhcHBlcihqb2JqZWN0IGlu c3RhbmNlKQotICAgIDogbV9yZWZDb3VudCgwKQogewotICAgIGFzc2VydChpbnN0YW5jZSk7Cisg ICAgQVNTRVJUKGluc3RhbmNlKTsKIAogICAgIC8vIENhY2hlIHRoZSBKTklFbnYgdXNlZCB0byBn ZXQgdGhlIGdsb2JhbCByZWYgZm9yIHRoaXMgamF2YSBpbnN0YW5hY2UuCiAgICAgLy8gSXQnbGwg YmUgdXNlZCB0byBkZWxldGUgdGhlIHJlZmVyZW5jZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JyaWRnZS9qbmkvSm9iamVjdFdyYXBwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9q bmkvSm9iamVjdFdyYXBwZXIuaAppbmRleCA5Y2M0YjI3ZWQ3ODA5YjYzNTIxZmUwZjQ1NWMzYmQy YzQ0NGY2MDdmLi5hNjhmMjEyYWYyM2IyNDU3ZTU5N2IwZWE3OTJjMGNjMWEzYmYyOGU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL0pvYmplY3RXcmFwcGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9Kb2JqZWN0V3JhcHBlci5oCkBAIC0zMCwzOCArMzAs MjYgQEAKICNpZiBFTkFCTEUoSkFWQV9CUklER0UpCiAKICNpbmNsdWRlICJKTklVdGlsaXR5Lmgi CisjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogCiBuYW1lc3BhY2UgSlNDIHsKIAogbmFtZXNwYWNlIEJpbmRpbmdzIHsKIAotY2xhc3MgSm9i amVjdFdyYXBwZXIgewotZnJpZW5kIGNsYXNzIEphdmFBcnJheTsKLWZyaWVuZCBjbGFzcyBKYXZh RmllbGQ7Ci1mcmllbmQgY2xhc3MgSmF2YUZpZWxkSm9iamVjdDsKLWZyaWVuZCBjbGFzcyBKYXZh SW5zdGFuY2U7Ci1mcmllbmQgY2xhc3MgSmF2YUluc3RhbmNlSm9iamVjdDsKLQorY2xhc3MgSm9i amVjdFdyYXBwZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxKb2JqZWN0V3JhcHBlcj4gewogcHVibGlj OgorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEpvYmplY3RXcmFwcGVyPiBjcmVhdGUoam9iamVjdCBv YmplY3QpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBKb2JqZWN0V3JhcHBlcihvYmplY3QpKTsgfQor ICAgIH5Kb2JqZWN0V3JhcHBlcigpOworCiAgICAgam9iamVjdCBpbnN0YW5jZSgpIGNvbnN0IHsg cmV0dXJuIG1faW5zdGFuY2U7IH0KICAgICB2b2lkIHNldEluc3RhbmNlKGpvYmplY3QgaW5zdGFu Y2UpIHsgbV9pbnN0YW5jZSA9IGluc3RhbmNlOyB9CiAKLSAgICB2b2lkIHJlZigpIHsgbV9yZWZD b3VudCsrOyB9Ci0gICAgdm9pZCBkZXJlZigpCi0gICAgewotICAgICAgICBpZiAoIS0tbV9yZWZD b3VudCkKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzOwotICAgIH0KLQotcHJvdGVjdGVkOgorcHJp dmF0ZToKICAgICBKb2JqZWN0V3JhcHBlcihqb2JqZWN0KTsKLSAgICB+Sm9iamVjdFdyYXBwZXIo KTsKIAogICAgIGpvYmplY3QgbV9pbnN0YW5jZTsKLQotcHJpdmF0ZToKICAgICBKTklFbnYqIG1f ZW52OwotICAgIHVuc2lnbmVkIGludCBtX3JlZkNvdW50OwogfTsKIAogfSAvLyBuYW1lc3BhY2Ug QmluZGluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvanNjL0phdmFB cnJheUpTQy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhQXJyYXlKU0Mu Y3BwCmluZGV4IGNhYTg1NzliNzM1YTJjMTY4NTQ5M2Q2MmYwMjNmNTcwZjY0NWNiYWIuLmIwODUx NGQ5MmQ2YmVhYTBiODhhYTQ5NzkxNmE4MDFkYjM2ZTQ3ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JyaWRnZS9qbmkvanNjL0phdmFBcnJheUpTQy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYnJpZGdlL2puaS9qc2MvSmF2YUFycmF5SlNDLmNwcApAQCAtNTMsMTAgKzUzLDEwIEBAIEpT VmFsdWUgSmF2YUFycmF5Ojpjb252ZXJ0Sk9iamVjdFRvQXJyYXkoRXhlY1N0YXRlKiBleGVjLCBq b2JqZWN0IGFuT2JqZWN0LCBjb25zCiBKYXZhQXJyYXk6OkphdmFBcnJheShqb2JqZWN0IGFycmF5 LCBjb25zdCBjaGFyKiB0eXBlLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3RPYmplY3QpCiAg ICAgOiBBcnJheShyb290T2JqZWN0KQogewotICAgIG1fYXJyYXkgPSBuZXcgSm9iamVjdFdyYXBw ZXIoYXJyYXkpOworICAgIG1fYXJyYXkgPSBKb2JqZWN0V3JhcHBlcjo6Y3JlYXRlKGFycmF5KTsK ICAgICAvLyBKYXZhIGFycmF5IGFyZSBmaXhlZCBsZW5ndGgsIHNvIHdlIGNhbiBjYWNoZSBsZW5n dGguCiAgICAgSk5JRW52KiBlbnYgPSBnZXRKTklFbnYoKTsKLSAgICBtX2xlbmd0aCA9IGVudi0+ R2V0QXJyYXlMZW5ndGgoc3RhdGljX2Nhc3Q8amFycmF5PihtX2FycmF5LT5tX2luc3RhbmNlKSk7 CisgICAgbV9sZW5ndGggPSBlbnYtPkdldEFycmF5TGVuZ3RoKHN0YXRpY19jYXN0PGphcnJheT4o bV9hcnJheS0+aW5zdGFuY2UoKSkpOwogICAgIG1fdHlwZSA9IHN0cmR1cCh0eXBlKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9qc2MvSmF2YUFycmF5SlNDLmgg Yi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhQXJyYXlKU0MuaAppbmRleCA5MDBj NzI4NjFjMDhhMTg5ZDdjZTg1MTUyMDY1MTg1N2EwMDk0NzA1Li44YWIzZTY3NDgzOTNiMzA0ZGI4 YWU4NDc2ZTMzNjljN2FmYmZiMjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uv am5pL2pzYy9KYXZhQXJyYXlKU0MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pz Yy9KYXZhQXJyYXlKU0MuaApAQCAtNDgsNyArNDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBK U1ZhbHVlIHZhbHVlQXQoRXhlY1N0YXRlKiwgdW5zaWduZWQgaW50IGluZGV4KSBjb25zdDsKICAg ICB2aXJ0dWFsIHVuc2lnbmVkIGludCBnZXRMZW5ndGgoKSBjb25zdDsKIAotICAgIGpvYmplY3Qg amF2YUFycmF5KCkgY29uc3QgeyByZXR1cm4gbV9hcnJheS0+bV9pbnN0YW5jZTsgfQorICAgIGpv YmplY3QgamF2YUFycmF5KCkgY29uc3QgeyByZXR1cm4gbV9hcnJheS0+aW5zdGFuY2UoKTsgfQog CiAgICAgc3RhdGljIEpTVmFsdWUgY29udmVydEpPYmplY3RUb0FycmF5KEV4ZWNTdGF0ZSosIGpv YmplY3QsIGNvbnN0IGNoYXIqIHR5cGUsIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4pOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhRmllbGRKU0MuY3BwIGIv U291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9qc2MvSmF2YUZpZWxkSlNDLmNwcAppbmRleCBiN2M2 NjRlNDI4MmZhYTUyZmMzOTkzMTMyZDQxMTFlZjcxNjUyYWY4Li4xMWJiMzgzMzA2MmU0NDZhZDA1 NDA1MjVjMWU0YWNmODRiMDBmMmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uv am5pL2pzYy9KYXZhRmllbGRKU0MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkv anNjL0phdmFGaWVsZEpTQy5jcHAKQEAgLTU4LDEzICs1OCwxMyBAQCBKYXZhRmllbGQ6OkphdmFG aWVsZChKTklFbnYqIGVudiwgam9iamVjdCBhRmllbGQpCiAgICAgICAgIGZpZWxkTmFtZSA9IGVu di0+TmV3U3RyaW5nVVRGKCI8VW5rbm93bj4iKTsKICAgICBtX25hbWUgPSBKYXZhU3RyaW5nKGVu diwgZmllbGROYW1lKTsKIAotICAgIG1fZmllbGQgPSBuZXcgSm9iamVjdFdyYXBwZXIoYUZpZWxk KTsKKyAgICBtX2ZpZWxkID0gSm9iamVjdFdyYXBwZXI6OmNyZWF0ZShhRmllbGQpOwogfQogCiBq dmFsdWUgSmF2YUZpZWxkOjpkaXNwYXRjaFZhbHVlRnJvbUluc3RhbmNlKEV4ZWNTdGF0ZSogZXhl YywgY29uc3QgSmF2YUluc3RhbmNlKiBpbnN0YW5jZSwgY29uc3QgY2hhciogbmFtZSwgY29uc3Qg Y2hhciogc2lnLCBKYXZhVHlwZSByZXR1cm5UeXBlKSBjb25zdAogewogICAgIGpvYmplY3Qgamlu c3RhbmNlID0gaW5zdGFuY2UtPmphdmFJbnN0YW5jZSgpOwotICAgIGpvYmplY3QgZmllbGRKSW5z dGFuY2UgPSBtX2ZpZWxkLT5tX2luc3RhbmNlOworICAgIGpvYmplY3QgZmllbGRKSW5zdGFuY2Ug PSBtX2ZpZWxkLT5pbnN0YW5jZSgpOwogICAgIEpOSUVudiogZW52ID0gZ2V0Sk5JRW52KCk7CiAg ICAganZhbHVlIHJlc3VsdDsKIApAQCAtMTUxLDcgKzE1MSw3IEBAIEpTVmFsdWUgSmF2YUZpZWxk Ojp2YWx1ZUZyb21JbnN0YW5jZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEluc3RhbmNlKiBpKSBj b25zdAogdm9pZCBKYXZhRmllbGQ6OmRpc3BhdGNoU2V0VmFsdWVUb0luc3RhbmNlKEV4ZWNTdGF0 ZSogZXhlYywgY29uc3QgSmF2YUluc3RhbmNlKiBpbnN0YW5jZSwganZhbHVlIGphdmFWYWx1ZSwg Y29uc3QgY2hhciogbmFtZSwgY29uc3QgY2hhciogc2lnKSBjb25zdAogewogICAgIGpvYmplY3Qg amluc3RhbmNlID0gaW5zdGFuY2UtPmphdmFJbnN0YW5jZSgpOwotICAgIGpvYmplY3QgZmllbGRK SW5zdGFuY2UgPSBtX2ZpZWxkLT5tX2luc3RhbmNlOworICAgIGpvYmplY3QgZmllbGRKSW5zdGFu Y2UgPSBtX2ZpZWxkLT5pbnN0YW5jZSgpOwogICAgIEpOSUVudiogZW52ID0gZ2V0Sk5JRW52KCk7 CiAKICAgICBqY2xhc3MgY2xzID0gZW52LT5HZXRPYmplY3RDbGFzcyhmaWVsZEpJbnN0YW5jZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VK U0MuY3BwIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9qc2MvSmF2YUluc3RhbmNlSlNDLmNw cAppbmRleCBlYmRjZWQ0NGFkYTc2OGI1ODM5N2U2YmUyM2Y3OTRkZGUwZWIzNThlLi5lMjJkMzhk MWRjZWQwZDNiOTA1ZWFjMzU1YTc3MTc0YTFlMDE0NmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JyaWRnZS9qbmkvanNjL0phdmFJbnN0YW5jZUpTQy5jcHAKQEAgLTUyLDcgKzUyLDcgQEAg dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBKYXZhSW5zdGFuY2U6OkphdmFJbnN0YW5jZShqb2Jq ZWN0IGluc3RhbmNlLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3RPYmplY3QpCiAgICAgOiBJ bnN0YW5jZShyb290T2JqZWN0KQogewotICAgIG1faW5zdGFuY2UgPSBuZXcgSm9iamVjdFdyYXBw ZXIoaW5zdGFuY2UpOworICAgIG1faW5zdGFuY2UgPSBKb2JqZWN0V3JhcHBlcjo6Y3JlYXRlKGlu c3RhbmNlKTsKICAgICBtX2NsYXNzID0gMDsKIH0KIApAQCAtODEsNyArODEsNyBAQCB2b2lkIEph dmFJbnN0YW5jZTo6dmlydHVhbEVuZCgpCiBDbGFzcyogSmF2YUluc3RhbmNlOjpnZXRDbGFzcygp IGNvbnN0CiB7CiAgICAgaWYgKCFtX2NsYXNzKQotICAgICAgICBtX2NsYXNzID0gbmV3IEphdmFD bGFzcyAobV9pbnN0YW5jZS0+bV9pbnN0YW5jZSk7CisgICAgICAgIG1fY2xhc3MgPSBuZXcgSmF2 YUNsYXNzIChtX2luc3RhbmNlLT5pbnN0YW5jZSgpKTsKICAgICByZXR1cm4gbV9jbGFzczsKIH0K IApAQCAtODksNyArODksNyBAQCBKU1ZhbHVlIEphdmFJbnN0YW5jZTo6c3RyaW5nVmFsdWUoRXhl Y1N0YXRlKiBleGVjKSBjb25zdAogewogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25z T25seSk7CiAKLSAgICBqc3RyaW5nIHN0cmluZ1ZhbHVlID0gKGpzdHJpbmcpY2FsbEpOSU1ldGhv ZDxqb2JqZWN0PihtX2luc3RhbmNlLT5tX2luc3RhbmNlLCAidG9TdHJpbmciLCAiKClMamF2YS9s YW5nL1N0cmluZzsiKTsKKyAgICBqc3RyaW5nIHN0cmluZ1ZhbHVlID0gKGpzdHJpbmcpY2FsbEpO SU1ldGhvZDxqb2JqZWN0PihtX2luc3RhbmNlLT5pbnN0YW5jZSgpLCAidG9TdHJpbmciLCAiKClM amF2YS9sYW5nL1N0cmluZzsiKTsKIAogICAgIC8vIFNob3VsZCB0aHJvdyBhIEpTIGV4Y2VwdGlv biwgcmF0aGVyIHRoYW4gcmV0dXJuaW5nICIiPyAtIGJ1dCBiZXR0ZXIgdGhhbiBhIG51bGwgZGVy ZWZlcmVuY2UuCiAgICAgaWYgKCFzdHJpbmdWYWx1ZSkKQEAgLTEwNCwxMyArMTA0LDEzIEBAIEpT VmFsdWUgSmF2YUluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiAK IEpTVmFsdWUgSmF2YUluc3RhbmNlOjpudW1iZXJWYWx1ZShFeGVjU3RhdGUqKSBjb25zdAogewot ICAgIGpkb3VibGUgZG91YmxlVmFsdWUgPSBjYWxsSk5JTWV0aG9kPGpkb3VibGU+KG1faW5zdGFu Y2UtPm1faW5zdGFuY2UsICJkb3VibGVWYWx1ZSIsICIoKUQiKTsKKyAgICBqZG91YmxlIGRvdWJs ZVZhbHVlID0gY2FsbEpOSU1ldGhvZDxqZG91YmxlPihtX2luc3RhbmNlLT5pbnN0YW5jZSgpLCAi ZG91YmxlVmFsdWUiLCAiKClEIik7CiAgICAgcmV0dXJuIGpzTnVtYmVyKGRvdWJsZVZhbHVlKTsK IH0KIAogSlNWYWx1ZSBKYXZhSW5zdGFuY2U6OmJvb2xlYW5WYWx1ZSgpIGNvbnN0CiB7Ci0gICAg amJvb2xlYW4gYm9vbGVhblZhbHVlID0gY2FsbEpOSU1ldGhvZDxqYm9vbGVhbj4obV9pbnN0YW5j ZS0+bV9pbnN0YW5jZSwgImJvb2xlYW5WYWx1ZSIsICIoKVoiKTsKKyAgICBqYm9vbGVhbiBib29s ZWFuVmFsdWUgPSBjYWxsSk5JTWV0aG9kPGpib29sZWFuPihtX2luc3RhbmNlLT5pbnN0YW5jZSgp LCAiYm9vbGVhblZhbHVlIiwgIigpWiIpOwogICAgIHJldHVybiBqc0Jvb2xlYW4oYm9vbGVhblZh bHVlKTsKIH0KIApAQCAtMTkyLDcgKzE5Miw3IEBAIEpTVmFsdWUgSmF2YUluc3RhbmNlOjppbnZv a2VNZXRob2QoRXhlY1N0YXRlKiBleGVjLCBSdW50aW1lTWV0aG9kKiBydW50aW1lTWV0aG9kCiAK ICAgICBib29sIGhhbmRsZWQgPSBmYWxzZTsKICAgICBpZiAocm9vdE9iamVjdC0+bmF0aXZlSGFu ZGxlKCkpIHsKLSAgICAgICAgam9iamVjdCBvYmogPSBtX2luc3RhbmNlLT5tX2luc3RhbmNlOwor ICAgICAgICBqb2JqZWN0IG9iaiA9IG1faW5zdGFuY2UtPmluc3RhbmNlKCk7CiAgICAgICAgIEpT VmFsdWUgZXhjZXB0aW9uRGVzY3JpcHRpb247CiAgICAgICAgIGNvbnN0IGNoYXIgKmNhbGxpbmdV UkwgPSAwOyAvLyBGSVhNRSwgbmVlZCB0byBwcm9wYWdhdGUgY2FsbGluZyBVUkwgdG8gSmF2YQog ICAgICAgICBqbWV0aG9kSUQgbWV0aG9kSWQgPSBnZXRNZXRob2RJRChvYmosIGpNZXRob2QtPm5h bWUoKS51dGY4KCkuZGF0YSgpLCBqTWV0aG9kLT5zaWduYXR1cmUoKSk7CkBAIC0yMDcsNyArMjA3 LDcgQEAgSlNWYWx1ZSBKYXZhSW5zdGFuY2U6Omludm9rZU1ldGhvZChFeGVjU3RhdGUqIGV4ZWMs IFJ1bnRpbWVNZXRob2QqIHJ1bnRpbWVNZXRob2QKIC8vIFJlbW92ZSB0aGlzIGd1YXJkIG9uY2Ug QnVnIDM5NDc2IGlzIGZpeGVkLgogI2lmIFBMQVRGT1JNKEFORFJPSUQpCiAgICAgaWYgKCFoYW5k bGVkKQotICAgICAgICByZXN1bHQgPSBjYWxsSk5JTWV0aG9kKG1faW5zdGFuY2UtPm1faW5zdGFu Y2UsIGpNZXRob2QtPnJldHVyblR5cGUoKSwgak1ldGhvZC0+bmFtZSgpLnV0ZjgoKS5kYXRhKCks IGpNZXRob2QtPnNpZ25hdHVyZSgpLCBqQXJncy5kYXRhKCkpOworICAgICAgICByZXN1bHQgPSBj YWxsSk5JTWV0aG9kKG1faW5zdGFuY2UtPmluc3RhbmNlKCksIGpNZXRob2QtPnJldHVyblR5cGUo KSwgak1ldGhvZC0+bmFtZSgpLnV0ZjgoKS5kYXRhKCksIGpNZXRob2QtPnNpZ25hdHVyZSgpLCBq QXJncy5kYXRhKCkpOwogI2VuZGlmCiAKICAgICBzd2l0Y2ggKGpNZXRob2QtPnJldHVyblR5cGUo KSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS9qc2MvSmF2YUluc3Rh bmNlSlNDLmggYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0Mu aAppbmRleCA5MzdlNDljNDljZWNlNDc0MjkyZDcyNWQzYzBkODZlMzFkODYxZWVmLi4yMjM4OWNk ZjMzNGI4YWU1MTJiMDA4MDlkYWQzYTk5NDA3ZWI2ODhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9icmlkZ2Uvam5pL2pzYy9KYXZhSW5zdGFuY2VKU0MuaApAQCAtNTYsNyArNTYsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBKU1ZhbHVlIGdldE1ldGhvZChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0 IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7CiAgICAgdmlydHVhbCBKU1ZhbHVlIGludm9rZU1l dGhvZChFeGVjU3RhdGUqIGV4ZWMsIFJ1bnRpbWVNZXRob2QqIG1ldGhvZCk7CiAKLSAgICBqb2Jq ZWN0IGphdmFJbnN0YW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5zdGFuY2UtPm1faW5zdGFuY2U7 IH0KKyAgICBqb2JqZWN0IGphdmFJbnN0YW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5zdGFuY2Ut Pmluc3RhbmNlKCk7IH0KIAogICAgIEpTVmFsdWUgc3RyaW5nVmFsdWUoRXhlY1N0YXRlKikgY29u c3Q7CiAgICAgSlNWYWx1ZSBudW1iZXJWYWx1ZShFeGVjU3RhdGUqKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUZpZWxkSm9iamVjdFY4LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUZpZWxkSm9iamVjdFY4LmNwcAppbmRl eCAwZmU1ODM3NDA4MTZlMDMzMTZjOWY2ZGExNzBkNTI3MTQwZWY2NzI1Li5iZjg5NWY5Y2M0ZGVl NDljYmJhMWRlNDc2OTIxNTEzYWYyZTVmZGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i cmlkZ2Uvam5pL3Y4L0phdmFGaWVsZEpvYmplY3RWOC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YnJpZGdlL2puaS92OC9KYXZhRmllbGRKb2JqZWN0VjguY3BwCkBAIC00Miw3ICs0Miw3IEBAIEph dmFGaWVsZEpvYmplY3Q6OkphdmFGaWVsZEpvYmplY3QoSk5JRW52KiBlbnYsIGpvYmplY3QgYUZp ZWxkKQogICAgIGpzdHJpbmcgZmllbGROYW1lID0gc3RhdGljX2Nhc3Q8anN0cmluZz4oY2FsbEpO SU1ldGhvZDxqb2JqZWN0PihhRmllbGQsICJnZXROYW1lIiwgIigpTGphdmEvbGFuZy9TdHJpbmc7 IikpOwogICAgIG1fbmFtZSA9IEphdmFTdHJpbmcoZW52LCBmaWVsZE5hbWUpOwogCi0gICAgbV9m aWVsZCA9IG5ldyBKb2JqZWN0V3JhcHBlcihhRmllbGQpOworICAgIG1fZmllbGQgPSBKb2JqZWN0 V3JhcHBlcjo6Y3JlYXRlKGFGaWVsZCk7CiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoSkFWQV9CUklE R0UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5j ZUpvYmplY3RWOC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5j ZUpvYmplY3RWOC5jcHAKaW5kZXggODIyMWVmZjFkMjViYzdhYWE4MGExY2NlNjY3YzI5ODc1OTU5 MzZlMy4uNjRiYWI1MjZiZTU5NjZhYjRmNTc1ZjcyNWEwNWQzZDVhZjU2N2E2NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhSW5zdGFuY2VKb2JqZWN0VjguY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUluc3RhbmNlSm9iamVjdFY4 LmNwcApAQCAtNDEsNyArNDEsNyBAQAogdXNpbmcgbmFtZXNwYWNlIEpTQzo6QmluZGluZ3M7CiAK IEphdmFJbnN0YW5jZUpvYmplY3Q6OkphdmFJbnN0YW5jZUpvYmplY3Qoam9iamVjdCBpbnN0YW5j ZSkKLSAgICA6IG1faW5zdGFuY2UobmV3IEpvYmplY3RXcmFwcGVyKGluc3RhbmNlKSkKKyAgICA6 IG1faW5zdGFuY2UoSm9iamVjdFdyYXBwZXI6OmNyZWF0ZShpbnN0YW5jZSkpCiB7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUluc3RhbmNlSm9iamVj dFY4LmggYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5jZUpvYmplY3RW OC5oCmluZGV4IDlmODYwMzdmZTM1MDUwNzUxNWNkMWY0ZDU5NGVmYzVlY2Q5ODQwYTkuLjI4MDM3 NmQ3NTRlNDRkMWMxOGIxMWQ2ODlhNzU0Y2Y1ODA0NjMzYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUluc3RhbmNlSm9iamVjdFY4LmgKKysrIGIvU291cmNl L1dlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhSW5zdGFuY2VKb2JqZWN0VjguaApAQCAtNTMsNyAr NTMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJlZ2luKCk7CiAgICAgdmlydHVhbCB2 b2lkIGVuZCgpOwogCi0gICAgam9iamVjdCBqYXZhSW5zdGFuY2UoKSBjb25zdCB7IHJldHVybiBt X2luc3RhbmNlLT5tX2luc3RhbmNlOyB9CisgICAgam9iamVjdCBqYXZhSW5zdGFuY2UoKSBjb25z dCB7IHJldHVybiBtX2luc3RhbmNlLT5pbnN0YW5jZSgpOyB9CiAKIHByb3RlY3RlZDoKICAgICBS ZWZQdHI8Sm9iamVjdFdyYXBwZXI+IG1faW5zdGFuY2U7Cg==