99636 2012-10-17 13:55:59 -0700 IndexedDB: Destroy leveldb directory if unknown schema is detected 2012-10-29 12:19:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100692 1 dgrogan dgrogan alecflett jsbell tony webkit.review.bot oldest_to_newest 744583 0 dgrogan 2012-10-17 13:55:59 -0700 IndexedDB: Destroy leveldb directory if unknown schema is detected 744589 1 169255 dgrogan 2012-10-17 13:59:31 -0700 Created attachment 169255 Patch 744593 2 169257 dgrogan 2012-10-17 14:02:32 -0700 Created attachment 169257 Patch 744598 3 dgrogan 2012-10-17 14:04:13 -0700 jsbell/alecflett, could you take a look at this? The webcore patch is small and simple; the test in chromium is huge and messy. 744606 4 169257 jsbell 2012-10-17 14:14:39 -0700 Comment on attachment 169257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169257&action=review overall lgtm, w/ nits > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:149 > +static const int64_t latestSchemaVersion = 1; static qualifier not necessary for consts. > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:150 > +static bool isSchemaOnDiskUnknown(LevelDBDatabase* db) Is "OnDisk" necessary? We'll only use it in the on-disk path, but I don't think it is needed in the function name. Also, I think readability would be improved if the semantics were flipped, i.e. true = known, false = unknown. So maybe isSchemaKnown() ? 744613 5 169257 dgrogan 2012-10-17 14:23:44 -0700 Comment on attachment 169257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169257&action=review >> Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:149 >> +static const int64_t latestSchemaVersion = 1; > > static qualifier not necessary for consts. Removed. >> Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:150 >> +static bool isSchemaOnDiskUnknown(LevelDBDatabase* db) > > Is "OnDisk" necessary? We'll only use it in the on-disk path, but I don't think it is needed in the function name. > > Also, I think readability would be improved if the semantics were flipped, i.e. true = known, false = unknown. So maybe isSchemaKnown() ? Changed. 744615 6 169260 dgrogan 2012-10-17 14:25:46 -0700 Created attachment 169260 Patch 744616 7 dgrogan 2012-10-17 14:27:04 -0700 Tony, could you review this? 744628 8 169260 tony 2012-10-17 14:38:09 -0700 Comment on attachment 169260 Patch Is it possible to write a test in webkit_unit_tests for this? 744756 9 dgrogan 2012-10-17 16:22:35 -0700 (In reply to comment #8) > (From update of attachment 169260 [details]) > Is it possible to write a test in webkit_unit_tests for this? It would be possible, but even more work than the content_shell test. 744806 10 169260 webkit.review.bot 2012-10-17 17:02:29 -0700 Comment on attachment 169260 Patch Clearing flags on attachment: 169260 Committed r131672: <http://trac.webkit.org/changeset/131672> 744807 11 webkit.review.bot 2012-10-17 17:02:34 -0700 All reviewed patches have been landed. Closing bug. 169255 2012-10-17 13:59:31 -0700 2012-10-17 14:02:30 -0700 Patch bug-99636-20121017135818.patch text/plain 3037 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWU3NTExN2NkMzEzYWQy YWIxMjYwMTY1ODFjZGRjOGExYjI3ZjMzMi4uMTZhOWVjMDA1NWU4YTY4YzAyMTY4OWI0NDQ1ZDJm NTU0OGIxZDBkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEwLTE3ICBEYXZp ZCBHcm9nYW4gIDxkZ3JvZ2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IERl c3Ryb3kgbGV2ZWxkYiBkaXJlY3RvcnkgaWYgdW5rbm93biBzY2hlbWEgaXMgZGV0ZWN0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2hyb21pdW0gYnJv d3NlciB0ZXN0IGluIHByb2dyZXNzIGF0CisgICAgICAgIGh0dHBzOi8vY29kZXJldmlldy5jaHJv bWl1bS5vcmcvMTExOTYwMjkKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVs REJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl Ojppc1NjaGVtYU9uRGlza1Vua25vd24pOgorICAgICAgICAoV2ViQ29yZTo6c2V0VXBNZXRhZGF0 YSk6CisgICAgICAgIChXZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpvcGVuKToKKwog MjAxMi0xMC0xNiAgTm9hbSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAK ICAgICAgICAgW1F0XSBSRUdSRVNTSU9OKHIxMzE0ODUpOiBJdCBicm9rZSB0aGUgYnVpbGQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNr aW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxE QkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggNjIyMDllNjBiODhjZGNmNjU5NWVhMTUzMGQ5ZmJhNDM1 MWRlOWUyNC4uZmMzZTdiZThjZDhlNmFjMmU5YmY3ZmI2MmYxMTE4OGJhZTBmZmUwNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdT dG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxE QkJhY2tpbmdTdG9yZS5jcHAKQEAgLTE0Niw5ICsxNDYsMTggQEAgcHVibGljOgogICAgIHZpcnR1 YWwgY29uc3QgY2hhciogbmFtZSgpIGNvbnN0IHsgcmV0dXJuICJpZGJfY21wMSI7IH0KIH07CiAK K3N0YXRpYyBjb25zdCBpbnQ2NF90IGxhdGVzdFNjaGVtYVZlcnNpb24gPSAxOworc3RhdGljIGJv b2wgaXNTY2hlbWFPbkRpc2tVbmtub3duKExldmVsREJEYXRhYmFzZSogZGIpCit7CisgICAgaW50 NjRfdCBzY2hlbWFWZXJzaW9uID0gMDsKKyAgICBjb25zdCBWZWN0b3I8Y2hhcj4gbWV0YURhdGFL ZXkgPSBTY2hlbWFWZXJzaW9uS2V5OjplbmNvZGUoKTsKKyAgICBpZiAoIWdldEludChkYiwgbWV0 YURhdGFLZXksIHNjaGVtYVZlcnNpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0 dXJuIHNjaGVtYVZlcnNpb24gPiBsYXRlc3RTY2hlbWFWZXJzaW9uOworfQorCiBzdGF0aWMgYm9v bCBzZXRVcE1ldGFkYXRhKExldmVsREJEYXRhYmFzZSogZGIsIGNvbnN0IFN0cmluZyYgb3JpZ2lu KQogewotICAgIGNvbnN0IGludDY0X3QgbGF0ZXN0U2NoZW1hVmVyc2lvbiA9IDE7CiAgICAgY29u c3QgVmVjdG9yPGNoYXI+IG1ldGFEYXRhS2V5ID0gU2NoZW1hVmVyc2lvbktleTo6ZW5jb2RlKCk7 CiAKICAgICBpbnQ2NF90IHNjaGVtYVZlcnNpb24gPSAwOwpAQCAtMTU3LDYgKzE2Niw3IEBAIHN0 YXRpYyBib29sIHNldFVwTWV0YWRhdGEoTGV2ZWxEQkRhdGFiYXNlKiBkYiwgY29uc3QgU3RyaW5n JiBvcmlnaW4pCiAgICAgICAgIGlmICghcHV0SW50KGRiLCBtZXRhRGF0YUtleSwgbGF0ZXN0U2No ZW1hVmVyc2lvbikpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfSBlbHNlIHsKKyAg ICAgICAgQVNTRVJUKHNjaGVtYVZlcnNpb24gPD0gbGF0ZXN0U2NoZW1hVmVyc2lvbik7CiAgICAg ICAgIGlmICghc2NoZW1hVmVyc2lvbikgewogICAgICAgICAgICAgc2NoZW1hVmVyc2lvbiA9IGxh dGVzdFNjaGVtYVZlcnNpb247CiAgICAgICAgICAgICBSZWZQdHI8TGV2ZWxEQlRyYW5zYWN0aW9u PiB0cmFuc2FjdGlvbiA9IExldmVsREJUcmFuc2FjdGlvbjo6Y3JlYXRlKGRiKTsKQEAgLTI0OCw4 ICsyNTgsMTEgQEAgUGFzc1JlZlB0cjxJREJCYWNraW5nU3RvcmU+IElEQkxldmVsREJCYWNraW5n U3RvcmU6Om9wZW4oU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXQKICAgICAgICAgU3RyaW5nIHBhdGgg PSBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQocGF0aEJhc2UsIHNlY3VyaXR5T3JpZ2luLT5kYXRh YmFzZUlkZW50aWZpZXIoKSArICIuaW5kZXhlZGRiLmxldmVsZGIiKTsKIAogICAgICAgICBkYiA9 IExldmVsREJEYXRhYmFzZTo6b3BlbihwYXRoLCBjb21wYXJhdG9yLmdldCgpKTsKKyAgICAgICAg Ym9vbCB1bmtub3duU2NoZW1hID0gaXNTY2hlbWFPbkRpc2tVbmtub3duKGRiLmdldCgpKTsKKyAg ICAgICAgaWYgKHVua25vd25TY2hlbWEpCisgICAgICAgICAgICBMT0dfRVJST1IoIkluZGV4ZWRE QiBiYWNraW5nIHN0b3JlIGhhZCB1bmtub3duIHNjaGVtYSwgdHJlYXRpbmcgaXQgYXMgZmFpbHVy ZSB0byBvcGVuIik7CiAKLSAgICAgICAgaWYgKCFkYikgeworICAgICAgICBpZiAoIWRiIHx8IHVu a25vd25TY2hlbWEpIHsKICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhlZERCIGJhY2tpbmcg c3RvcmUgb3BlbiBmYWlsZWQsIGF0dGVtcHRpbmcgY2xlYW51cCIpOwogICAgICAgICAgICAgYm9v bCBzdWNjZXNzID0gTGV2ZWxEQkRhdGFiYXNlOjpkZXN0cm95KHBhdGgpOwogICAgICAgICAgICAg aWYgKCFzdWNjZXNzKSB7Cg== 169257 2012-10-17 14:02:32 -0700 2012-10-17 14:25:44 -0700 Patch bug-99636-20121017140119.patch text/plain 3197 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWU3NTExN2NkMzEzYWQy YWIxMjYwMTY1ODFjZGRjOGExYjI3ZjMzMi4uYzlhZDMyZjU0MGMyZDllM2Q4ZGEwZjIwNjYzNDA2 MDRmODM0ZmIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTE3ICBEYXZp ZCBHcm9nYW4gIDxkZ3JvZ2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IERl c3Ryb3kgbGV2ZWxkYiBkaXJlY3RvcnkgaWYgdW5rbm93biBzY2hlbWEgaXMgZGV0ZWN0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2hyb21pdW0gYnJv d3NlciB0ZXN0IGluIHByb2dyZXNzIGF0CisgICAgICAgIGh0dHBzOi8vY29kZXJldmlldy5jaHJv bWl1bS5vcmcvMTExOTYwMjkKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVs REJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl Ojppc1NjaGVtYU9uRGlza1Vua25vd24pOgorICAgICAgICBSZXR1cm4gZmFsc2Ugd2hlbiB0aGUg c2NoZW1hIGtleSBkb2Vzbid0IGV4aXN0IGJlY2F1c2UgbmV3IGRhdGFiYXNlcworICAgICAgICB3 b24ndCBoYXZlIG9uZS4KKworICAgICAgICAoV2ViQ29yZTo6c2V0VXBNZXRhZGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpvcGVuKToKKyAgICAgICAgUGln Z3ktYmFjayBvbiBleGlzdGluZyBsZXZlbGRiOjpkZXN0cm95IGNvZGUuCisKIDIwMTItMTAtMTYg IE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gUkVHUkVTU0lPTihyMTMxNDg1KTogSXQgYnJva2UgdGhlIGJ1aWxkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3Rv cmUuY3BwCmluZGV4IDYyMjA5ZTYwYjg4Y2RjZjY1OTVlYTE1MzBkOWZiYTQzNTFkZTllMjQuLmZj M2U3YmU4Y2Q4ZTZhYzJlOWJmN2ZiNjJmMTExODhiYWUwZmZlMDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3Rv cmUuY3BwCkBAIC0xNDYsOSArMTQ2LDE4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGNvbnN0IGNo YXIqIG5hbWUoKSBjb25zdCB7IHJldHVybiAiaWRiX2NtcDEiOyB9CiB9OwogCitzdGF0aWMgY29u c3QgaW50NjRfdCBsYXRlc3RTY2hlbWFWZXJzaW9uID0gMTsKK3N0YXRpYyBib29sIGlzU2NoZW1h T25EaXNrVW5rbm93bihMZXZlbERCRGF0YWJhc2UqIGRiKQoreworICAgIGludDY0X3Qgc2NoZW1h VmVyc2lvbiA9IDA7CisgICAgY29uc3QgVmVjdG9yPGNoYXI+IG1ldGFEYXRhS2V5ID0gU2NoZW1h VmVyc2lvbktleTo6ZW5jb2RlKCk7CisgICAgaWYgKCFnZXRJbnQoZGIsIG1ldGFEYXRhS2V5LCBz Y2hlbWFWZXJzaW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBzY2hlbWFW ZXJzaW9uID4gbGF0ZXN0U2NoZW1hVmVyc2lvbjsKK30KKwogc3RhdGljIGJvb2wgc2V0VXBNZXRh ZGF0YShMZXZlbERCRGF0YWJhc2UqIGRiLCBjb25zdCBTdHJpbmcmIG9yaWdpbikKIHsKLSAgICBj b25zdCBpbnQ2NF90IGxhdGVzdFNjaGVtYVZlcnNpb24gPSAxOwogICAgIGNvbnN0IFZlY3Rvcjxj aGFyPiBtZXRhRGF0YUtleSA9IFNjaGVtYVZlcnNpb25LZXk6OmVuY29kZSgpOwogCiAgICAgaW50 NjRfdCBzY2hlbWFWZXJzaW9uID0gMDsKQEAgLTE1Nyw2ICsxNjYsNyBAQCBzdGF0aWMgYm9vbCBz ZXRVcE1ldGFkYXRhKExldmVsREJEYXRhYmFzZSogZGIsIGNvbnN0IFN0cmluZyYgb3JpZ2luKQog ICAgICAgICBpZiAoIXB1dEludChkYiwgbWV0YURhdGFLZXksIGxhdGVzdFNjaGVtYVZlcnNpb24p KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0gZWxzZSB7CisgICAgICAgIEFTU0VS VChzY2hlbWFWZXJzaW9uIDw9IGxhdGVzdFNjaGVtYVZlcnNpb24pOwogICAgICAgICBpZiAoIXNj aGVtYVZlcnNpb24pIHsKICAgICAgICAgICAgIHNjaGVtYVZlcnNpb24gPSBsYXRlc3RTY2hlbWFW ZXJzaW9uOwogICAgICAgICAgICAgUmVmUHRyPExldmVsREJUcmFuc2FjdGlvbj4gdHJhbnNhY3Rp b24gPSBMZXZlbERCVHJhbnNhY3Rpb246OmNyZWF0ZShkYik7CkBAIC0yNDgsOCArMjU4LDExIEBA IFBhc3NSZWZQdHI8SURCQmFja2luZ1N0b3JlPiBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpvcGVu KFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0CiAgICAgICAgIFN0cmluZyBwYXRoID0gcGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KHBhdGhCYXNlLCBzZWN1cml0eU9yaWdpbi0+ZGF0YWJhc2VJZGVudGlm aWVyKCkgKyAiLmluZGV4ZWRkYi5sZXZlbGRiIik7CiAKICAgICAgICAgZGIgPSBMZXZlbERCRGF0 YWJhc2U6Om9wZW4ocGF0aCwgY29tcGFyYXRvci5nZXQoKSk7CisgICAgICAgIGJvb2wgdW5rbm93 blNjaGVtYSA9IGlzU2NoZW1hT25EaXNrVW5rbm93bihkYi5nZXQoKSk7CisgICAgICAgIGlmICh1 bmtub3duU2NoZW1hKQorICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGVkREIgYmFja2luZyBz dG9yZSBoYWQgdW5rbm93biBzY2hlbWEsIHRyZWF0aW5nIGl0IGFzIGZhaWx1cmUgdG8gb3BlbiIp OwogCi0gICAgICAgIGlmICghZGIpIHsKKyAgICAgICAgaWYgKCFkYiB8fCB1bmtub3duU2NoZW1h KSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIkluZGV4ZWREQiBiYWNraW5nIHN0b3JlIG9wZW4g ZmFpbGVkLCBhdHRlbXB0aW5nIGNsZWFudXAiKTsKICAgICAgICAgICAgIGJvb2wgc3VjY2VzcyA9 IExldmVsREJEYXRhYmFzZTo6ZGVzdHJveShwYXRoKTsKICAgICAgICAgICAgIGlmICghc3VjY2Vz cykgewo= 169260 2012-10-17 14:25:46 -0700 2012-10-17 17:02:29 -0700 Patch bug-99636-20121017142433.patch text/plain 3161 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWU3NTExN2NkMzEzYWQy YWIxMjYwMTY1ODFjZGRjOGExYjI3ZjMzMi4uN2NjNDFiM2EyMGM1NDQ2NzNlZjQzZmEyN2JiNzlm OWEyY2ExMjIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTE3ICBEYXZp ZCBHcm9nYW4gIDxkZ3JvZ2FuQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbmRleGVkREI6IERl c3Ryb3kgbGV2ZWxkYiBkaXJlY3RvcnkgaWYgdW5rbm93biBzY2hlbWEgaXMgZGV0ZWN0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NjM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY2hyb21pdW0gYnJv d3NlciB0ZXN0IGluIHByb2dyZXNzIGF0CisgICAgICAgIGh0dHBzOi8vY29kZXJldmlldy5jaHJv bWl1bS5vcmcvMTExOTYwMjkKKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVs REJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl Ojppc1NjaGVtYUtub3duKToKKyAgICAgICAgUmV0dXJuIHRydWUgd2hlbiB0aGUgc2NoZW1hIGtl eSBkb2Vzbid0IGV4aXN0IGJlY2F1c2UgbmV3IGRhdGFiYXNlcworICAgICAgICB3b24ndCBoYXZl IG9uZS4KKworICAgICAgICAoV2ViQ29yZTo6c2V0VXBNZXRhZGF0YSk6CisgICAgICAgIChXZWJD b3JlOjpJREJMZXZlbERCQmFja2luZ1N0b3JlOjpvcGVuKToKKyAgICAgICAgUGlnZ3ktYmFjayBv biBleGlzdGluZyBsZXZlbGRiOjpkZXN0cm95IGNvZGUuCisKIDIwMTItMTAtMTYgIE5vYW0gUm9z ZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF0gUkVHUkVT U0lPTihyMTMxNDg1KTogSXQgYnJva2UgdGhlIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCmlu ZGV4IDYyMjA5ZTYwYjg4Y2RjZjY1OTVlYTE1MzBkOWZiYTQzNTFkZTllMjQuLmQ2ZmJiNjc2N2Q1 NWZkOGE1MWNkMTY4ZTcwMDA2OWQ1NjY2MmQ5OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwCkBA IC0xNDYsOSArMTQ2LDE4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIG5hbWUo KSBjb25zdCB7IHJldHVybiAiaWRiX2NtcDEiOyB9CiB9OwogCitjb25zdCBpbnQ2NF90IGxhdGVz dFNjaGVtYVZlcnNpb24gPSAxOworc3RhdGljIGJvb2wgaXNTY2hlbWFLbm93bihMZXZlbERCRGF0 YWJhc2UqIGRiKQoreworICAgIGludDY0X3Qgc2NoZW1hVmVyc2lvbiA9IDA7CisgICAgY29uc3Qg VmVjdG9yPGNoYXI+IG1ldGFEYXRhS2V5ID0gU2NoZW1hVmVyc2lvbktleTo6ZW5jb2RlKCk7Cisg ICAgaWYgKCFnZXRJbnQoZGIsIG1ldGFEYXRhS2V5LCBzY2hlbWFWZXJzaW9uKSkKKyAgICAgICAg cmV0dXJuIHRydWU7CisgICAgcmV0dXJuIHNjaGVtYVZlcnNpb24gPD0gbGF0ZXN0U2NoZW1hVmVy c2lvbjsKK30KKwogc3RhdGljIGJvb2wgc2V0VXBNZXRhZGF0YShMZXZlbERCRGF0YWJhc2UqIGRi LCBjb25zdCBTdHJpbmcmIG9yaWdpbikKIHsKLSAgICBjb25zdCBpbnQ2NF90IGxhdGVzdFNjaGVt YVZlcnNpb24gPSAxOwogICAgIGNvbnN0IFZlY3RvcjxjaGFyPiBtZXRhRGF0YUtleSA9IFNjaGVt YVZlcnNpb25LZXk6OmVuY29kZSgpOwogCiAgICAgaW50NjRfdCBzY2hlbWFWZXJzaW9uID0gMDsK QEAgLTE1Nyw2ICsxNjYsNyBAQCBzdGF0aWMgYm9vbCBzZXRVcE1ldGFkYXRhKExldmVsREJEYXRh YmFzZSogZGIsIGNvbnN0IFN0cmluZyYgb3JpZ2luKQogICAgICAgICBpZiAoIXB1dEludChkYiwg bWV0YURhdGFLZXksIGxhdGVzdFNjaGVtYVZlcnNpb24pKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0gZWxzZSB7CisgICAgICAgIEFTU0VSVChzY2hlbWFWZXJzaW9uIDw9IGxhdGVz dFNjaGVtYVZlcnNpb24pOwogICAgICAgICBpZiAoIXNjaGVtYVZlcnNpb24pIHsKICAgICAgICAg ICAgIHNjaGVtYVZlcnNpb24gPSBsYXRlc3RTY2hlbWFWZXJzaW9uOwogICAgICAgICAgICAgUmVm UHRyPExldmVsREJUcmFuc2FjdGlvbj4gdHJhbnNhY3Rpb24gPSBMZXZlbERCVHJhbnNhY3Rpb246 OmNyZWF0ZShkYik7CkBAIC0yNDgsOCArMjU4LDExIEBAIFBhc3NSZWZQdHI8SURCQmFja2luZ1N0 b3JlPiBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpvcGVuKFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0 CiAgICAgICAgIFN0cmluZyBwYXRoID0gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHBhdGhCYXNl LCBzZWN1cml0eU9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkgKyAiLmluZGV4ZWRkYi5sZXZl bGRiIik7CiAKICAgICAgICAgZGIgPSBMZXZlbERCRGF0YWJhc2U6Om9wZW4ocGF0aCwgY29tcGFy YXRvci5nZXQoKSk7CisgICAgICAgIGJvb2wga25vd25TY2hlbWEgPSBpc1NjaGVtYUtub3duKGRi LmdldCgpKTsKKyAgICAgICAgaWYgKCFrbm93blNjaGVtYSkKKyAgICAgICAgICAgIExPR19FUlJP UigiSW5kZXhlZERCIGJhY2tpbmcgc3RvcmUgaGFkIHVua25vd24gc2NoZW1hLCB0cmVhdGluZyBp dCBhcyBmYWlsdXJlIHRvIG9wZW4iKTsKIAotICAgICAgICBpZiAoIWRiKSB7CisgICAgICAgIGlm ICghZGIgfHwgIWtub3duU2NoZW1hKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIkluZGV4ZWRE QiBiYWNraW5nIHN0b3JlIG9wZW4gZmFpbGVkLCBhdHRlbXB0aW5nIGNsZWFudXAiKTsKICAgICAg ICAgICAgIGJvb2wgc3VjY2VzcyA9IExldmVsREJEYXRhYmFzZTo6ZGVzdHJveShwYXRoKTsKICAg ICAgICAgICAgIGlmICghc3VjY2Vzcykgewo=