100692 2012-10-29 12:09:42 -0700 IndexedDB: Crash on checking version of corrupt backing store 2012-11-06 15:14:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99636 1 jsbell jsbell alecflett dgrogan tony webkit.review.bot oldest_to_newest 753661 0 jsbell 2012-10-29 12:09:42 -0700 IndexedDB: Crash on checking version of corrupt backing store 753664 1 171288 jsbell 2012-10-29 12:11:28 -0700 Created attachment 171288 Patch 753665 2 jsbell 2012-10-29 12:12:10 -0700 alecflett@ - please take a look 753672 3 jsbell 2012-10-29 12:19:53 -0700 See comments in webkit.org/b/99636 re: testing The in-progress tests in crrev.com/11196029 should be expanded to include this case. 753675 4 171292 jsbell 2012-10-29 12:21:58 -0700 Created attachment 171292 Patch 753717 5 171292 alecflett 2012-10-29 13:41:13 -0700 Comment on attachment 171292 Patch LGTM 753718 6 jsbell 2012-10-29 13:41:40 -0700 tony@ - r? cq? 753727 7 171292 tony 2012-10-29 13:51:40 -0700 Comment on attachment 171292 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171292&action=review > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:299 > + if (db) { > + if (!isSchemaKnown(db.get())) { Nit: Can we merge these into a single if? 753737 8 171308 jsbell 2012-10-29 14:00:09 -0700 Created attachment 171308 Patch for landing 753738 9 jsbell 2012-10-29 14:00:29 -0700 (In reply to comment #7) > Nit: Can we merge these into a single if? Done, thanks. 753754 10 171308 webkit.review.bot 2012-10-29 14:20:32 -0700 Comment on attachment 171308 Patch for landing Clearing flags on attachment: 171308 Committed r132848: <http://trac.webkit.org/changeset/132848> 753755 11 webkit.review.bot 2012-10-29 14:20:35 -0700 All reviewed patches have been landed. Closing bug. 760093 12 171308 dgrogan 2012-11-06 15:07:06 -0800 Comment on attachment 171308 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=171308&action=review > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:301 > + db.release(); Is there a reason that this is db.release() instead of db.clear()? AFAICT they would act identically here, just wondering if [release() was arbitrary] or [a conscious choice and I'm missing something]. 760098 13 jsbell 2012-11-06 15:14:48 -0800 (In reply to comment #12) > (From update of attachment 171308 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171308&action=review > > > Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp:301 > > + db.release(); > > Is there a reason that this is db.release() instead of db.clear()? AFAICT they would act identically here, just wondering if [release() was arbitrary] or [a conscious choice and I'm missing something]. Not a conscious choice. I agree it should be clear(). (I noticed that later and have that change in a branch somewhere, apparently not uploaded anywhere.) 171288 2012-10-29 12:11:28 -0700 2012-10-29 12:21:57 -0700 Patch bug-100692-20121029120954.patch text/plain 2774 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdkZWRlOTdkNjg4Yjc1 YTM0MDdlMDIwYWZiOGNlZDYxNGI4YmMzMS4uMWU5ZWRlZTcyM2E5MmE0NjkxNjk0ZWI2MDVmNGYx YWVkZWE5ZWE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEwLTI5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBDcmFz aCBvbiBjaGVja2luZyB2ZXJzaW9uIG9mIGNvcnJ1cHQgYmFja2luZyBzdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjkyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIGJhY2tpbmcgc3Rv cmUgZmFpbHMgdG8gb3BlbiAoZHVlIHRvIGNvcnJ1cHRpb24sIG5vbi13cml0ZWFibGUgZGlzaywg ZXRjKQorICAgICAgICB0aGUgc3Vic2VxdWVudCBzY2hlbWEgdmVyc2lvbiBjaGVjayBkZXJlZmVy ZW5jZXMgYSBudWxsIHBvaW50ZXIuIEZpeCB0byBvbmx5CisgICAgICAgIGRvIHRoZSBzY2hlbWEg Y2hlY2sgaWYgdGhlIGRhdGFiYXNlIG9wZW5lZC4KKworICAgICAgICBUZXN0cyB3aWxsIGJlIGRv bmUgb24gdGhlIENocm9taXVtIHNpZGUuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9J REJMZXZlbERCQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkxldmVsREJC YWNraW5nU3RvcmU6Om9wZW4pOgorCiAyMDEyLTEwLTI5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxv c3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBUZXh0IHdpdGggemVybyBmb250IHNpemUg cmVuZGVycyBhcyBYIHB4IHNvbWV0aW1lcywgY2F1c2luZyBmYXN0L3RleHQvemVyby1mb250LXNp emUtMi5odG1sIHRvIGZhaWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKaW5kZXggMzVmNWZmYjE5MmUw ZjcyNzAzYjJiNjUzNGMyM2QzODM3YjI0MGYxNS4uZjIyYjEyYTBhN2YxMzJmNDNiODRmM2NjYWJj Y2Y0MDQ0NjMzZTA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKQEAgLTI5NSwxMyArMjk1LDE1 IEBAIFBhc3NSZWZQdHI8SURCQmFja2luZ1N0b3JlPiBJREJMZXZlbERCQmFja2luZ1N0b3JlOjpv cGVuKFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0CiAgICAgICAgIFN0cmluZyBwYXRoID0gcGF0aEJ5 QXBwZW5kaW5nQ29tcG9uZW50KHBhdGhCYXNlLCBzZWN1cml0eU9yaWdpbi0+ZGF0YWJhc2VJZGVu dGlmaWVyKCkgKyAiLmluZGV4ZWRkYi5sZXZlbGRiIik7CiAKICAgICAgICAgZGIgPSBMZXZlbERC RGF0YWJhc2U6Om9wZW4ocGF0aCwgY29tcGFyYXRvci5nZXQoKSk7Ci0gICAgICAgIGJvb2wga25v d25TY2hlbWEgPSBpc1NjaGVtYUtub3duKGRiLmdldCgpKTsKLSAgICAgICAgaWYgKCFrbm93blNj aGVtYSkgewotICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGVkREIgYmFja2luZyBzdG9yZSBo YWQgdW5rbm93biBzY2hlbWEsIHRyZWF0aW5nIGl0IGFzIGZhaWx1cmUgdG8gb3BlbiIpOwotICAg ICAgICAgICAgSGlzdG9ncmFtU3VwcG9ydDo6aGlzdG9ncmFtRW51bWVyYXRpb24oIldlYkNvcmUu SW5kZXhlZERCLkJhY2tpbmdTdG9yZS5PcGVuU3RhdHVzIiwgSURCTGV2ZWxEQkJhY2tpbmdTdG9y ZU9wZW5GYWlsZWRVbmtub3duU2NoZW1hLCBJREJMZXZlbERCQmFja2luZ1N0b3JlT3Blbk1heCk7 CisgICAgICAgIGlmIChkYikgeworICAgICAgICAgICAgaWYgKCFpc1NjaGVtYUtub3duKGRiLmdl dCgpKSkgeworICAgICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhlZERCIGJhY2tpbmcgc3Rv cmUgaGFkIHVua25vd24gc2NoZW1hLCB0cmVhdGluZyBpdCBhcyBmYWlsdXJlIHRvIG9wZW4iKTsK KyAgICAgICAgICAgICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbigi V2ViQ29yZS5JbmRleGVkREIuQmFja2luZ1N0b3JlLk9wZW5TdGF0dXMiLCBJREJMZXZlbERCQmFj a2luZ1N0b3JlT3BlbkZhaWxlZFVua25vd25TY2hlbWEsIElEQkxldmVsREJCYWNraW5nU3RvcmVP cGVuTWF4KTsKKyAgICAgICAgICAgICAgICBkYi5yZWxlYXNlKCk7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAoZGIgJiYga25vd25TY2hlbWEpCisgICAgICAgIGlmIChk YikKICAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUVudW1lcmF0aW9uKCJX ZWJDb3JlLkluZGV4ZWREQi5CYWNraW5nU3RvcmUuT3BlblN0YXR1cyIsIElEQkxldmVsREJCYWNr aW5nU3RvcmVPcGVuU3VjY2VzcywgSURCTGV2ZWxEQkJhY2tpbmdTdG9yZU9wZW5NYXgpOwogICAg ICAgICBlbHNlIHsKICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhlZERCIGJhY2tpbmcgc3Rv cmUgb3BlbiBmYWlsZWQsIGF0dGVtcHRpbmcgY2xlYW51cCIpOwo= 171292 2012-10-29 12:21:58 -0700 2012-10-29 14:00:07 -0700 Patch bug-100692-20121029122025.patch text/plain 2789 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdkZWRlOTdkNjg4Yjc1 YTM0MDdlMDIwYWZiOGNlZDYxNGI4YmMzMS4uODk3MjdjNTM2NmVjZTU1NjVhNTgxMmRlMWRlODVk YTg1NzJmYzg1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEwLTI5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBDcmFz aCBvbiBjaGVja2luZyB2ZXJzaW9uIG9mIGNvcnJ1cHQgYmFja2luZyBzdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjkyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIGJhY2tpbmcgc3Rv cmUgZmFpbHMgdG8gb3BlbiAoZHVlIHRvIGNvcnJ1cHRpb24sIG5vbi13cml0ZWFibGUgZGlzaywg ZXRjKQorICAgICAgICB0aGUgc3Vic2VxdWVudCBzY2hlbWEgdmVyc2lvbiBjaGVjayBkZXJlZmVy ZW5jZXMgYSBudWxsIHBvaW50ZXIuIEZpeCB0byBvbmx5CisgICAgICAgIGRvIHRoZSBzY2hlbWEg Y2hlY2sgaWYgdGhlIGRhdGFiYXNlIG9wZW5lZC4KKworICAgICAgICBDaHJvbWl1bSB0ZXN0cyB3 aWxsIGJlIGluY2x1ZGVkIHdpdGggY3JyZXYuY29tLzExMTk2MDI5CisKKyAgICAgICAgKiBNb2R1 bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OklEQkxldmVsREJCYWNraW5nU3RvcmU6Om9wZW4pOgorCiAyMDEyLTEwLTI5ICBDc2FiYSBP c3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBUZXh0IHdpdGgg emVybyBmb250IHNpemUgcmVuZGVycyBhcyBYIHB4IHNvbWV0aW1lcywgY2F1c2luZyBmYXN0L3Rl eHQvemVyby1mb250LXNpemUtMi5odG1sIHRvIGZhaWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKaW5k ZXggMzVmNWZmYjE5MmUwZjcyNzAzYjJiNjUzNGMyM2QzODM3YjI0MGYxNS4uZjIyYjEyYTBhN2Yx MzJmNDNiODRmM2NjYWJjY2Y0MDQ0NjMzZTA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAKQEAg LTI5NSwxMyArMjk1LDE1IEBAIFBhc3NSZWZQdHI8SURCQmFja2luZ1N0b3JlPiBJREJMZXZlbERC QmFja2luZ1N0b3JlOjpvcGVuKFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0CiAgICAgICAgIFN0cmlu ZyBwYXRoID0gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHBhdGhCYXNlLCBzZWN1cml0eU9yaWdp bi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkgKyAiLmluZGV4ZWRkYi5sZXZlbGRiIik7CiAKICAgICAg ICAgZGIgPSBMZXZlbERCRGF0YWJhc2U6Om9wZW4ocGF0aCwgY29tcGFyYXRvci5nZXQoKSk7Ci0g ICAgICAgIGJvb2wga25vd25TY2hlbWEgPSBpc1NjaGVtYUtub3duKGRiLmdldCgpKTsKLSAgICAg ICAgaWYgKCFrbm93blNjaGVtYSkgewotICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGVkREIg YmFja2luZyBzdG9yZSBoYWQgdW5rbm93biBzY2hlbWEsIHRyZWF0aW5nIGl0IGFzIGZhaWx1cmUg dG8gb3BlbiIpOwotICAgICAgICAgICAgSGlzdG9ncmFtU3VwcG9ydDo6aGlzdG9ncmFtRW51bWVy YXRpb24oIldlYkNvcmUuSW5kZXhlZERCLkJhY2tpbmdTdG9yZS5PcGVuU3RhdHVzIiwgSURCTGV2 ZWxEQkJhY2tpbmdTdG9yZU9wZW5GYWlsZWRVbmtub3duU2NoZW1hLCBJREJMZXZlbERCQmFja2lu Z1N0b3JlT3Blbk1heCk7CisgICAgICAgIGlmIChkYikgeworICAgICAgICAgICAgaWYgKCFpc1Nj aGVtYUtub3duKGRiLmdldCgpKSkgeworICAgICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhl ZERCIGJhY2tpbmcgc3RvcmUgaGFkIHVua25vd24gc2NoZW1hLCB0cmVhdGluZyBpdCBhcyBmYWls dXJlIHRvIG9wZW4iKTsKKyAgICAgICAgICAgICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dy YW1FbnVtZXJhdGlvbigiV2ViQ29yZS5JbmRleGVkREIuQmFja2luZ1N0b3JlLk9wZW5TdGF0dXMi LCBJREJMZXZlbERCQmFja2luZ1N0b3JlT3BlbkZhaWxlZFVua25vd25TY2hlbWEsIElEQkxldmVs REJCYWNraW5nU3RvcmVPcGVuTWF4KTsKKyAgICAgICAgICAgICAgICBkYi5yZWxlYXNlKCk7Cisg ICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZGIgJiYga25vd25TY2hlbWEp CisgICAgICAgIGlmIChkYikKICAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3Jh bUVudW1lcmF0aW9uKCJXZWJDb3JlLkluZGV4ZWREQi5CYWNraW5nU3RvcmUuT3BlblN0YXR1cyIs IElEQkxldmVsREJCYWNraW5nU3RvcmVPcGVuU3VjY2VzcywgSURCTGV2ZWxEQkJhY2tpbmdTdG9y ZU9wZW5NYXgpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhl ZERCIGJhY2tpbmcgc3RvcmUgb3BlbiBmYWlsZWQsIGF0dGVtcHRpbmcgY2xlYW51cCIpOwo= 171308 2012-10-29 14:00:09 -0700 2012-11-06 15:07:06 -0800 Patch for landing bug-100692-20121029135835.patch text/plain 2463 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDdkZWRlOTdkNjg4Yjc1 YTM0MDdlMDIwYWZiOGNlZDYxNGI4YmMzMS4uMjI3ODQ5ZGQwODI2ZmQwZWZhZjY5Mzg3NDc3YTk4 ZDIwNzg2ZDRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEwLTI5ICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW5kZXhlZERCOiBDcmFz aCBvbiBjaGVja2luZyB2ZXJzaW9uIG9mIGNvcnJ1cHQgYmFja2luZyBzdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjkyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KKworICAgICAgICBJZiB0aGUgYmFja2luZyBzdG9yZSBm YWlscyB0byBvcGVuIChkdWUgdG8gY29ycnVwdGlvbiwgbm9uLXdyaXRlYWJsZSBkaXNrLCBldGMp CisgICAgICAgIHRoZSBzdWJzZXF1ZW50IHNjaGVtYSB2ZXJzaW9uIGNoZWNrIGRlcmVmZXJlbmNl cyBhIG51bGwgcG9pbnRlci4gRml4IHRvIG9ubHkKKyAgICAgICAgZG8gdGhlIHNjaGVtYSBjaGVj ayBpZiB0aGUgZGF0YWJhc2Ugb3BlbmVkLgorCisgICAgICAgIENocm9taXVtIHRlc3RzIHdpbGwg YmUgaW5jbHVkZWQgd2l0aCBjcnJldi5jb20vMTExOTYwMjkKKworICAgICAgICAqIE1vZHVsZXMv aW5kZXhlZGRiL0lEQkxldmVsREJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SURCTGV2ZWxEQkJhY2tpbmdTdG9yZTo6b3Blbik6CisKIDIwMTItMTAtMjkgIENzYWJhIE9zenRy b2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFRleHQgd2l0aCB6ZXJv IGZvbnQgc2l6ZSByZW5kZXJzIGFzIFggcHggc29tZXRpbWVzLCBjYXVzaW5nIGZhc3QvdGV4dC96 ZXJvLWZvbnQtc2l6ZS0yLmh0bWwgdG8gZmFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvSURCTGV2ZWxEQkJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcAppbmRleCAz NWY1ZmZiMTkyZTBmNzI3MDNiMmI2NTM0YzIzZDM4MzdiMjQwZjE1Li5lYTVkNTlmZTNlODQxY2Iy NGUxOWIzZmI2MmEzZmYzNWViMzcwNjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJMZXZlbERCQmFja2luZ1N0b3JlLmNwcApAQCAtMjk1 LDEzICsyOTUsMTMgQEAgUGFzc1JlZlB0cjxJREJCYWNraW5nU3RvcmU+IElEQkxldmVsREJCYWNr aW5nU3RvcmU6Om9wZW4oU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXQKICAgICAgICAgU3RyaW5nIHBh dGggPSBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQocGF0aEJhc2UsIHNlY3VyaXR5T3JpZ2luLT5k YXRhYmFzZUlkZW50aWZpZXIoKSArICIuaW5kZXhlZGRiLmxldmVsZGIiKTsKIAogICAgICAgICBk YiA9IExldmVsREJEYXRhYmFzZTo6b3BlbihwYXRoLCBjb21wYXJhdG9yLmdldCgpKTsKLSAgICAg ICAgYm9vbCBrbm93blNjaGVtYSA9IGlzU2NoZW1hS25vd24oZGIuZ2V0KCkpOwotICAgICAgICBp ZiAoIWtub3duU2NoZW1hKSB7CisgICAgICAgIGlmIChkYiAmJiAhaXNTY2hlbWFLbm93bihkYi5n ZXQoKSkpIHsKICAgICAgICAgICAgIExPR19FUlJPUigiSW5kZXhlZERCIGJhY2tpbmcgc3RvcmUg aGFkIHVua25vd24gc2NoZW1hLCB0cmVhdGluZyBpdCBhcyBmYWlsdXJlIHRvIG9wZW4iKTsKICAg ICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUVudW1lcmF0aW9uKCJXZWJDb3Jl LkluZGV4ZWREQi5CYWNraW5nU3RvcmUuT3BlblN0YXR1cyIsIElEQkxldmVsREJCYWNraW5nU3Rv cmVPcGVuRmFpbGVkVW5rbm93blNjaGVtYSwgSURCTGV2ZWxEQkJhY2tpbmdTdG9yZU9wZW5NYXgp OworICAgICAgICAgICAgZGIucmVsZWFzZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGRi ICYmIGtub3duU2NoZW1hKQorICAgICAgICBpZiAoZGIpCiAgICAgICAgICAgICBIaXN0b2dyYW1T dXBwb3J0OjpoaXN0b2dyYW1FbnVtZXJhdGlvbigiV2ViQ29yZS5JbmRleGVkREIuQmFja2luZ1N0 b3JlLk9wZW5TdGF0dXMiLCBJREJMZXZlbERCQmFja2luZ1N0b3JlT3BlblN1Y2Nlc3MsIElEQkxl dmVsREJCYWNraW5nU3RvcmVPcGVuTWF4KTsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBM T0dfRVJST1IoIkluZGV4ZWREQiBiYWNraW5nIHN0b3JlIG9wZW4gZmFpbGVkLCBhdHRlbXB0aW5n IGNsZWFudXAiKTsK