61516 2011-05-26 03:24:39 -0700 LevelDB: turn on paranoid checks and verify checksums, log errors 2011-05-27 03:37:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hans hans andreip dgrogan oldest_to_newest 410330 0 hans 2011-05-26 03:24:39 -0700 LevelDB: turn on paranoid checks and verify checksums, log errors 410332 1 94953 hans 2011-05-26 03:27:58 -0700 Created attachment 94953 Patch 410742 2 94953 dgrogan 2011-05-26 12:48:11 -0700 Comment on attachment 94953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94953&action=review LGTM > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:130 > + if (s.IsNotFound()) What circumstances cause a Put to return IsNotFound? > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:259 > + readOptions.verify_checksums = true; Do you know how much performance impact this is expected to have? What happens if a checksum doesn't check out? 411272 3 95143 hans 2011-05-27 01:48:08 -0700 Created attachment 95143 Patch 411275 4 hans 2011-05-27 01:49:39 -0700 (In reply to comment #2) > (From update of attachment 94953 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94953&action=review > > LGTM > > > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:130 > > + if (s.IsNotFound()) > > What circumstances cause a Put to return IsNotFound? None; good catch. Removed. > > > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:259 > > + readOptions.verify_checksums = true; > > Do you know how much performance impact this is expected to have? What happens if a checksum doesn't check out? Then operations start failing with a Status that indicated corruption. I don't know the exact performance impact, but I don't expect it to be bad. The checksum is just a CRC, and I'd rather turn it on now and consider relaxing it later when we start tuning if it turns up as a bottleneck. 411301 5 95143 tonyg 2011-05-27 03:11:28 -0700 Comment on attachment 95143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95143&action=review > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:257 > + readOptions.verify_checksums = true; To David's point, perhaps just add a FIXME here mentioning that removing this might be a perf win once the API is more stable. 411310 6 hans 2011-05-27 03:36:55 -0700 (In reply to comment #5) > (From update of attachment 95143 [details]) Thanks for the review! > View in context: https://bugs.webkit.org/attachment.cgi?id=95143&action=review > > > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:257 > > + readOptions.verify_checksums = true; > > To David's point, perhaps just add a FIXME here mentioning that removing this might be a perf win once the API is more stable. Done. 411311 7 hans 2011-05-27 03:37:43 -0700 Committed r87490: <http://trac.webkit.org/changeset/87490> 94953 2011-05-26 03:27:58 -0700 2011-05-27 01:48:02 -0700 Patch bug-61516-20110526112756.patch text/plain 6691 hans U3VidmVyc2lvbiBSZXZpc2lvbjogODczNzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwOTI1MWQyNTJiMzI4NzA2 YTA0NTYzNmJlZTA3Nzc3ZDBkYjA4ZWE5Li45ODVjOWE0ODg0ZmVmOTkwZjBmYmMzZjA5MGVhNGQ5 NDI0ZTM3N2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDUtMjYgIEhhbnMg V2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBMZXZlbERCOiB0dXJuIG9uIHBhcmFub2lkIGNoZWNrcyBh bmQgdmVyaWZ5IGNoZWNrc3VtcywgbG9nIGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE1MTYKKworICAgICAgICBUaGlzIGFsbG93cyBmb3Ig ZGV0ZWN0aW9uIG9mIGNvcnJ1cHRlZCBkYXRhYmFzZXMuCisgICAgICAgIEV2ZW4gaWYgd2UgY2Fu J3QgcmVjb3ZlciBmcm9tIGEgY29ycnVwdGVkIGRhdGFiYXNlLCBkaXNjb3ZlcmluZyB0aGUKKyAg ICAgICAgcHJvYmxlbSBpcyBhIHN0ZXAgaW4gdGhlIHJpZ2h0IGRpcmVjdGlvbi4KKworICAgICAg ICBObyBuZXcgZnVuY3Rpb25hbGl0eSwgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZv cm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGV2ZWxE QkRhdGFiYXNlOjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6cHV0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6cmVtb3ZlKToKKyAgICAgICAg KFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6Z2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVs REJEYXRhYmFzZTo6d3JpdGUpOgorICAgICAgICAoV2ViQ29yZTo6SXRlcmF0b3JJbXBsOjpjaGVj a1N0YXR1cyk6CisgICAgICAgIChXZWJDb3JlOjpJdGVyYXRvckltcGw6OnNlZWtUb0xhc3QpOgor ICAgICAgICAoV2ViQ29yZTo6SXRlcmF0b3JJbXBsOjpzZWVrKToKKyAgICAgICAgKFdlYkNvcmU6 Okl0ZXJhdG9ySW1wbDo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpJdGVyYXRvckltcGw6OnBy ZXYpOgorICAgICAgICAoV2ViQ29yZTo6TGV2ZWxEQkRhdGFiYXNlOjpjcmVhdGVJdGVyYXRvcik6 CisKIDIwMTEtMDUtMjYgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNwcAppbmRleCAzODZmNWRkOTk1NGYz MDBlMjE4N2NkNDE4YzQwNTIyY2QyNjJmY2M0Li42NTA4MmVjYTg1MmJiYWM1MWNhNzUzMDUzNjlj Mjc0ZjAxYzY2MmE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRi L0xldmVsREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbGV2ZWxk Yi9MZXZlbERCRGF0YWJhc2UuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiTGV2ZWxE Qkl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiTGV2ZWxEQlNsaWNlLmgiCiAjaW5jbHVkZSAiTGV2ZWxE QldyaXRlQmF0Y2guaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSA8bGV2ZWxkYi9j b21wYXJhdG9yLmg+CiAjaW5jbHVkZSA8bGV2ZWxkYi9kYi5oPgogI2luY2x1ZGUgPGxldmVsZGIv c2xpY2UuaD4KQEAgLTk4LDE3ICs5OSwxOSBAQCBQYXNzT3duUHRyPExldmVsREJEYXRhYmFzZT4g TGV2ZWxEQkRhdGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0CiB7CiAg ICAgT3duUHRyPENvbXBhcmF0b3JBZGFwdGVyPiBjb21wYXJhdG9yQWRhcHRlciA9IGFkb3B0UHRy KG5ldyBDb21wYXJhdG9yQWRhcHRlcihjb21wYXJhdG9yKSk7CiAKLSAgICBPd25QdHI8TGV2ZWxE QkRhdGFiYXNlPiByZXN1bHQgPSBhZG9wdFB0cihuZXcgTGV2ZWxEQkRhdGFiYXNlKTsKLQogICAg IGxldmVsZGI6Ok9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLmNvbXBhcmF0b3IgPSBjb21w YXJhdG9yQWRhcHRlci5nZXQoKTsKICAgICBvcHRpb25zLmNyZWF0ZV9pZl9taXNzaW5nID0gdHJ1 ZTsKKyAgICBvcHRpb25zLnBhcmFub2lkX2NoZWNrcyA9IHRydWU7CiAgICAgbGV2ZWxkYjo6REIq IGRiOwotICAgIGxldmVsZGI6OlN0YXR1cyBzID0gbGV2ZWxkYjo6REI6Ok9wZW4ob3B0aW9ucywg ZmlsZU5hbWUudXRmOCgpLmRhdGEoKSwgJmRiKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMg cyA9IGxldmVsZGI6OkRCOjpPcGVuKG9wdGlvbnMsIGZpbGVOYW1lLnV0ZjgoKS5kYXRhKCksICZk Yik7CiAKLSAgICBpZiAoIXMub2soKSkKKyAgICBpZiAoIXMub2soKSkgeworICAgICAgICBMT0df RVJST1IoIkZhaWxlZCB0byBvcGVuIExldmVsREIgZGF0YWJhc2UgZnJvbSAlczogJXMiLCBmaWxl TmFtZS5hc2NpaSgpLmRhdGEoKSwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOwogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICB9CiAKKyAgICBPd25QdHI8TGV2ZWxEQkRhdGFiYXNlPiByZXN1bHQg PSBhZG9wdFB0cihuZXcgTGV2ZWxEQkRhdGFiYXNlKTsKICAgICByZXN1bHQtPm1fZGIgPSBhZG9w dFB0cihkYik7CiAgICAgcmVzdWx0LT5tX2NvbXBhcmF0b3JBZGFwdGVyID0gY29tcGFyYXRvckFk YXB0ZXIucmVsZWFzZSgpOwogICAgIHJlc3VsdC0+bV9jb21wYXJhdG9yID0gY29tcGFyYXRvcjsK QEAgLTEyMSw3ICsxMjQsMTMgQEAgYm9vbCBMZXZlbERCRGF0YWJhc2U6OnB1dChjb25zdCBMZXZl bERCU2xpY2UmIGtleSwgY29uc3QgVmVjdG9yPGNoYXI+JiB2YWx1ZSkKICAgICBsZXZlbGRiOjpX cml0ZU9wdGlvbnMgd3JpdGVPcHRpb25zOwogICAgIHdyaXRlT3B0aW9ucy5zeW5jID0gdHJ1ZTsK IAotICAgIHJldHVybiBtX2RiLT5QdXQod3JpdGVPcHRpb25zLCBtYWtlU2xpY2Uoa2V5KSwgbWFr ZVNsaWNlKHZhbHVlKSkub2soKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1fZGIt PlB1dCh3cml0ZU9wdGlvbnMsIG1ha2VTbGljZShrZXkpLCBtYWtlU2xpY2UodmFsdWUpKTsKKyAg ICBpZiAocy5vaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAocy5Jc05vdEZvdW5k KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBMT0dfRVJST1IoIkxldmVsREIgcHV0IGZh aWxlZDogJXMiLCBzLlRvU3RyaW5nKCkuY19zdHIoKSk7CisgICAgcmV0dXJuIGZhbHNlOwogfQog CiBib29sIExldmVsREJEYXRhYmFzZTo6cmVtb3ZlKGNvbnN0IExldmVsREJTbGljZSYga2V5KQpA QCAtMTI5LDE3ICsxMzgsMzAgQEAgYm9vbCBMZXZlbERCRGF0YWJhc2U6OnJlbW92ZShjb25zdCBM ZXZlbERCU2xpY2UmIGtleSkKICAgICBsZXZlbGRiOjpXcml0ZU9wdGlvbnMgd3JpdGVPcHRpb25z OwogICAgIHdyaXRlT3B0aW9ucy5zeW5jID0gdHJ1ZTsKIAotICAgIHJldHVybiBtX2RiLT5EZWxl dGUod3JpdGVPcHRpb25zLCBtYWtlU2xpY2Uoa2V5KSkub2soKTsKKyAgICBjb25zdCBsZXZlbGRi OjpTdGF0dXMgcyA9IG1fZGItPkRlbGV0ZSh3cml0ZU9wdGlvbnMsIG1ha2VTbGljZShrZXkpKTsK KyAgICBpZiAocy5vaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAocy5Jc05vdEZv dW5kKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBMT0dfRVJST1IoIkxldmVsREIgcmVt b3ZlIGZhaWxlZDogJXMiLCBzLlRvU3RyaW5nKCkuY19zdHIoKSk7CisgICAgcmV0dXJuIGZhbHNl OwogfQogCiBib29sIExldmVsREJEYXRhYmFzZTo6Z2V0KGNvbnN0IExldmVsREJTbGljZSYga2V5 LCBWZWN0b3I8Y2hhcj4mIHZhbHVlKQogewogICAgIHN0ZDo6c3RyaW5nIHJlc3VsdDsKLSAgICBp ZiAoIW1fZGItPkdldChsZXZlbGRiOjpSZWFkT3B0aW9ucygpLCBtYWtlU2xpY2Uoa2V5KSwgJnJl c3VsdCkub2soKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGxldmVsZGI6OlJlYWRPcHRp b25zIHJlYWRPcHRpb25zOworICAgIHJlYWRPcHRpb25zLnZlcmlmeV9jaGVja3N1bXMgPSB0cnVl OwogCi0gICAgdmFsdWUgPSBtYWtlVmVjdG9yKHJlc3VsdCk7Ci0gICAgcmV0dXJuIHRydWU7Cisg ICAgY29uc3QgbGV2ZWxkYjo6U3RhdHVzIHMgPSBtX2RiLT5HZXQocmVhZE9wdGlvbnMsIG1ha2VT bGljZShrZXkpLCAmcmVzdWx0KTsKKyAgICBpZiAocy5vaygpKSB7CisgICAgICAgIHZhbHVlID0g bWFrZVZlY3RvcihyZXN1bHQpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgaWYg KHMuSXNOb3RGb3VuZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgTE9HX0VSUk9SKCJM ZXZlbERCIGdldCBmYWlsZWQ6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOworICAgIHJldHVy biBmYWxzZTsKIH0KIAogYm9vbCBMZXZlbERCRGF0YWJhc2U6OndyaXRlKExldmVsREJXcml0ZUJh dGNoJiB3cml0ZUJhdGNoKQpAQCAtMTQ3LDcgKzE2OSwxMSBAQCBib29sIExldmVsREJEYXRhYmFz ZTo6d3JpdGUoTGV2ZWxEQldyaXRlQmF0Y2gmIHdyaXRlQmF0Y2gpCiAgICAgbGV2ZWxkYjo6V3Jp dGVPcHRpb25zIHdyaXRlT3B0aW9uczsKICAgICB3cml0ZU9wdGlvbnMuc3luYyA9IHRydWU7CiAK LSAgICByZXR1cm4gbV9kYi0+V3JpdGUod3JpdGVPcHRpb25zLCB3cml0ZUJhdGNoLm1fd3JpdGVC YXRjaC5nZXQoKSkub2soKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1fZGItPldy aXRlKHdyaXRlT3B0aW9ucywgd3JpdGVCYXRjaC5tX3dyaXRlQmF0Y2guZ2V0KCkpOworICAgIGlm IChzLm9rKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIExPR19FUlJPUigiTGV2ZWxEQiB3 cml0ZSBmYWlsZWQ6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOworICAgIHJldHVybiBmYWxz ZTsKIH0KIAogbmFtZXNwYWNlIHsKQEAgLTE2Niw2ICsxOTIsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIGZyaWVuZCBjbGFzcyBXZWJDb3JlOjpMZXZlbERCRGF0YWJhc2U7CiAgICAgSXRlcmF0 b3JJbXBsKFBhc3NPd25QdHI8bGV2ZWxkYjo6SXRlcmF0b3I+KTsKKyAgICB2b2lkIGNoZWNrU3Rh dHVzKCk7CiAKICAgICBPd25QdHI8bGV2ZWxkYjo6SXRlcmF0b3I+IG1faXRlcmF0b3I7CiB9OwpA QCAtMTc2LDYgKzIwMywxMyBAQCBJdGVyYXRvckltcGw6Okl0ZXJhdG9ySW1wbChQYXNzT3duUHRy PGxldmVsZGI6Okl0ZXJhdG9yPiBpdCkKIHsKIH0KIAordm9pZCBJdGVyYXRvckltcGw6OmNoZWNr U3RhdHVzKCkKK3sKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1faXRlcmF0b3ItPnN0 YXR1cygpOworICAgIGlmICghcy5vaygpKQorICAgICAgICBMT0dfRVJST1IoIkxldmVsREIgaXRl cmF0b3IgZXJyb3I6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOworfQorCiBib29sIEl0ZXJh dG9ySW1wbDo6aXNWYWxpZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faXRlcmF0b3ItPlZhbGlk KCk7CkBAIC0xODQsMjMgKzIxOCwyNyBAQCBib29sIEl0ZXJhdG9ySW1wbDo6aXNWYWxpZCgpIGNv bnN0CiB2b2lkIEl0ZXJhdG9ySW1wbDo6c2Vla1RvTGFzdCgpCiB7CiAgICAgbV9pdGVyYXRvci0+ U2Vla1RvTGFzdCgpOworICAgIGNoZWNrU3RhdHVzKCk7CiB9CiAKIHZvaWQgSXRlcmF0b3JJbXBs OjpzZWVrKGNvbnN0IExldmVsREJTbGljZSYgdGFyZ2V0KQogewogICAgIG1faXRlcmF0b3ItPlNl ZWsobWFrZVNsaWNlKHRhcmdldCkpOworICAgIGNoZWNrU3RhdHVzKCk7CiB9CiAKIHZvaWQgSXRl cmF0b3JJbXBsOjpuZXh0KCkKIHsKICAgICBBU1NFUlQoaXNWYWxpZCgpKTsKICAgICBtX2l0ZXJh dG9yLT5OZXh0KCk7CisgICAgY2hlY2tTdGF0dXMoKTsKIH0KIAogdm9pZCBJdGVyYXRvckltcGw6 OnByZXYoKQogewogICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogICAgIG1faXRlcmF0b3ItPlByZXYo KTsKKyAgICBjaGVja1N0YXR1cygpOwogfQogCiBMZXZlbERCU2xpY2UgSXRlcmF0b3JJbXBsOjpr ZXkoKSBjb25zdApAQCAtMjE3LDcgKzI1NSw5IEBAIExldmVsREJTbGljZSBJdGVyYXRvckltcGw6 OnZhbHVlKCkgY29uc3QKIAogUGFzc093blB0cjxMZXZlbERCSXRlcmF0b3I+IExldmVsREJEYXRh YmFzZTo6Y3JlYXRlSXRlcmF0b3IoKQogewotICAgIE93blB0cjxsZXZlbGRiOjpJdGVyYXRvcj4g aSA9IGFkb3B0UHRyKG1fZGItPk5ld0l0ZXJhdG9yKGxldmVsZGI6OlJlYWRPcHRpb25zKCkpKTsK KyAgICBsZXZlbGRiOjpSZWFkT3B0aW9ucyByZWFkT3B0aW9uczsKKyAgICByZWFkT3B0aW9ucy52 ZXJpZnlfY2hlY2tzdW1zID0gdHJ1ZTsKKyAgICBPd25QdHI8bGV2ZWxkYjo6SXRlcmF0b3I+IGkg PSBhZG9wdFB0cihtX2RiLT5OZXdJdGVyYXRvcihyZWFkT3B0aW9ucykpOwogICAgIGlmICghaSkg Ly8gRklYTUU6IERvdWJsZSBjaGVjayBpZiB3ZSBhY3R1YWxseSBuZWVkIHRvIGNoZWNrIHRoaXMu CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJldHVybiBhZG9wdFB0cihuZXcgSXRlcmF0 b3JJbXBsKGkucmVsZWFzZSgpKSk7Cg== 95143 2011-05-27 01:48:08 -0700 2011-05-27 03:11:28 -0700 Patch bug-61516-20110527094806.patch text/plain 6643 hans U3VidmVyc2lvbiBSZXZpc2lvbjogODczNzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwOTI1MWQyNTJiMzI4NzA2 YTA0NTYzNmJlZTA3Nzc3ZDBkYjA4ZWE5Li45ODVjOWE0ODg0ZmVmOTkwZjBmYmMzZjA5MGVhNGQ5 NDI0ZTM3N2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDUtMjYgIEhhbnMg V2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBMZXZlbERCOiB0dXJuIG9uIHBhcmFub2lkIGNoZWNrcyBh bmQgdmVyaWZ5IGNoZWNrc3VtcywgbG9nIGVycm9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE1MTYKKworICAgICAgICBUaGlzIGFsbG93cyBmb3Ig ZGV0ZWN0aW9uIG9mIGNvcnJ1cHRlZCBkYXRhYmFzZXMuCisgICAgICAgIEV2ZW4gaWYgd2UgY2Fu J3QgcmVjb3ZlciBmcm9tIGEgY29ycnVwdGVkIGRhdGFiYXNlLCBkaXNjb3ZlcmluZyB0aGUKKyAg ICAgICAgcHJvYmxlbSBpcyBhIHN0ZXAgaW4gdGhlIHJpZ2h0IGRpcmVjdGlvbi4KKworICAgICAg ICBObyBuZXcgZnVuY3Rpb25hbGl0eSwgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZv cm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGV2ZWxE QkRhdGFiYXNlOjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6cHV0 KToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6cmVtb3ZlKToKKyAgICAgICAg KFdlYkNvcmU6OkxldmVsREJEYXRhYmFzZTo6Z2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxldmVs REJEYXRhYmFzZTo6d3JpdGUpOgorICAgICAgICAoV2ViQ29yZTo6SXRlcmF0b3JJbXBsOjpjaGVj a1N0YXR1cyk6CisgICAgICAgIChXZWJDb3JlOjpJdGVyYXRvckltcGw6OnNlZWtUb0xhc3QpOgor ICAgICAgICAoV2ViQ29yZTo6SXRlcmF0b3JJbXBsOjpzZWVrKToKKyAgICAgICAgKFdlYkNvcmU6 Okl0ZXJhdG9ySW1wbDo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpJdGVyYXRvckltcGw6OnBy ZXYpOgorICAgICAgICAoV2ViQ29yZTo6TGV2ZWxEQkRhdGFiYXNlOjpjcmVhdGVJdGVyYXRvcik6 CisKIDIwMTEtMDUtMjYgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNwcAppbmRleCAzODZmNWRkOTk1NGYz MDBlMjE4N2NkNDE4YzQwNTIyY2QyNjJmY2M0Li5iMjFiYmJlNmM1YjczMjUxYTQ2MTA0YzkzYzEx NGIzYTdmNjM4NzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRi L0xldmVsREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbGV2ZWxk Yi9MZXZlbERCRGF0YWJhc2UuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiTGV2ZWxE Qkl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiTGV2ZWxEQlNsaWNlLmgiCiAjaW5jbHVkZSAiTGV2ZWxE QldyaXRlQmF0Y2guaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSA8bGV2ZWxkYi9j b21wYXJhdG9yLmg+CiAjaW5jbHVkZSA8bGV2ZWxkYi9kYi5oPgogI2luY2x1ZGUgPGxldmVsZGIv c2xpY2UuaD4KQEAgLTk4LDE3ICs5OSwxOSBAQCBQYXNzT3duUHRyPExldmVsREJEYXRhYmFzZT4g TGV2ZWxEQkRhdGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0CiB7CiAg ICAgT3duUHRyPENvbXBhcmF0b3JBZGFwdGVyPiBjb21wYXJhdG9yQWRhcHRlciA9IGFkb3B0UHRy KG5ldyBDb21wYXJhdG9yQWRhcHRlcihjb21wYXJhdG9yKSk7CiAKLSAgICBPd25QdHI8TGV2ZWxE QkRhdGFiYXNlPiByZXN1bHQgPSBhZG9wdFB0cihuZXcgTGV2ZWxEQkRhdGFiYXNlKTsKLQogICAg IGxldmVsZGI6Ok9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLmNvbXBhcmF0b3IgPSBjb21w YXJhdG9yQWRhcHRlci5nZXQoKTsKICAgICBvcHRpb25zLmNyZWF0ZV9pZl9taXNzaW5nID0gdHJ1 ZTsKKyAgICBvcHRpb25zLnBhcmFub2lkX2NoZWNrcyA9IHRydWU7CiAgICAgbGV2ZWxkYjo6REIq IGRiOwotICAgIGxldmVsZGI6OlN0YXR1cyBzID0gbGV2ZWxkYjo6REI6Ok9wZW4ob3B0aW9ucywg ZmlsZU5hbWUudXRmOCgpLmRhdGEoKSwgJmRiKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMg cyA9IGxldmVsZGI6OkRCOjpPcGVuKG9wdGlvbnMsIGZpbGVOYW1lLnV0ZjgoKS5kYXRhKCksICZk Yik7CiAKLSAgICBpZiAoIXMub2soKSkKKyAgICBpZiAoIXMub2soKSkgeworICAgICAgICBMT0df RVJST1IoIkZhaWxlZCB0byBvcGVuIExldmVsREIgZGF0YWJhc2UgZnJvbSAlczogJXMiLCBmaWxl TmFtZS5hc2NpaSgpLmRhdGEoKSwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOwogICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICB9CiAKKyAgICBPd25QdHI8TGV2ZWxEQkRhdGFiYXNlPiByZXN1bHQg PSBhZG9wdFB0cihuZXcgTGV2ZWxEQkRhdGFiYXNlKTsKICAgICByZXN1bHQtPm1fZGIgPSBhZG9w dFB0cihkYik7CiAgICAgcmVzdWx0LT5tX2NvbXBhcmF0b3JBZGFwdGVyID0gY29tcGFyYXRvckFk YXB0ZXIucmVsZWFzZSgpOwogICAgIHJlc3VsdC0+bV9jb21wYXJhdG9yID0gY29tcGFyYXRvcjsK QEAgLTEyMSw3ICsxMjQsMTEgQEAgYm9vbCBMZXZlbERCRGF0YWJhc2U6OnB1dChjb25zdCBMZXZl bERCU2xpY2UmIGtleSwgY29uc3QgVmVjdG9yPGNoYXI+JiB2YWx1ZSkKICAgICBsZXZlbGRiOjpX cml0ZU9wdGlvbnMgd3JpdGVPcHRpb25zOwogICAgIHdyaXRlT3B0aW9ucy5zeW5jID0gdHJ1ZTsK IAotICAgIHJldHVybiBtX2RiLT5QdXQod3JpdGVPcHRpb25zLCBtYWtlU2xpY2Uoa2V5KSwgbWFr ZVNsaWNlKHZhbHVlKSkub2soKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1fZGIt PlB1dCh3cml0ZU9wdGlvbnMsIG1ha2VTbGljZShrZXkpLCBtYWtlU2xpY2UodmFsdWUpKTsKKyAg ICBpZiAocy5vaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBMT0dfRVJST1IoIkxldmVs REIgcHV0IGZhaWxlZDogJXMiLCBzLlRvU3RyaW5nKCkuY19zdHIoKSk7CisgICAgcmV0dXJuIGZh bHNlOwogfQogCiBib29sIExldmVsREJEYXRhYmFzZTo6cmVtb3ZlKGNvbnN0IExldmVsREJTbGlj ZSYga2V5KQpAQCAtMTI5LDE3ICsxMzYsMzAgQEAgYm9vbCBMZXZlbERCRGF0YWJhc2U6OnJlbW92 ZShjb25zdCBMZXZlbERCU2xpY2UmIGtleSkKICAgICBsZXZlbGRiOjpXcml0ZU9wdGlvbnMgd3Jp dGVPcHRpb25zOwogICAgIHdyaXRlT3B0aW9ucy5zeW5jID0gdHJ1ZTsKIAotICAgIHJldHVybiBt X2RiLT5EZWxldGUod3JpdGVPcHRpb25zLCBtYWtlU2xpY2Uoa2V5KSkub2soKTsKKyAgICBjb25z dCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1fZGItPkRlbGV0ZSh3cml0ZU9wdGlvbnMsIG1ha2VTbGlj ZShrZXkpKTsKKyAgICBpZiAocy5vaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAo cy5Jc05vdEZvdW5kKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBMT0dfRVJST1IoIkxl dmVsREIgcmVtb3ZlIGZhaWxlZDogJXMiLCBzLlRvU3RyaW5nKCkuY19zdHIoKSk7CisgICAgcmV0 dXJuIGZhbHNlOwogfQogCiBib29sIExldmVsREJEYXRhYmFzZTo6Z2V0KGNvbnN0IExldmVsREJT bGljZSYga2V5LCBWZWN0b3I8Y2hhcj4mIHZhbHVlKQogewogICAgIHN0ZDo6c3RyaW5nIHJlc3Vs dDsKLSAgICBpZiAoIW1fZGItPkdldChsZXZlbGRiOjpSZWFkT3B0aW9ucygpLCBtYWtlU2xpY2Uo a2V5KSwgJnJlc3VsdCkub2soKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGxldmVsZGI6 OlJlYWRPcHRpb25zIHJlYWRPcHRpb25zOworICAgIHJlYWRPcHRpb25zLnZlcmlmeV9jaGVja3N1 bXMgPSB0cnVlOwogCi0gICAgdmFsdWUgPSBtYWtlVmVjdG9yKHJlc3VsdCk7Ci0gICAgcmV0dXJu IHRydWU7CisgICAgY29uc3QgbGV2ZWxkYjo6U3RhdHVzIHMgPSBtX2RiLT5HZXQocmVhZE9wdGlv bnMsIG1ha2VTbGljZShrZXkpLCAmcmVzdWx0KTsKKyAgICBpZiAocy5vaygpKSB7CisgICAgICAg IHZhbHVlID0gbWFrZVZlY3RvcihyZXN1bHQpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 CisgICAgaWYgKHMuSXNOb3RGb3VuZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgTE9H X0VSUk9SKCJMZXZlbERCIGdldCBmYWlsZWQ6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOwor ICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBMZXZlbERCRGF0YWJhc2U6OndyaXRlKExldmVs REJXcml0ZUJhdGNoJiB3cml0ZUJhdGNoKQpAQCAtMTQ3LDcgKzE2NywxMSBAQCBib29sIExldmVs REJEYXRhYmFzZTo6d3JpdGUoTGV2ZWxEQldyaXRlQmF0Y2gmIHdyaXRlQmF0Y2gpCiAgICAgbGV2 ZWxkYjo6V3JpdGVPcHRpb25zIHdyaXRlT3B0aW9uczsKICAgICB3cml0ZU9wdGlvbnMuc3luYyA9 IHRydWU7CiAKLSAgICByZXR1cm4gbV9kYi0+V3JpdGUod3JpdGVPcHRpb25zLCB3cml0ZUJhdGNo Lm1fd3JpdGVCYXRjaC5nZXQoKSkub2soKTsKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9 IG1fZGItPldyaXRlKHdyaXRlT3B0aW9ucywgd3JpdGVCYXRjaC5tX3dyaXRlQmF0Y2guZ2V0KCkp OworICAgIGlmIChzLm9rKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIExPR19FUlJPUigi TGV2ZWxEQiB3cml0ZSBmYWlsZWQ6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOworICAgIHJl dHVybiBmYWxzZTsKIH0KIAogbmFtZXNwYWNlIHsKQEAgLTE2Niw2ICsxOTAsNyBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXZWJDb3JlOjpMZXZlbERCRGF0YWJhc2U7CiAg ICAgSXRlcmF0b3JJbXBsKFBhc3NPd25QdHI8bGV2ZWxkYjo6SXRlcmF0b3I+KTsKKyAgICB2b2lk IGNoZWNrU3RhdHVzKCk7CiAKICAgICBPd25QdHI8bGV2ZWxkYjo6SXRlcmF0b3I+IG1faXRlcmF0 b3I7CiB9OwpAQCAtMTc2LDYgKzIwMSwxMyBAQCBJdGVyYXRvckltcGw6Okl0ZXJhdG9ySW1wbChQ YXNzT3duUHRyPGxldmVsZGI6Okl0ZXJhdG9yPiBpdCkKIHsKIH0KIAordm9pZCBJdGVyYXRvcklt cGw6OmNoZWNrU3RhdHVzKCkKK3sKKyAgICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG1faXRl cmF0b3ItPnN0YXR1cygpOworICAgIGlmICghcy5vaygpKQorICAgICAgICBMT0dfRVJST1IoIkxl dmVsREIgaXRlcmF0b3IgZXJyb3I6ICVzIiwgcy5Ub1N0cmluZygpLmNfc3RyKCkpOworfQorCiBi b29sIEl0ZXJhdG9ySW1wbDo6aXNWYWxpZCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faXRlcmF0 b3ItPlZhbGlkKCk7CkBAIC0xODQsMjMgKzIxNiwyNyBAQCBib29sIEl0ZXJhdG9ySW1wbDo6aXNW YWxpZCgpIGNvbnN0CiB2b2lkIEl0ZXJhdG9ySW1wbDo6c2Vla1RvTGFzdCgpCiB7CiAgICAgbV9p dGVyYXRvci0+U2Vla1RvTGFzdCgpOworICAgIGNoZWNrU3RhdHVzKCk7CiB9CiAKIHZvaWQgSXRl cmF0b3JJbXBsOjpzZWVrKGNvbnN0IExldmVsREJTbGljZSYgdGFyZ2V0KQogewogICAgIG1faXRl cmF0b3ItPlNlZWsobWFrZVNsaWNlKHRhcmdldCkpOworICAgIGNoZWNrU3RhdHVzKCk7CiB9CiAK IHZvaWQgSXRlcmF0b3JJbXBsOjpuZXh0KCkKIHsKICAgICBBU1NFUlQoaXNWYWxpZCgpKTsKICAg ICBtX2l0ZXJhdG9yLT5OZXh0KCk7CisgICAgY2hlY2tTdGF0dXMoKTsKIH0KIAogdm9pZCBJdGVy YXRvckltcGw6OnByZXYoKQogewogICAgIEFTU0VSVChpc1ZhbGlkKCkpOwogICAgIG1faXRlcmF0 b3ItPlByZXYoKTsKKyAgICBjaGVja1N0YXR1cygpOwogfQogCiBMZXZlbERCU2xpY2UgSXRlcmF0 b3JJbXBsOjprZXkoKSBjb25zdApAQCAtMjE3LDcgKzI1Myw5IEBAIExldmVsREJTbGljZSBJdGVy YXRvckltcGw6OnZhbHVlKCkgY29uc3QKIAogUGFzc093blB0cjxMZXZlbERCSXRlcmF0b3I+IExl dmVsREJEYXRhYmFzZTo6Y3JlYXRlSXRlcmF0b3IoKQogewotICAgIE93blB0cjxsZXZlbGRiOjpJ dGVyYXRvcj4gaSA9IGFkb3B0UHRyKG1fZGItPk5ld0l0ZXJhdG9yKGxldmVsZGI6OlJlYWRPcHRp b25zKCkpKTsKKyAgICBsZXZlbGRiOjpSZWFkT3B0aW9ucyByZWFkT3B0aW9uczsKKyAgICByZWFk T3B0aW9ucy52ZXJpZnlfY2hlY2tzdW1zID0gdHJ1ZTsKKyAgICBPd25QdHI8bGV2ZWxkYjo6SXRl cmF0b3I+IGkgPSBhZG9wdFB0cihtX2RiLT5OZXdJdGVyYXRvcihyZWFkT3B0aW9ucykpOwogICAg IGlmICghaSkgLy8gRklYTUU6IERvdWJsZSBjaGVjayBpZiB3ZSBhY3R1YWxseSBuZWVkIHRvIGNo ZWNrIHRoaXMuCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJldHVybiBhZG9wdFB0cihu ZXcgSXRlcmF0b3JJbXBsKGkucmVsZWFzZSgpKSk7Cg==