123787 2013-11-04 22:03:27 -0800 IDB: deleteDatabase() interface should be asynchronous 2013-11-04 22:15:09 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 947024 0 beidson 2013-11-04 22:03:27 -0800 IDB: deleteDatabase() interface should be asynchronous The in-process LevelDB implementation will continue to treat it synchronously. 947026 1 216003 beidson 2013-11-04 22:06:29 -0800 Created attachment 216003 Patch v1 947027 2 beidson 2013-11-04 22:15:09 -0800 http://trac.webkit.org/changeset/158649 216003 2013-11-04 22:06:29 -0800 2013-11-04 22:09:17 -0800 Patch v1 patch text/plain 10967 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZDQ2ZWZhLi5hMzEwYWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTMtMTEtMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIElEQjogZGVsZXRlRGF0YWJhc2UoKSBpbnRlcmZhY2Ugc2hvdWxkIGJlIGFzeW5jaHJvbm91 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNzg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIChObyBiZWhhdmlvciBjaGFuZ2UgZm9yIGEgdGVzdGVkIHBvcnQpLgorCisgICAgICAg IGRlbGV0ZURhdGFiYXNlIG5vdyBoYXMgbm8gcmV0dXJuIHZhbHVlLCBidXQgY2FsbHMgYmFjayB0 byBhIGJvb2wgZnVuY3Rpb246CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2lu Z1N0b3JlSW50ZXJmYWNlLmg6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9J REJCYWNraW5nU3RvcmVMZXZlbERCLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkJhY2tpbmdT dG9yZUxldmVsREI6OmRlbGV0ZURhdGFiYXNlKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRk Yi9sZXZlbGRiL0lEQkJhY2tpbmdTdG9yZUxldmVsREIuaDoKKworICAgICAgICBSZWZhY3RvciB0 byBhY2NvdW50IGZvciB0aGUgbmV3IGFzeW5jIGRlbGV0ZURhdGFiYXNlOgorICAgICAgICAqIE1v ZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZEltcGwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SURCRGF0YWJhc2VCYWNrZW5kSW1wbDo6cHJvY2Vzc1BlbmRpbmdDYWxscyk6CisgICAg ICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZUJhY2tlbmRJbXBsOjpkZWxldGVEYXRhYmFzZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJREJEYXRhYmFzZUJhY2tlbmRJbXBsOjpkZWxldGVEYXRhYmFzZUFz eW5jKToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmRJbXBs Lmg6CisKKzIwMTMtMTEtMDQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAg ICAgICAgIEFkZCBNb2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiIHRvIHRoZSBXZWJDb3JlLnhjb2Rl cHJvagogCiAgICAgICAgIFJ1YmJlcnN0YW1wZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkJhY2tpbmdTdG9yZUludGVy ZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2luZ1N0b3Jl SW50ZXJmYWNlLmgKaW5kZXggZmZjNTAyMC4uNTY0N2JhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2luZ1N0b3JlSW50ZXJmYWNlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQmFja2luZ1N0b3JlSW50ZXJmYWNl LmgKQEAgLTgyLDE1ICs4MiwxOSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHN0ZDo6dW5pcXVl X3B0cjxUcmFuc2FjdGlvbj4gY3JlYXRlQmFja2luZ1N0b3JlVHJhbnNhY3Rpb24oKSA9IDA7CiAK KyAgICAvLyBOZXctc3R5bGUgYXN5bmNocm9ub3VzIGNhbGxiYWNrcwogICAgIHR5cGVkZWYgc3Rk OjpmdW5jdGlvbjx2b2lkIChjb25zdCBJREJEYXRhYmFzZU1ldGFkYXRhJiwgYm9vbCBzdWNjZXNz KT4gR2V0SURCRGF0YWJhc2VNZXRhZGF0YUZ1bmN0aW9uOwogICAgIHZpcnR1YWwgdm9pZCBnZXRP ckVzdGFibGlzaElEQkRhdGFiYXNlTWV0YWRhdGEoY29uc3QgU3RyaW5nJiBuYW1lLCBHZXRJREJE YXRhYmFzZU1ldGFkYXRhRnVuY3Rpb24pID0gMDsKIAorICAgIHR5cGVkZWYgc3RkOjpmdW5jdGlv bjx2b2lkIChib29sIHN1Y2Nlc3MpPiBCb29sQ2FsbGJhY2tGdW5jdGlvbjsKKyAgICB2aXJ0dWFs IHZvaWQgZGVsZXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBuYW1lLCBCb29sQ2FsbGJhY2tGdW5j dGlvbikgPSAwOworCisgICAgLy8gT2xkLXN0eWxlIHN5bmNocm9ub3VzIGNhbGxiYWNrcwogICAg IHZpcnR1YWwgYm9vbCBrZXlFeGlzdHNJbk9iamVjdFN0b3JlKElEQkJhY2tpbmdTdG9yZUludGVy ZmFjZTo6VHJhbnNhY3Rpb24mLCBpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3Rv cmVJZCwgY29uc3QgSURCS2V5JiwgUmVmUHRyPElEQlJlY29yZElkZW50aWZpZXI+JiBmb3VuZElE QlJlY29yZElkZW50aWZpZXIpID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBwdXRJbmRleERhdGFG b3JSZWNvcmQoSURCQmFja2luZ1N0b3JlSW50ZXJmYWNlOjpUcmFuc2FjdGlvbiYsIGludDY0X3Qg ZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBpbnQ2NF90IGluZGV4SWQsIGNvbnN0 IElEQktleSYsIGNvbnN0IElEQlJlY29yZElkZW50aWZpZXIqKSA9IDA7CiAgICAgdmlydHVhbCBi b29sIGtleUV4aXN0c0luSW5kZXgoSURCQmFja2luZ1N0b3JlSW50ZXJmYWNlOjpUcmFuc2FjdGlv biYsIGludDY0X3QgZGF0YWJhc2VJZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBpbnQ2NF90IGlu ZGV4SWQsIGNvbnN0IElEQktleSYsIFJlZlB0cjxJREJLZXk+JiBmb3VuZFByaW1hcnlLZXksIGJv b2wmIGV4aXN0cykgPSAwOwogCi0gICAgdmlydHVhbCBib29sIGRlbGV0ZURhdGFiYXNlKGNvbnN0 IFN0cmluZyYgbmFtZSkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCB1cGRhdGVJREJEYXRhYmFzZVZl cnNpb24oSURCQmFja2luZ1N0b3JlSW50ZXJmYWNlOjpUcmFuc2FjdGlvbiYsIGludDY0X3Qgcm93 SWQsIHVpbnQ2NF90IHZlcnNpb24pID0gMDsKIAogICAgIHZpcnR1YWwgYm9vbCBnZXRSZWNvcmQo SURCQmFja2luZ1N0b3JlSW50ZXJmYWNlOjpUcmFuc2FjdGlvbiYsIGludDY0X3QgZGF0YWJhc2VJ ZCwgaW50NjRfdCBvYmplY3RTdG9yZUlkLCBjb25zdCBJREJLZXkmLCBWZWN0b3I8Y2hhcj4mIHJl Y29yZCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCRGF0YWJhc2VCYWNrZW5kSW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmRJbXBsLmNwcAppbmRleCBhYjIxODlkLi5lZjE4NDBkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJh Y2tlbmRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJE YXRhYmFzZUJhY2tlbmRJbXBsLmNwcApAQCAtNDE1LDExICs0MTUsMTggQEAgdm9pZCBJREJEYXRh YmFzZUJhY2tlbmRJbXBsOjpwcm9jZXNzUGVuZGluZ0NhbGxzKCkKICAgICAgICAgcmV0dXJuOwog ICAgIHdoaWxlICghbV9wZW5kaW5nRGVsZXRlQ2FsbHMuaXNFbXB0eSgpKSB7CiAgICAgICAgIE93 blB0cjxJREJQZW5kaW5nRGVsZXRlQ2FsbD4gcGVuZGluZ0RlbGV0ZUNhbGwgPSBtX3BlbmRpbmdE ZWxldGVDYWxscy50YWtlRmlyc3QoKTsKLSAgICAgICAgZGVsZXRlRGF0YWJhc2VGaW5hbChwZW5k aW5nRGVsZXRlQ2FsbC0+Y2FsbGJhY2tzKCkpOworICAgICAgICBtX2RlbGV0ZUNhbGxiYWNrc1dh aXRpbmdDb21wbGV0aW9uLmFkZChwZW5kaW5nRGVsZXRlQ2FsbC0+Y2FsbGJhY2tzKCkpOworICAg ICAgICBkZWxldGVEYXRhYmFzZUFzeW5jKHBlbmRpbmdEZWxldGVDYWxsLT5jYWxsYmFja3MoKSk7 CiAgICAgfQotICAgIC8vIGRlbGV0ZURhdGFiYXNlRmluYWwgc2hvdWxkIG5ldmVyIHJlLXF1ZXVl IGNhbGxzLgorCisgICAgLy8gZGVsZXRlRGF0YWJhc2VBc3luYyBzaG91bGQgbmV2ZXIgcmUtcXVl dWUgY2FsbHMuCiAgICAgQVNTRVJUKG1fcGVuZGluZ0RlbGV0ZUNhbGxzLmlzRW1wdHkoKSk7CiAK KyAgICAvLyBJZiB0aGVyZSBhcmUgYW55IGRhdGFiYXNlIGRlbGV0aW9ucyB3YWl0aW5nIGZvciBj b21wbGV0aW9uLCB3ZSdyZSBkb25lIGZvciBub3cuCisgICAgLy8gRnVydGhlciBjYWxsYmFja3Mg d2lsbCBiZSBoYW5kbGVkIGluIGEgZnV0dXJlIGNhbGwgdG8gcHJvY2Vzc1BlbmRpbmdDYWxscygp LgorICAgIGlmIChtX2RlbGV0ZUNhbGxiYWNrc1dhaXRpbmdDb21wbGV0aW9uLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fcnVubmluZ1ZlcnNpb25DaGFuZ2VUcmFuc2Fj dGlvbikKICAgICAgICAgcmV0dXJuOwogCkBAIC01NzQsNyArNTgxLDcgQEAgdm9pZCBJREJEYXRh YmFzZUJhY2tlbmRJbXBsOjpkZWxldGVEYXRhYmFzZShQYXNzUmVmUHRyPElEQkNhbGxiYWNrcz4g cHJwQ2FsbGJhY2sKICAgICAgICAgbV9wZW5kaW5nRGVsZXRlQ2FsbHMuYXBwZW5kKElEQlBlbmRp bmdEZWxldGVDYWxsOjpjcmVhdGUoY2FsbGJhY2tzLnJlbGVhc2UoKSkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQotICAgIGRlbGV0ZURhdGFiYXNlRmluYWwoY2FsbGJhY2tzLnJlbGVhc2UoKSk7 CisgICAgZGVsZXRlRGF0YWJhc2VBc3luYyhjYWxsYmFja3MucmVsZWFzZSgpKTsKIH0KIAogYm9v bCBJREJEYXRhYmFzZUJhY2tlbmRJbXBsOjppc0RlbGV0ZURhdGFiYXNlQmxvY2tlZCgpCkBAIC01 ODIsMTggKzU4OSwzMCBAQCBib29sIElEQkRhdGFiYXNlQmFja2VuZEltcGw6OmlzRGVsZXRlRGF0 YWJhc2VCbG9ja2VkKCkKICAgICByZXR1cm4gY29ubmVjdGlvbkNvdW50KCk7CiB9CiAKLXZvaWQg SURCRGF0YWJhc2VCYWNrZW5kSW1wbDo6ZGVsZXRlRGF0YWJhc2VGaW5hbChQYXNzUmVmUHRyPElE QkNhbGxiYWNrcz4gY2FsbGJhY2tzKQordm9pZCBJREJEYXRhYmFzZUJhY2tlbmRJbXBsOjpkZWxl dGVEYXRhYmFzZUFzeW5jKFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MpCiB7CiAg ICAgQVNTRVJUKCFpc0RlbGV0ZURhdGFiYXNlQmxvY2tlZCgpKTsKICAgICBBU1NFUlQobV9iYWNr aW5nU3RvcmUpOwotICAgIGlmICghbV9iYWNraW5nU3RvcmUtPmRlbGV0ZURhdGFiYXNlKG1fbWV0 YWRhdGEubmFtZSkpIHsKLSAgICAgICAgY2FsbGJhY2tzLT5vbkVycm9yKElEQkRhdGFiYXNlRXJy b3I6OmNyZWF0ZShJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCAiSW50ZXJuYWwg ZXJyb3IgZGVsZXRpbmcgZGF0YWJhc2UuIikpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAg IG1fbWV0YWRhdGEuaWQgPSBJbnZhbGlkSWQ7Ci0gICAgbV9tZXRhZGF0YS52ZXJzaW9uID0gSURC RGF0YWJhc2VNZXRhZGF0YTo6Tm9JbnRWZXJzaW9uOwotICAgIG1fbWV0YWRhdGEub2JqZWN0U3Rv cmVzLmNsZWFyKCk7Ci0gICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3MoKTsKKworICAgIFJlZlB0cjxJ REJEYXRhYmFzZUJhY2tlbmRJbXBsPiBzZWxmKHRoaXMpOworICAgIG1fYmFja2luZ1N0b3JlLT5k ZWxldGVEYXRhYmFzZShtX21ldGFkYXRhLm5hbWUsIFtzZWxmLCBjYWxsYmFja3NdKGJvb2wgc3Vj Y2VzcykgeworICAgICAgICBBU1NFUlQoc2VsZi0+bV9kZWxldGVDYWxsYmFja3NXYWl0aW5nQ29t cGxldGlvbi5jb250YWlucyhjYWxsYmFja3MpKTsKKyAgICAgICAgc2VsZi0+bV9kZWxldGVDYWxs YmFja3NXYWl0aW5nQ29tcGxldGlvbi5yZW1vdmUoY2FsbGJhY2tzKTsKKworICAgICAgICAvLyBJ ZiB0aGlzIElEQkRhdGFiYXNlQmFja2VuZCB3YXMgY2xvc2VkIHdoaWxlIHdhaXRpbmcgZm9yIGRl bGV0ZURhdGFiYXNlIHRvIGNvbXBsZXRlLCBubyBwb2ludCBpbiBwZXJmb3JtaW5nIGFueSBjYWxs YmFja3MuCisgICAgICAgIGlmICghc2VsZi0+bV9iYWNraW5nU3RvcmUpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKKyAgICAgICAgICAgIHNlbGYtPm1fbWV0 YWRhdGEuaWQgPSBJbnZhbGlkSWQ7CisgICAgICAgICAgICBzZWxmLT5tX21ldGFkYXRhLnZlcnNp b24gPSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb247CisgICAgICAgICAgICBzZWxm LT5tX21ldGFkYXRhLm9iamVjdFN0b3Jlcy5jbGVhcigpOworICAgICAgICAgICAgY2FsbGJhY2tz LT5vblN1Y2Nlc3MoKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBjYWxsYmFja3MtPm9u RXJyb3IoSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElEQkRhdGFiYXNlRXhjZXB0aW9uOjpVbmtu b3duRXJyb3IsICJJbnRlcm5hbCBlcnJvciBkZWxldGluZyBkYXRhYmFzZS4iKSk7CisKKyAgICAg ICAgc2VsZi0+cHJvY2Vzc1BlbmRpbmdDYWxscygpOworICAgIH0pOwogfQogCiB2b2lkIElEQkRh dGFiYXNlQmFja2VuZEltcGw6OmNsb3NlKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+ IHBycENhbGxiYWNrcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlQmFja2VuZEltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZEltcGwuaAppbmRleCA2ZmJhOWY3Li5mOGNmMTA0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJh Y2tlbmRJbXBsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0 YWJhc2VCYWNrZW5kSW1wbC5oCkBAIC0xMTYsMTMgKzExNiwxMyBAQCBwcml2YXRlOgogICAgIHZv aWQgcHJvY2Vzc1BlbmRpbmdPcGVuQ2FsbHMoYm9vbCBzdWNjZXNzKTsKIAogICAgIGJvb2wgaXNE ZWxldGVEYXRhYmFzZUJsb2NrZWQoKTsKLSAgICB2b2lkIGRlbGV0ZURhdGFiYXNlRmluYWwoUGFz c1JlZlB0cjxJREJDYWxsYmFja3M+KTsKKyAgICB2b2lkIGRlbGV0ZURhdGFiYXNlQXN5bmMoUGFz c1JlZlB0cjxJREJDYWxsYmFja3M+KTsKIAogICAgIFJlZlB0cjxJREJCYWNraW5nU3RvcmVJbnRl cmZhY2U+IG1fYmFja2luZ1N0b3JlOwogICAgIElEQkRhdGFiYXNlTWV0YWRhdGEgbV9tZXRhZGF0 YTsKIAogICAgIFN0cmluZyBtX2lkZW50aWZpZXI7Ci0gICAgLy8gVGhpcyBtaWdodCBub3QgbmVl ZCB0byBiZSBhIFJlZlB0ciBzaW5jZSB0aGUgZmFjdG9yeSdzIGxpZmV0aW1lIGlzIHRoYXQgb2Yg dGhlIHBhZ2UgZ3JvdXAsIGJ1dCBpdCdzIGJldHRlciB0byBiZSBjb25zZXJ2aXRpdmUgdGhhbiBz b3JyeS4KKyAgICAvLyBUaGlzIG1pZ2h0IG5vdCBuZWVkIHRvIGJlIGEgUmVmUHRyIHNpbmNlIHRo ZSBmYWN0b3J5J3MgbGlmZXRpbWUgaXMgdGhhdCBvZiB0aGUgcGFnZSBncm91cCwgYnV0IGl0J3Mg YmV0dGVyIHRvIGJlIGNvbnNlcnZhdGl2ZSB0aGFuIHNvcnJ5LgogICAgIFJlZlB0cjxJREJGYWN0 b3J5QmFja2VuZEludGVyZmFjZT4gbV9mYWN0b3J5OwogCiAgICAgT3duUHRyPElEQlRyYW5zYWN0 aW9uQ29vcmRpbmF0b3I+IG1fdHJhbnNhY3Rpb25Db29yZGluYXRvcjsKQEAgLTEzNSw2ICsxMzUs NyBAQCBwcml2YXRlOgogICAgIE93blB0cjxJREJQZW5kaW5nT3BlbkNhbGw+IG1fcGVuZGluZ1Nl Y29uZEhhbGZPcGVuOwogCiAgICAgRGVxdWU8T3duUHRyPElEQlBlbmRpbmdEZWxldGVDYWxsPj4g bV9wZW5kaW5nRGVsZXRlQ2FsbHM7CisgICAgSGFzaFNldDxSZWZQdHI8SURCQ2FsbGJhY2tzPj4g bV9kZWxldGVDYWxsYmFja3NXYWl0aW5nQ29tcGxldGlvbjsKIAogICAgIHR5cGVkZWYgTGlzdEhh c2hTZXQ8UmVmUHRyPElEQkRhdGFiYXNlQ2FsbGJhY2tzPj4gRGF0YWJhc2VDYWxsYmFja3NTZXQ7 CiAgICAgRGF0YWJhc2VDYWxsYmFja3NTZXQgbV9kYXRhYmFzZUNhbGxiYWNrc1NldDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xldmVsZGIvSURCQmFja2lu Z1N0b3JlTGV2ZWxEQi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZXZl bGRiL0lEQkJhY2tpbmdTdG9yZUxldmVsREIuY3BwCmluZGV4IDgxZGY0ZmYuLmI5NWM1MzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xldmVsZGIvSURCQmFj a2luZ1N0b3JlTGV2ZWxEQi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvbGV2ZWxkYi9JREJCYWNraW5nU3RvcmVMZXZlbERCLmNwcApAQCAtNjYxLDcgKzY2MSw3IEBA IHN0YXRpYyB2b2lkIGRlbGV0ZVJhbmdlKExldmVsREJUcmFuc2FjdGlvbiogdHJhbnNhY3Rpb24s IGNvbnN0IFZlY3RvcjxjaGFyPiYgYmVnCiAgICAgICAgIHRyYW5zYWN0aW9uLT5yZW1vdmUoaXQt PmtleSgpKTsKIH0KIAotYm9vbCBJREJCYWNraW5nU3RvcmVMZXZlbERCOjpkZWxldGVEYXRhYmFz ZShjb25zdCBTdHJpbmcmIG5hbWUpCit2b2lkIElEQkJhY2tpbmdTdG9yZUxldmVsREI6OmRlbGV0 ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgbmFtZSwgQm9vbENhbGxiYWNrRnVuY3Rpb24gYm9vbENh bGxiYWNrRnVuY3Rpb24pCiB7CiAgICAgTE9HKFN0b3JhZ2VBUEksICJJREJCYWNraW5nU3RvcmVM ZXZlbERCOjpkZWxldGVEYXRhYmFzZSIpOwogICAgIE93blB0cjxMZXZlbERCV3JpdGVPbmx5VHJh bnNhY3Rpb24+IHRyYW5zYWN0aW9uID0gTGV2ZWxEQldyaXRlT25seVRyYW5zYWN0aW9uOjpjcmVh dGUobV9kYi5nZXQoKSk7CkBAIC02NjksMTAgKzY2OSwxNSBAQCBib29sIElEQkJhY2tpbmdTdG9y ZUxldmVsREI6OmRlbGV0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICBJREJEYXRh YmFzZU1ldGFkYXRhIG1ldGFkYXRhOwogICAgIGJvb2wgc3VjY2VzcyA9IGZhbHNlOwogICAgIGJv b2wgb2sgPSBnZXRJREJEYXRhYmFzZU1ldGFEYXRhKG5hbWUsICZtZXRhZGF0YSwgc3VjY2Vzcyk7 Ci0gICAgaWYgKCFvaykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghc3VjY2VzcykK LSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKCFvaykgeworICAgICAgICBib29sQ2FsbGJh Y2tGdW5jdGlvbihmYWxzZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoIXN1 Y2Nlc3MpIHsKKyAgICAgICAgYm9vbENhbGxiYWNrRnVuY3Rpb24odHJ1ZSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAKICAgICBjb25zdCBWZWN0b3I8Y2hhcj4gc3RhcnRLZXkgPSBEYXRhYmFz ZU1ldGFEYXRhS2V5OjplbmNvZGUobWV0YWRhdGEuaWQsIERhdGFiYXNlTWV0YURhdGFLZXk6Ok9y aWdpbk5hbWUpOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBzdG9wS2V5ID0gRGF0YWJhc2VNZXRh RGF0YUtleTo6ZW5jb2RlKG1ldGFkYXRhLmlkICsgMSwgRGF0YWJhc2VNZXRhRGF0YUtleTo6T3Jp Z2luTmFtZSk7CkBAIC02ODUsOSArNjkwLDEwIEBAIGJvb2wgSURCQmFja2luZ1N0b3JlTGV2ZWxE Qjo6ZGVsZXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBuYW1lKQogCiAgICAgaWYgKCF0cmFuc2Fj dGlvbi0+Y29tbWl0KCkpIHsKICAgICAgICAgSU5URVJOQUxfV1JJVEVfRVJST1IoRGVsZXRlRGF0 YWJhc2UpOwotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGJvb2xDYWxsYmFja0Z1bmN0 aW9uKGZhbHNlKTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICByZXR1cm4gdHJ1ZTsKKyAg ICBib29sQ2FsbGJhY2tGdW5jdGlvbih0cnVlKTsKIH0KIAogc3RhdGljIGJvb2wgY2hlY2tPYmpl Y3RTdG9yZUFuZE1ldGFEYXRhVHlwZShjb25zdCBMZXZlbERCSXRlcmF0b3IqIGl0LCBjb25zdCBW ZWN0b3I8Y2hhcj4mIHN0b3BLZXksIGludDY0X3Qgb2JqZWN0U3RvcmVJZCwgaW50NjRfdCBtZXRh RGF0YVR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9s ZXZlbGRiL0lEQkJhY2tpbmdTdG9yZUxldmVsREIuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2xldmVsZGIvSURCQmFja2luZ1N0b3JlTGV2ZWxEQi5oCmluZGV4IGYxMzBiYzAu LmU3ODY1ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xl dmVsZGIvSURCQmFja2luZ1N0b3JlTGV2ZWxEQi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL2xldmVsZGIvSURCQmFja2luZ1N0b3JlTGV2ZWxEQi5oCkBAIC03MSwxMCAr NzEsMTIgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBWZWN0b3I8U3RyaW5nPiBnZXREYXRhYmFz ZU5hbWVzKCk7CiAKKyAgICAvLyBOZXctc3R5bGUgYXN5bmNocm9ub3VzIGNhbGxiYWNrcwogICAg IHZpcnR1YWwgdm9pZCBnZXRPckVzdGFibGlzaElEQkRhdGFiYXNlTWV0YWRhdGEoY29uc3QgU3Ry aW5nJiBuYW1lLCBHZXRJREJEYXRhYmFzZU1ldGFkYXRhRnVuY3Rpb24pIE9WRVJSSURFOworICAg IHZpcnR1YWwgdm9pZCBkZWxldGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIG5hbWUsIEJvb2xDYWxs YmFja0Z1bmN0aW9uKSBPVkVSUklERTsKIAorICAgIC8vIE9sZC1zdHlsZSBzeW5jaHJvbm91cyBj YWxsYmFja3MKICAgICB2aXJ0dWFsIGJvb2wgdXBkYXRlSURCRGF0YWJhc2VWZXJzaW9uKElEQkJh Y2tpbmdTdG9yZUludGVyZmFjZTo6VHJhbnNhY3Rpb24mLCBpbnQ2NF90IHJvd0lkLCB1aW50NjRf dCB2ZXJzaW9uKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlRGF0YWJhc2UoY29u c3QgU3RyaW5nJiBuYW1lKSBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgYm9vbCBjcmVhdGVPYmpl Y3RTdG9yZShJREJCYWNraW5nU3RvcmVJbnRlcmZhY2U6OlRyYW5zYWN0aW9uJiwgaW50NjRfdCBk YXRhYmFzZUlkLCBpbnQ2NF90IG9iamVjdFN0b3JlSWQsIGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgSURCS2V5UGF0aCYsIGJvb2wgYXV0b0luY3JlbWVudCkgT1ZFUlJJREU7CiAgICAgdmlydHVh bCBib29sIGRlbGV0ZU9iamVjdFN0b3JlKElEQkJhY2tpbmdTdG9yZUludGVyZmFjZTo6VHJhbnNh Y3Rpb24mLCBpbnQ2NF90IGRhdGFiYXNlSWQsIGludDY0X3Qgb2JqZWN0U3RvcmVJZCkgT1ZFUlJJ REUgV0FSTl9VTlVTRURfUkVUVVJOOwo=