154153 2016-02-11 22:03:05 -0800 Modern IDB: IDBObjectStore and IDBIndex need to be ActiveDOMObjects 2016-02-12 15:17:00 -0800 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1164024 0 beidson 2016-02-11 22:03:05 -0800 Modern IDB: IDBObjectStore and IDBIndex need to be ActiveDOMObjects Their "hasPendingActivity()" function needs to return true as long as their IDBTransaction is still in progress. 1164185 1 271183 beidson 2016-02-12 10:02:29 -0800 Created attachment 271183 Patch v1 Will mark for review and EWS after the patch in bug 154110 lands. 1164379 2 271183 commit-queue 2016-02-12 15:16:58 -0800 Comment on attachment 271183 Patch v1 Clearing flags on attachment: 271183 Committed r196519: <http://trac.webkit.org/changeset/196519> 1164380 3 commit-queue 2016-02-12 15:17:00 -0800 All reviewed patches have been landed. Closing bug. 271183 2016-02-12 10:02:29 -0800 2016-02-12 15:16:58 -0800 Patch v1 patch text/plain 10965 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxODNjNTBmLi5kZjEzMmE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzgg QEAKIDIwMTYtMDItMTIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1vZGVybiBJREI6IElEQk9iamVjdFN0b3JlIGFuZCBJREJJbmRleCBuZWVkIHRvIGJlIEFj dGl2ZURPTU9iamVjdHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTQxNTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgKE5vIHRlc3RhYmxlIGNoYW5nZSBpbiBiZWhhdmlvcikuCisK KyAgICAgICAgVGhpcyBpcyBuZWVkZWQgc28gdGhhdCBJREJPYmplY3RTdG9yZSBhbmQgSURCSW5k ZXggSlMgd3JhcHBlcnMgYXJlIG5vdCBnYXJiYWdlIGNvbGxlY3RlZAorICAgICAgICB3aGlsZSB0 aGVpciBJREJUcmFuc2FjdGlvbiBpcyBzdGlsbCBpbiBwcm9ncmVzcy4KKworICAgICAgICAqIE1v ZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJJbmRleEltcGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SURCQ2xpZW50OjpJREJJbmRleDo6SURCSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6SURC Q2xpZW50OjpJREJJbmRleDo6YWN0aXZlRE9NT2JqZWN0TmFtZSk6CisgICAgICAgIChXZWJDb3Jl OjpJREJDbGllbnQ6OklEQkluZGV4OjpjYW5TdXNwZW5kRm9yRG9jdW1lbnRTdXNwZW5zaW9uKToK KyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCSW5kZXg6Omhhc1BlbmRpbmdBY3Rpdml0 eSk6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkluZGV4SW1wbC5oOgor ICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT2JqZWN0U3Rv cmVJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCT2JqZWN0U3RvcmU6 OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpJ REJPYmplY3RTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0 b3JlOjphY3RpdmVET01PYmplY3ROYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6 SURCT2JqZWN0U3RvcmU6OmNhblN1c3BlbmRGb3JEb2N1bWVudFN1c3BlbnNpb24pOgorICAgICAg ICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPYmplY3RTdG9yZTo6aGFzUGVuZGluZ0FjdGl2aXR5 KToKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCT2JqZWN0U3RvcmU6OmluZGV4KToK KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmg6 CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJUcmFuc2Fj dGlvbkltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJUcmFuc2FjdGlv bjo6b2JqZWN0U3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJUcmFuc2Fj dGlvbjo6Y3JlYXRlT2JqZWN0U3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJ REJUcmFuc2FjdGlvbjo6Y3JlYXRlSW5kZXgpOgorCisyMDE2LTAyLTEyICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNb2Rlcm4gSURCOiBSZWYgY3ljbGUgYmV0 d2VlbiBJREJPYmplY3RTdG9yZSBhbmQgSURCSW5kZXguCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQxMTAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkluZGV4SW1wbC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCSW5kZXhJbXBsLmNwcAppbmRleCBj ZjJlNmUyLi5iMmQ3MzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9jbGllbnQvSURCSW5kZXhJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9jbGllbnQvSURCSW5kZXhJbXBsLmNwcApAQCAtNDEsMTYgKzQxLDMzIEBACiBu YW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgSURCQ2xpZW50IHsKIAotSURCSW5kZXg6OklE QkluZGV4KGNvbnN0IElEQkluZGV4SW5mbyYgaW5mbywgSURCT2JqZWN0U3RvcmUmIG9iamVjdFN0 b3JlKQotICAgIDogbV9pbmZvKGluZm8pCitJREJJbmRleDo6SURCSW5kZXgoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgSURCSW5kZXhJbmZvJiBpbmZvLCBJREJPYmplY3RT dG9yZSYgb2JqZWN0U3RvcmUpCisgICAgOiBBY3RpdmVET01PYmplY3QoY29udGV4dCkKKyAgICAs IG1faW5mbyhpbmZvKQogICAgICwgbV9vYmplY3RTdG9yZShvYmplY3RTdG9yZSkKIHsKKyAgICBz dXNwZW5kSWZOZWVkZWQoKTsKIH0KIAogSURCSW5kZXg6On5JREJJbmRleCgpCiB7CiB9CiAKK2Nv bnN0IGNoYXIqIElEQkluZGV4OjphY3RpdmVET01PYmplY3ROYW1lKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gIklEQkluZGV4IjsKK30KKworYm9vbCBJREJJbmRleDo6Y2FuU3VzcGVuZEZvckRvY3Vt ZW50U3VzcGVuc2lvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29sIElE QkluZGV4OjpoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdAoreworICAgIHJldHVybiAhbV9vYmpl Y3RTdG9yZS5tb2Rlcm5UcmFuc2FjdGlvbigpLmlzRmluaXNoZWQoKTsKK30KKwogY29uc3QgU3Ry aW5nJiBJREJJbmRleDo6bmFtZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faW5mby5uYW1lKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURC SW5kZXhJbXBsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURC SW5kZXhJbXBsLmgKaW5kZXggYjA4MmY2Ny4uZWFmYmRhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkluZGV4SW1wbC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJJbmRleEltcGwuaApAQCAtMzAs NiArMzAsNyBAQAogCiAjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0UpCiAKKyNpbmNsdWRlICJB Y3RpdmVET01PYmplY3QuaCIKICNpbmNsdWRlICJJREJJbmRleEluZm8uaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewpAQCAtNDAsOSArNDEsOSBAQCBuYW1lc3BhY2UgSURCQ2xpZW50IHsKIAogY2xh c3MgSURCT2JqZWN0U3RvcmU7CiAKLWNsYXNzIElEQkluZGV4IDogcHVibGljIFdlYkNvcmU6OklE QkluZGV4IHsKK2NsYXNzIElEQkluZGV4IDogcHVibGljIFdlYkNvcmU6OklEQkluZGV4LCBwdWJs aWMgQWN0aXZlRE9NT2JqZWN0IHsKIHB1YmxpYzoKLSAgICBJREJJbmRleChjb25zdCBJREJJbmRl eEluZm8mLCBJREJPYmplY3RTdG9yZSYpOworICAgIElEQkluZGV4KFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQqLCBjb25zdCBJREJJbmRleEluZm8mLCBJREJPYmplY3RTdG9yZSYpOwogCiAgICAgdmly dHVhbCB+SURCSW5kZXgoKTsKIApAQCAtOTIsNiArOTMsMTEgQEAgcHJpdmF0ZToKICAgICBSZWZQ dHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gZG9HZXQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNv bnN0IElEQktleVJhbmdlRGF0YSYsIEV4Y2VwdGlvbkNvZGVXaXRoTWVzc2FnZSYpOwogICAgIFJl ZlB0cjxXZWJDb3JlOjpJREJSZXF1ZXN0PiBkb0dldEtleShTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiwgRXhjZXB0aW9uQ29kZVdpdGhNZXNzYWdlJik7CiAK KyAgICAvLyBBY3RpdmVET01PYmplY3QKKyAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIGFjdGl2ZURP TU9iamVjdE5hbWUoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsKKyAgICB2aXJ0dWFsIGJvb2wgY2Fu U3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpIGNvbnN0IG92ZXJyaWRlIGZpbmFsOworICAg IHZpcnR1YWwgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsK KwogICAgIElEQkluZGV4SW5mbyBtX2luZm87CiAKICAgICBib29sIG1fZGVsZXRlZCB7IGZhbHNl IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQv SURCT2JqZWN0U3RvcmVJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L2NsaWVudC9JREJPYmplY3RTdG9yZUltcGwuY3BwCmluZGV4IDJhMmQzOTAuLmFjNmYzNDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJPYmpl Y3RTdG9yZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2Ns aWVudC9JREJPYmplY3RTdG9yZUltcGwuY3BwCkBAIC00NiwyMiArNDYsMzkgQEAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBJREJDbGllbnQgewogCi1SZWY8SURCT2JqZWN0U3RvcmU+ IElEQk9iamVjdFN0b3JlOjpjcmVhdGUoY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiBpbmZvLCBJ REJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24pCitSZWY8SURCT2JqZWN0U3RvcmU+IElEQk9iamVj dFN0b3JlOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgSURC T2JqZWN0U3RvcmVJbmZvJiBpbmZvLCBJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24pCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSURCT2JqZWN0U3RvcmUoaW5mbywgdHJhbnNhY3Rpb24p KTsKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBJREJPYmplY3RTdG9yZShjb250ZXh0LCBpbmZv LCB0cmFuc2FjdGlvbikpOwogfQogCi1JREJPYmplY3RTdG9yZTo6SURCT2JqZWN0U3RvcmUoY29u c3QgSURCT2JqZWN0U3RvcmVJbmZvJiBpbmZvLCBJREJUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24p Ci0gICAgOiBtX2luZm8oaW5mbykKK0lEQk9iamVjdFN0b3JlOjpJREJPYmplY3RTdG9yZShTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8mIGlu Zm8sIElEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbikKKyAgICA6IEFjdGl2ZURPTU9iamVjdChj b250ZXh0KQorICAgICwgbV9pbmZvKGluZm8pCiAgICAgLCBtX29yaWdpbmFsSW5mbyhpbmZvKQog ICAgICwgbV90cmFuc2FjdGlvbih0cmFuc2FjdGlvbikKIHsKKyAgICBzdXNwZW5kSWZOZWVkZWQo KTsKIH0KIAogSURCT2JqZWN0U3RvcmU6On5JREJPYmplY3RTdG9yZSgpCiB7CiB9CiAKK2NvbnN0 IGNoYXIqIElEQk9iamVjdFN0b3JlOjphY3RpdmVET01PYmplY3ROYW1lKCkgY29uc3QKK3sKKyAg ICByZXR1cm4gIklEQk9iamVjdFN0b3JlIjsKK30KKworYm9vbCBJREJPYmplY3RTdG9yZTo6Y2Fu U3VzcGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGZhbHNl OworfQorCitib29sIElEQk9iamVjdFN0b3JlOjpoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdAor eworICAgIHJldHVybiAhbV90cmFuc2FjdGlvbi0+aXNGaW5pc2hlZCgpOworfQorCiBjb25zdCBT dHJpbmcgSURCT2JqZWN0U3RvcmU6Om5hbWUoKSBjb25zdAogewogICAgIHJldHVybiBtX2luZm8u bmFtZSgpOwpAQCAtNTAwLDYgKzUxNyw5IEBAIFJlZlB0cjxXZWJDb3JlOjpJREJJbmRleD4gSURC T2JqZWN0U3RvcmU6OmluZGV4KGNvbnN0IFN0cmluZyYgaW5kZXhOYW1lLCBFeGNlcHRpCiB7CiAg ICAgTE9HKEluZGV4ZWREQiwgIklEQk9iamVjdFN0b3JlOjppbmRleCIpOwogCisgICAgaWYgKCFz Y3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCiAgICAg aWYgKG1fZGVsZXRlZCkgewogICAgICAgICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246 OkludmFsaWRTdGF0ZUVycm9yOwogICAgICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJG YWlsZWQgdG8gZXhlY3V0ZSAnaW5kZXgnIG9uICdJREJPYmplY3RTdG9yZSc6IFRoZSBvYmplY3Qg c3RvcmUgaGFzIGJlZW4gZGVsZXRlZC4iKTsKQEAgLTUyNCw3ICs1NDQsNyBAQCBSZWZQdHI8V2Vi Q29yZTo6SURCSW5kZXg+IElEQk9iamVjdFN0b3JlOjppbmRleChjb25zdCBTdHJpbmcmIGluZGV4 TmFtZSwgRXhjZXB0aQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBhdXRv IGluZGV4ID0gc3RkOjptYWtlX3VuaXF1ZTxJREJJbmRleD4oKmluZm8sICp0aGlzKTsKKyAgICBh dXRvIGluZGV4ID0gc3RkOjptYWtlX3VuaXF1ZTxJREJJbmRleD4oc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpLCAqaW5mbywgKnRoaXMpOwogICAgIFJlZlB0cjxJREJJbmRleD4gcmVmSW5kZXggPSBp bmRleC5nZXQoKTsKICAgICBtX3JlZmVyZW5jZWRJbmRleGVzLnNldChpbmRleE5hbWUsIFdURk1v dmUoaW5kZXgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5oCmluZGV4IDYwOTZhZmUuLjBmZGEx YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJPYmplY3RTdG9yZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9jbGllbnQvSURCT2JqZWN0U3RvcmVJbXBsLmgKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lmIEVO QUJMRShJTkRFWEVEX0RBVEFCQVNFKQogCisjaW5jbHVkZSAiQWN0aXZlRE9NT2JqZWN0LmgiCiAj aW5jbHVkZSAiSURCSW5kZXhJbXBsLmgiCiAjaW5jbHVkZSAiSURCT2JqZWN0U3RvcmUuaCIKICNp bmNsdWRlICJJREJPYmplY3RTdG9yZUluZm8uaCIKQEAgLTQ0LDkgKzQ1LDkgQEAgbmFtZXNwYWNl IElEQkNsaWVudCB7CiBjbGFzcyBJREJSZXF1ZXN0OwogY2xhc3MgSURCVHJhbnNhY3Rpb247CiAK LWNsYXNzIElEQk9iamVjdFN0b3JlIDogcHVibGljIFdlYkNvcmU6OklEQk9iamVjdFN0b3JlIHsK K2NsYXNzIElEQk9iamVjdFN0b3JlIDogcHVibGljIFdlYkNvcmU6OklEQk9iamVjdFN0b3JlLCBw dWJsaWMgQWN0aXZlRE9NT2JqZWN0IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmPElEQk9iamVj dFN0b3JlPiBjcmVhdGUoY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwgSURCVHJhbnNhY3Rpb24m KTsKKyAgICBzdGF0aWMgUmVmPElEQk9iamVjdFN0b3JlPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCosIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIElEQlRyYW5zYWN0aW9uJik7CiAK ICAgICB2aXJ0dWFsIH5JREJPYmplY3RTdG9yZSgpIG92ZXJyaWRlIGZpbmFsOwogCkBAIC05OCw3 ICs5OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHZpc2l0UmVmZXJlbmNlZEluZGV4ZXMoSlNDOjpT bG90VmlzaXRvciYpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIElEQk9iamVjdFN0b3JlKGNvbnN0 IElEQk9iamVjdFN0b3JlSW5mbyYsIElEQlRyYW5zYWN0aW9uJik7CisgICAgSURCT2JqZWN0U3Rv cmUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIElE QlRyYW5zYWN0aW9uJik7CiAKICAgICBlbnVtIGNsYXNzIElubGluZUtleUNoZWNrIHsKICAgICAg ICAgUGVyZm9ybSwKQEAgLTEwOSw2ICsxMTAsMTEgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V2Vi Q29yZTo6SURCUmVxdWVzdD4gZG9Db3VudChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3Qg SURCS2V5UmFuZ2VEYXRhJiwgRXhjZXB0aW9uQ29kZVdpdGhNZXNzYWdlJik7CiAgICAgUmVmUHRy PElEQlJlcXVlc3Q+IGRvRGVsZXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIElE QktleVJhbmdlKiBrZXlSYW5nZSwgRXhjZXB0aW9uQ29kZVdpdGhNZXNzYWdlJiBlYyk7CiAKKyAg ICAvLyBBY3RpdmVET01PYmplY3QKKyAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIGFjdGl2ZURPTU9i amVjdE5hbWUoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsKKyAgICB2aXJ0dWFsIGJvb2wgY2FuU3Vz cGVuZEZvckRvY3VtZW50U3VzcGVuc2lvbigpIGNvbnN0IG92ZXJyaWRlIGZpbmFsOworICAgIHZp cnR1YWwgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBvdmVycmlkZSBmaW5hbDsKKwog ICAgIElEQk9iamVjdFN0b3JlSW5mbyBtX2luZm87CiAgICAgSURCT2JqZWN0U3RvcmVJbmZvIG1f b3JpZ2luYWxJbmZvOwogICAgIFJlZjxJREJUcmFuc2FjdGlvbj4gbV90cmFuc2FjdGlvbjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJUcmFu c2FjdGlvbkltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50 L0lEQlRyYW5zYWN0aW9uSW1wbC5jcHAKaW5kZXggODJhOWJiZi4uM2QxNTFiOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQlRyYW5zYWN0aW9u SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lE QlRyYW5zYWN0aW9uSW1wbC5jcHAKQEAgLTEyNyw2ICsxMjcsOSBAQCBSZWZQdHI8V2ViQ29yZTo6 SURCT2JqZWN0U3RvcmU+IElEQlRyYW5zYWN0aW9uOjpvYmplY3RTdG9yZShjb25zdCBTdHJpbmcm IG9iamVjdAogewogICAgIExPRyhJbmRleGVkREIsICJJREJUcmFuc2FjdGlvbjo6b2JqZWN0U3Rv cmUiKTsKIAorICAgIGlmICghc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKQorICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKwogICAgIGlmIChpc0ZpbmlzaGVkT3JGaW5pc2hpbmcoKSkgewogICAgICAg ICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246OkludmFsaWRTdGF0ZUVycm9yOwogICAg ICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhlY3V0ZSAnb2JqZWN0 U3RvcmUnIG9uICdJREJUcmFuc2FjdGlvbic6IFRoZSB0cmFuc2FjdGlvbiBmaW5pc2hlZC4iKTsK QEAgLTE1OSw3ICsxNjIsNyBAQCBSZWZQdHI8V2ViQ29yZTo6SURCT2JqZWN0U3RvcmU+IElEQlRy YW5zYWN0aW9uOjpvYmplY3RTdG9yZShjb25zdCBTdHJpbmcmIG9iamVjdAogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBhdXRvIG9iamVjdFN0b3JlID0gSURCT2JqZWN0U3Rv cmU6OmNyZWF0ZSgqaW5mbywgKnRoaXMpOworICAgIGF1dG8gb2JqZWN0U3RvcmUgPSBJREJPYmpl Y3RTdG9yZTo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgKmluZm8sICp0aGlzKTsK ICAgICBtX3JlZmVyZW5jZWRPYmplY3RTdG9yZXMuc2V0KG9iamVjdFN0b3JlTmFtZSwgJm9iamVj dFN0b3JlLmdldCgpKTsKIAogICAgIHJldHVybiBhZG9wdFJlZigmb2JqZWN0U3RvcmUubGVha1Jl ZigpKTsKQEAgLTQ2OCw4ICs0NzEsOSBAQCBSZWY8SURCT2JqZWN0U3RvcmU+IElEQlRyYW5zYWN0 aW9uOjpjcmVhdGVPYmplY3RTdG9yZShjb25zdCBJREJPYmplY3RTdG9yZUluZm8mCiB7CiAgICAg TE9HKEluZGV4ZWREQiwgIklEQlRyYW5zYWN0aW9uOjpjcmVhdGVPYmplY3RTdG9yZSIpOwogICAg IEFTU0VSVChpc1ZlcnNpb25DaGFuZ2UoKSk7CisgICAgQVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKSk7CiAKLSAgICBSZWY8SURCT2JqZWN0U3RvcmU+IG9iamVjdFN0b3JlID0gSURCT2Jq ZWN0U3RvcmU6OmNyZWF0ZShpbmZvLCAqdGhpcyk7CisgICAgUmVmPElEQk9iamVjdFN0b3JlPiBv YmplY3RTdG9yZSA9IElEQk9iamVjdFN0b3JlOjpjcmVhdGUoc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCgpLCBpbmZvLCAqdGhpcyk7CiAgICAgbV9yZWZlcmVuY2VkT2JqZWN0U3RvcmVzLnNldChpbmZv Lm5hbWUoKSwgJm9iamVjdFN0b3JlLmdldCgpKTsKIAogICAgIGF1dG8gb3BlcmF0aW9uID0gY3Jl YXRlVHJhbnNhY3Rpb25PcGVyYXRpb24oKnRoaXMsICZJREJUcmFuc2FjdGlvbjo6ZGlkQ3JlYXRl T2JqZWN0U3RvcmVPblNlcnZlciwgJklEQlRyYW5zYWN0aW9uOjpjcmVhdGVPYmplY3RTdG9yZU9u U2VydmVyLCBpbmZvKTsKQEAgLTQ5OSwxMCArNTAzLDEzIEBAIHN0ZDo6dW5pcXVlX3B0cjxJREJJ bmRleD4gSURCVHJhbnNhY3Rpb246OmNyZWF0ZUluZGV4KElEQk9iamVjdFN0b3JlJiBvYmplY3RT dG9yCiAgICAgTE9HKEluZGV4ZWREQiwgIklEQlRyYW5zYWN0aW9uOjpjcmVhdGVJbmRleCIpOwog ICAgIEFTU0VSVChpc1ZlcnNpb25DaGFuZ2UoKSk7CiAKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKICAgICBhdXRvIG9wZXJhdGlv biA9IGNyZWF0ZVRyYW5zYWN0aW9uT3BlcmF0aW9uKCp0aGlzLCAmSURCVHJhbnNhY3Rpb246OmRp ZENyZWF0ZUluZGV4T25TZXJ2ZXIsICZJREJUcmFuc2FjdGlvbjo6Y3JlYXRlSW5kZXhPblNlcnZl ciwgaW5mbyk7CiAgICAgc2NoZWR1bGVPcGVyYXRpb24oV1RGTW92ZShvcGVyYXRpb24pKTsKIAot ICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPElEQkluZGV4PihpbmZvLCBvYmplY3RTdG9yZSk7 CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8SURCSW5kZXg+KHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKSwgaW5mbywgb2JqZWN0U3RvcmUpOwogfQogCiB2b2lkIElEQlRyYW5zYWN0aW9uOjpj cmVhdGVJbmRleE9uU2VydmVyKFRyYW5zYWN0aW9uT3BlcmF0aW9uJiBvcGVyYXRpb24sIGNvbnN0 IElEQkluZGV4SW5mbyYgaW5mbykK