127453 2014-01-22 16:14:05 -0800 The IDB backing store get() method shouldn't call IDB callbacks directly 2014-01-22 16:26:21 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson alecflett bdakin commit-queue jsbell oldest_to_newest 970923 0 beidson 2014-01-22 16:14:05 -0800 The IDB backing store get() method shouldn't call IDB callbacks directly This is similar to https://bugs.webkit.org/show_bug.cgi?id=127399 but for get() instead of put() 970924 1 221919 beidson 2014-01-22 16:18:35 -0800 Created attachment 221919 Patch v1 970925 2 221919 bdakin 2014-01-22 16:20:59 -0800 Comment on attachment 221919 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=221919&action=review > Source/WebCore/ChangeLog:15 > + (WebCore::IDBServerConnectionLevelDB::get): Don’t call IDBCallbacks directly. Funny character. 970926 3 commit-queue 2014-01-22 16:21:02 -0800 Attachment 221919 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 970930 4 beidson 2014-01-22 16:26:21 -0800 http://trac.webkit.org/changeset/162569 221919 2014-01-22 16:18:35 -0800 2014-01-22 16:20:59 -0800 Patch v1 patch text/plain 17683 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZGY1YjM3Li43ZjVkOWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMDEtMjIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFRoZSBJREIgYmFja2luZyBzdG9yZSBnZXQoKSBtZXRob2Qgc2hvdWxkbid0IGNhbGwgSURC IGNhbGxiYWNrcyBkaXJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3NDUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL2lu ZGV4ZWRkYi9JREJTZXJ2ZXJDb25uZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpJREJHZXRS ZXN1bHQ6OklEQkdldFJlc3VsdCk6IEFkZCBhIG5ldyBzdHJ1Y3R1cmUgdG8gaG9sZCBhbGwgb2Yg dGhlCisgICAgICAgICAgcG9zc2libGUgcmVzdWx0cyBvZiBhIGdldCgpIGNhbGwuCisKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERC LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCOjpnZXQp OiBEb27igJl0IGNhbGwgSURCQ2FsbGJhY2tzIGRpcmVjdGx5LgorICAgICAgICAgIEluc3RlYWQs IHJldHVybiB0aGUgR2V0UmVzdWx0IHRvIHRoZSBHZXRPcGVyYXRpb24gd2hpY2ggd2lsbCBtYWtl IElEQkNhbGxiYWNrcy4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQlNl cnZlckNvbm5lY3Rpb25MZXZlbERCLmg6CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9J REJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdl dE9wZXJhdGlvbjo6cGVyZm9ybSk6IEdldCBhbGwgb2YgdGhlIElEQkdldFJlc3VsdHMgaW4gdGhl IGNvbXBsZXRpb24gY2FsbGJhY2sKKyAgICAgICAgICBtYWtlIHRoZSBhcHByb3ByaWF0ZSBJREJD YWxsYmFjay4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tl bmRPcGVyYXRpb25zLmg6CisKIDIwMTQtMDEtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIElEQjogIlB1dCIgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCU2VydmVyQ29ubmVjdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCU2VydmVyQ29ubmVjdGlvbi5oCmluZGV4IDg4 YzNmNWYuLjlkNDAyZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQlNlcnZlckNvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJTZXJ2ZXJDb25uZWN0aW9uLmgKQEAgLTQ2LDYgKzQ2LDMzIEBAIGNsYXNzIElE QlRyYW5zYWN0aW9uQmFja2VuZDsKIHN0cnVjdCBJREJJbmRleE1ldGFkYXRhOwogc3RydWN0IElE Qk9iamVjdFN0b3JlTWV0YWRhdGE7CiAKK3N0cnVjdCBJREJHZXRSZXN1bHQgeworICAgIElEQkdl dFJlc3VsdCgpCisgICAgeworICAgIH0KKworICAgIElEQkdldFJlc3VsdChQYXNzUmVmUHRyPFNo YXJlZEJ1ZmZlcj4gYnVmZmVyKQorICAgICAgICA6IHZhbHVlQnVmZmVyKGJ1ZmZlcikKKyAgICB7 CisgICAgfQorCisgICAgSURCR2V0UmVzdWx0KFBhc3NSZWZQdHI8SURCS2V5PiBpZGJLZXkpCisg ICAgICAgIDoga2V5KGlkYktleSkKKyAgICB7CisgICAgfQorCisgICAgSURCR2V0UmVzdWx0KFBh c3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIsIFBhc3NSZWZQdHI8SURCS2V5PiBpZGJLZXks IGNvbnN0IElEQktleVBhdGgmIHBhdGgpCisgICAgICAgIDogdmFsdWVCdWZmZXIoYnVmZmVyKQor ICAgICAgICAsIGtleShpZGJLZXkpCisgICAgICAgICwga2V5UGF0aChwYXRoKQorICAgIHsKKyAg ICB9CisKKyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiB2YWx1ZUJ1ZmZlcjsKKyAgICBSZWZQdHI8 SURCS2V5PiBrZXk7CisgICAgSURCS2V5UGF0aCBrZXlQYXRoOworfTsKKwogLy8gVGhpcyBpbnRl cmZhY2UgcHJvdmlkZXMgYSBzaW5nbGUgYXN5bmNocm9ub3VzIGxheWVyIGJldHdlZW4gdGhlIHdl Yi1mYWNpbmcgZnJvbnRlbmQKIC8vIGFuZCB0aGUgSS9PIHBlcmZvcm1pbmcgYmFja2VuZCBvZiBJ bmRleGVkRGF0YWJhc2UuCiAvLyBJZiBhbiBvcGVyYXRpb24ncyBjb21wbGV0aW9uIG5lZWRzIHRv IGJlIGNvbmZpcm1lZCB0aGF0IG11c3QgYmUgZG9uZSB0aHJvdWdoIHVzZSBvZiBhIGNhbGxiYWNr IGZ1bmN0aW9uLgpAQCAtNzcsNyArMTA0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBj cmVhdGVPYmplY3RTdG9yZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBDcmVhdGVPYmpl Y3RTdG9yZU9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFi YXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGNy ZWF0ZUluZGV4KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IENyZWF0ZUluZGV4T3BlcmF0 aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBj b21wbGV0aW9uQ2FsbGJhY2spID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGVsZXRlSW5kZXgoSURC VHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgRGVsZXRlSW5kZXhPcGVyYXRpb24mLCBzdGQ6OmZ1 bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxs YmFjaykgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBnZXQoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwg Y29uc3QgR2V0T3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0 YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQg Z2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IEdldE9wZXJhdGlvbiYsIHN0ZDo6ZnVu Y3Rpb248dm9pZChjb25zdCBJREJHZXRSZXN1bHQmLCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJy b3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHB1dChJREJU cmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBQdXRPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoUGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29t cGxldGlvbkNhbGxiYWNrKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5DdXJzb3IoSURCVHJh bnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgT3BlbkN1cnNvck9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rp b248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNr KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGNvdW50KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNv bnN0IENvdW50T3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0 YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2VuZE9wZXJhdGlv bnMuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25C YWNrZW5kT3BlcmF0aW9ucy5jcHAKaW5kZXggOGI4YmFjZC4uZTY3ZGY0ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3Bl cmF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJh bnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAKQEAgLTk0LDcgKzk0LDI3IEBAIHZvaWQgR2V0 T3BlcmF0aW9uOjpwZXJmb3JtKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjb21wbGV0aW9uQ2FsbGJh Y2spCiAgICAgUmVmUHRyPEdldE9wZXJhdGlvbj4gb3BlcmF0aW9uKHRoaXMpOwogICAgIFNUQU5E QVJEX0RBVEFCQVNFX0VSUk9SX0NBTExCQUNLOwogCi0gICAgbV90cmFuc2FjdGlvbi0+ZGF0YWJh c2UoKS5zZXJ2ZXJDb25uZWN0aW9uKCkuZ2V0KCptX3RyYW5zYWN0aW9uLCAqdGhpcywgb3BlcmF0 aW9uQ2FsbGJhY2spOworICAgIG1fdHJhbnNhY3Rpb24tPmRhdGFiYXNlKCkuc2VydmVyQ29ubmVj dGlvbigpLmdldCgqbV90cmFuc2FjdGlvbiwgKnRoaXMsIFt0aGlzLCBvcGVyYXRpb24sIG9wZXJh dGlvbkNhbGxiYWNrXShjb25zdCBJREJHZXRSZXN1bHQmIHJlc3VsdCwgUGFzc1JlZlB0cjxJREJE YXRhYmFzZUVycm9yPiBwcnBFcnJvcikgeworICAgICAgICBSZWZQdHI8SURCRGF0YWJhc2VFcnJv cj4gZXJyb3IgPSBwcnBFcnJvcjsKKworICAgICAgICBpZiAoZXJyb3IpCisgICAgICAgICAgICBt X2NhbGxiYWNrcy0+b25FcnJvcihlcnJvcik7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAg aWYgKCFyZXN1bHQudmFsdWVCdWZmZXIpIHsKKyAgICAgICAgICAgICAgICBpZiAoIXJlc3VsdC5r ZXkpCisgICAgICAgICAgICAgICAgICAgIG1fY2FsbGJhY2tzLT5vblN1Y2Nlc3MoKTsKKyAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIG1fY2FsbGJhY2tzLT5vblN1Y2Nl c3MocmVzdWx0LmtleS5nZXQoKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgIGlmIChyZXN1bHQua2V5KQorICAgICAgICAgICAgICAgICAgICBtX2NhbGxiYWNrcy0+b25T dWNjZXNzKHJlc3VsdC52YWx1ZUJ1ZmZlciwgcmVzdWx0LmtleSwgcmVzdWx0LmtleVBhdGgpOwor ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgbV9jYWxsYmFja3MtPm9u U3VjY2VzcyhyZXN1bHQudmFsdWVCdWZmZXIuZ2V0KCkpOworICAgICAgICAgICAgfQorICAgICAg ICB9CisKKyAgICAgICAgb3BlcmF0aW9uQ2FsbGJhY2soZXJyb3IucmVsZWFzZSgpKTsKKyAgICB9 KTsKIH0KIAogdm9pZCBQdXRPcGVyYXRpb246OnBlcmZvcm0oc3RkOjpmdW5jdGlvbjx2b2lkKCk+ IGNvbXBsZXRpb25DYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2VuZE9wZXJhdGlvbnMuaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2VuZE9wZXJhdGlvbnMuaApp bmRleCA4Yjk0NTRmLi5kMTBiNzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25zLmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9u cy5oCkBAIC0yNjMsNyArMjYzLDYgQEAgcHVibGljOgogICAgIGludDY0X3QgaW5kZXhJRCgpIGNv bnN0IHsgcmV0dXJuIG1faW5kZXhJRDsgfQogICAgIEluZGV4ZWREQjo6Q3Vyc29yVHlwZSBjdXJz b3JUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9jdXJzb3JUeXBlOyB9CiAgICAgSURCS2V5UmFuZ2Uq IGtleVJhbmdlKCkgY29uc3QgeyByZXR1cm4gbV9rZXlSYW5nZS5nZXQoKTsgfQotICAgIFJlZlB0 cjxJREJDYWxsYmFja3M+IGNhbGxiYWNrcygpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbGJhY2tzLmdl dCgpOyB9CiAgICAgYm9vbCBhdXRvSW5jcmVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9hdXRvSW5j cmVtZW50OyB9CiAgICAgSURCS2V5UGF0aCBrZXlQYXRoKCkgY29uc3QgeyByZXR1cm4gbV9rZXlQ YXRoOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xl dmVsZGIvSURCU2VydmVyQ29ubmVjdGlvbkxldmVsREIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5jcHAKaW5k ZXggNGVmZWU4OC4uNjAyOGRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9u TGV2ZWxEQi5jcHAKQEAgLTI0NCw3ICsyNDQsNyBAQCB2b2lkIElEQlNlcnZlckNvbm5lY3Rpb25M ZXZlbERCOjpkZWxldGVJbmRleChJREJUcmFuc2FjdGlvbkJhY2tlbmQmIHRyYW5zYWN0aW9uLAog ICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FMTEJBQ0tfV0lUSF9OVUxMX0FSRyhjb21wbGV0aW9uQ2Fs bGJhY2spOwogfQogCi12b2lkIElEQlNlcnZlckNvbm5lY3Rpb25MZXZlbERCOjpnZXQoSURCVHJh bnNhY3Rpb25CYWNrZW5kJiB0cmFuc2FjdGlvbiwgY29uc3QgR2V0T3BlcmF0aW9uJiBvcGVyYXRp b24sIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29t cGxldGlvbkNhbGxiYWNrKQordm9pZCBJREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6Z2V0KElE QlRyYW5zYWN0aW9uQmFja2VuZCYgdHJhbnNhY3Rpb24sIGNvbnN0IEdldE9wZXJhdGlvbiYgb3Bl cmF0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgSURCR2V0UmVzdWx0JiwgUGFzc1JlZlB0 cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykKIHsKICAgICBJREJCYWNr aW5nU3RvcmVUcmFuc2FjdGlvbkxldmVsREIqIGJhY2tpbmdTdG9yZVRyYW5zYWN0aW9uID0gbV9i YWNraW5nU3RvcmVUcmFuc2FjdGlvbnMuZ2V0KHRyYW5zYWN0aW9uLmlkKCkpOwogICAgIEFTU0VS VChiYWNraW5nU3RvcmVUcmFuc2FjdGlvbik7CkBAIC0yNzIsOCArMjcyLDcgQEAgdm9pZCBJREJT ZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6Z2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYgdHJhbnNh Y3Rpb24sIGNvbnN0IEcKICAgICAgICAgfQogCiAgICAgICAgIGlmICghYmFja2luZ1N0b3JlQ3Vy c29yKSB7Ci0gICAgICAgICAgICBvcGVyYXRpb24uY2FsbGJhY2tzKCktPm9uU3VjY2VzcygpOwot ICAgICAgICAgICAgQVNZTkNfQ09NUExFVElPTl9DQUxMQkFDS19XSVRIX05VTExfQVJHKGNvbXBs ZXRpb25DYWxsYmFjayk7CisgICAgICAgICAgICBBU1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJ VEhfVFdPX0FSR1MoY29tcGxldGlvbkNhbGxiYWNrLCBJREJHZXRSZXN1bHQoKSwgbnVsbHB0cik7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMjg3LDQ1ICsyODYsNDQgQEAg dm9pZCBJREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6Z2V0KElEQlRyYW5zYWN0aW9uQmFja2Vu ZCYgdHJhbnNhY3Rpb24sIGNvbnN0IEcKICAgICAgICAgVmVjdG9yPGNoYXI+IHZhbHVlOwogICAg ICAgICBvayA9IG1fYmFja2luZ1N0b3JlLT5nZXRSZWNvcmQoKmJhY2tpbmdTdG9yZVRyYW5zYWN0 aW9uLCB0cmFuc2FjdGlvbi5kYXRhYmFzZSgpLmlkKCksIG9wZXJhdGlvbi5vYmplY3RTdG9yZUlE KCksICprZXksIHZhbHVlKTsKICAgICAgICAgaWYgKCFvaykgewotICAgICAgICAgICAgb3BlcmF0 aW9uLmNhbGxiYWNrcygpLT5vbkVycm9yKElEQkRhdGFiYXNlRXJyb3I6OmNyZWF0ZShJREJEYXRh YmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCAiSW50ZXJuYWwgZXJyb3IgaW4gZ2V0UmVjb3Jk LiIpKTsKLSAgICAgICAgICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FMTEJBQ0tfV0lUSF9OVUxMX0FS Ryhjb21wbGV0aW9uQ2FsbGJhY2spOworICAgICAgICAgICAgQVNZTkNfQ09NUExFVElPTl9DQUxM QkFDS19XSVRIX1RXT19BUkdTKGNvbXBsZXRpb25DYWxsYmFjaywgSURCR2V0UmVzdWx0KCksIElE QkRhdGFiYXNlRXJyb3I6OmNyZWF0ZShJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9y LCAiSW50ZXJuYWwgZXJyb3IgaW4gZ2V0UmVjb3JkLiIpKTsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCiAgICAgICAgIGlmICh2YWx1ZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAg IG9wZXJhdGlvbi5jYWxsYmFja3MoKS0+b25TdWNjZXNzKCk7Ci0gICAgICAgICAgICBBU1lOQ19D T01QTEVUSU9OX0NBTExCQUNLX1dJVEhfTlVMTF9BUkcoY29tcGxldGlvbkNhbGxiYWNrKTsKKyAg ICAgICAgICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FMTEJBQ0tfV0lUSF9UV09fQVJHUyhjb21wbGV0 aW9uQ2FsbGJhY2ssIElEQkdldFJlc3VsdCgpLCBudWxscHRyKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChvcGVyYXRpb24uYXV0b0luY3JlbWVudCgpICYm ICFvcGVyYXRpb24ua2V5UGF0aCgpLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBvcGVyYXRpb24u Y2FsbGJhY2tzKCktPm9uU3VjY2VzcyhTaGFyZWRCdWZmZXI6OmFkb3B0VmVjdG9yKHZhbHVlKSwg a2V5LCBvcGVyYXRpb24ua2V5UGF0aCgpKTsKLSAgICAgICAgICAgIEFTWU5DX0NPTVBMRVRJT05f Q0FMTEJBQ0tfV0lUSF9OVUxMX0FSRyhjb21wbGV0aW9uQ2FsbGJhY2spOwotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9CisgICAgICAgIElEQkdldFJlc3VsdCByZXN1bHQ7CiAKLSAgICAg ICAgb3BlcmF0aW9uLmNhbGxiYWNrcygpLT5vblN1Y2Nlc3MoU2hhcmVkQnVmZmVyOjphZG9wdFZl Y3Rvcih2YWx1ZSkpOwotICAgICAgICBBU1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJVEhfTlVM TF9BUkcoY29tcGxldGlvbkNhbGxiYWNrKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAo b3BlcmF0aW9uLmF1dG9JbmNyZW1lbnQoKSAmJiAhb3BlcmF0aW9uLmtleVBhdGgoKS5pc051bGwo KSkKKyAgICAgICAgICAgIHJlc3VsdCA9IElEQkdldFJlc3VsdChTaGFyZWRCdWZmZXI6OmFkb3B0 VmVjdG9yKHZhbHVlKSwga2V5LCBvcGVyYXRpb24ua2V5UGF0aCgpKTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgcmVzdWx0ID0gSURCR2V0UmVzdWx0KFNoYXJlZEJ1ZmZlcjo6YWRvcHRWZWN0 b3IodmFsdWUpKTsKIAorICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtjb21wbGV0aW9uQ2FsbGJh Y2ssIHJlc3VsdF0oKSB7CisgICAgICAgICAgICBjb21wbGV0aW9uQ2FsbGJhY2socmVzdWx0LCBu dWxscHRyKTsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICAvLyBG cm9tIGhlcmUgd2UgYXJlIGRlYWxpbmcgb25seSB3aXRoIGluZGV4ZXMuCiAgICAgb2sgPSBtX2Jh Y2tpbmdTdG9yZS0+Z2V0UHJpbWFyeUtleVZpYUluZGV4KCpiYWNraW5nU3RvcmVUcmFuc2FjdGlv biwgdHJhbnNhY3Rpb24uZGF0YWJhc2UoKS5pZCgpLCBvcGVyYXRpb24ub2JqZWN0U3RvcmVJRCgp LCBvcGVyYXRpb24uaW5kZXhJRCgpLCAqa2V5LCBwcmltYXJ5S2V5KTsKICAgICBpZiAoIW9rKSB7 Ci0gICAgICAgIG9wZXJhdGlvbi5jYWxsYmFja3MoKS0+b25FcnJvcihJREJEYXRhYmFzZUVycm9y OjpjcmVhdGUoSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgIkludGVybmFsIGVy cm9yIGluIGdldFByaW1hcnlLZXlWaWFJbmRleC4iKSk7Ci0gICAgICAgIEFTWU5DX0NPTVBMRVRJ T05fQ0FMTEJBQ0tfV0lUSF9OVUxMX0FSRyhjb21wbGV0aW9uQ2FsbGJhY2spOworICAgICAgICBB U1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJVEhfVFdPX0FSR1MoY29tcGxldGlvbkNhbGxiYWNr LCBJREJHZXRSZXN1bHQoKSwgSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElEQkRhdGFiYXNlRXhj ZXB0aW9uOjpVbmtub3duRXJyb3IsICJJbnRlcm5hbCBlcnJvciBpbiBnZXRQcmltYXJ5S2V5Vmlh SW5kZXguIikpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmICghcHJpbWFyeUtleSkg ewotICAgICAgICBvcGVyYXRpb24uY2FsbGJhY2tzKCktPm9uU3VjY2VzcygpOwotICAgICAgICBB U1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJVEhfTlVMTF9BUkcoY29tcGxldGlvbkNhbGxiYWNr KTsKKyAgICAgICAgQVNZTkNfQ09NUExFVElPTl9DQUxMQkFDS19XSVRIX1RXT19BUkdTKGNvbXBs ZXRpb25DYWxsYmFjaywgSURCR2V0UmVzdWx0KCksIG51bGxwdHIpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogICAgIGlmIChvcGVyYXRpb24uY3Vyc29yVHlwZSgpID09IEluZGV4ZWREQjo6Q3Vy c29yVHlwZTo6S2V5T25seSkgewogICAgICAgICAvLyBJbmRleCBWYWx1ZSBSZXRyaWV2YWwgT3Bl cmF0aW9uCi0gICAgICAgIG9wZXJhdGlvbi5jYWxsYmFja3MoKS0+b25TdWNjZXNzKHByaW1hcnlL ZXkuZ2V0KCkpOwotICAgICAgICBBU1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJVEhfTlVMTF9B UkcoY29tcGxldGlvbkNhbGxiYWNrKTsKKyAgICAgICAgSURCR2V0UmVzdWx0IHJlc3VsdChwcmlt YXJ5S2V5LnJlbGVhc2UoKSk7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2NvbXBsZXRpb25D YWxsYmFjaywgcmVzdWx0XSgpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25DYWxsYmFjayhyZXN1 bHQsIG51bGxwdHIpOworICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAt MzMzLDIzICszMzEsMjcgQEAgdm9pZCBJREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6Z2V0KElE QlRyYW5zYWN0aW9uQmFja2VuZCYgdHJhbnNhY3Rpb24sIGNvbnN0IEcKICAgICBWZWN0b3I8Y2hh cj4gdmFsdWU7CiAgICAgb2sgPSBtX2JhY2tpbmdTdG9yZS0+Z2V0UmVjb3JkKCpiYWNraW5nU3Rv cmVUcmFuc2FjdGlvbiwgdHJhbnNhY3Rpb24uZGF0YWJhc2UoKS5pZCgpLCBvcGVyYXRpb24ub2Jq ZWN0U3RvcmVJRCgpLCAqcHJpbWFyeUtleSwgdmFsdWUpOwogICAgIGlmICghb2spIHsKLSAgICAg ICAgb3BlcmF0aW9uLmNhbGxiYWNrcygpLT5vbkVycm9yKElEQkRhdGFiYXNlRXJyb3I6OmNyZWF0 ZShJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCAiSW50ZXJuYWwgZXJyb3IgaW4g Z2V0UmVjb3JkLiIpKTsKLSAgICAgICAgQVNZTkNfQ09NUExFVElPTl9DQUxMQkFDS19XSVRIX05V TExfQVJHKGNvbXBsZXRpb25DYWxsYmFjayk7CisgICAgICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FM TEJBQ0tfV0lUSF9UV09fQVJHUyhjb21wbGV0aW9uQ2FsbGJhY2ssIElEQkdldFJlc3VsdCgpLCBJ REJEYXRhYmFzZUVycm9yOjpjcmVhdGUoSURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJv ciwgIkludGVybmFsIGVycm9yIGluIGdldFJlY29yZC4iKSk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKICAgICBpZiAodmFsdWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG9wZXJhdGlvbi5jYWxs YmFja3MoKS0+b25TdWNjZXNzKCk7Ci0gICAgICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FMTEJBQ0tf V0lUSF9OVUxMX0FSRyhjb21wbGV0aW9uQ2FsbGJhY2spOworICAgICAgICBBU1lOQ19DT01QTEVU SU9OX0NBTExCQUNLX1dJVEhfVFdPX0FSR1MoY29tcGxldGlvbkNhbGxiYWNrLCBJREJHZXRSZXN1 bHQoKSwgbnVsbHB0cik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG9wZXJhdGlv bi5hdXRvSW5jcmVtZW50KCkgJiYgIW9wZXJhdGlvbi5rZXlQYXRoKCkuaXNOdWxsKCkpIHsKLSAg ICAgICAgb3BlcmF0aW9uLmNhbGxiYWNrcygpLT5vblN1Y2Nlc3MoU2hhcmVkQnVmZmVyOjphZG9w dFZlY3Rvcih2YWx1ZSksIHByaW1hcnlLZXksIG9wZXJhdGlvbi5rZXlQYXRoKCkpOwotICAgICAg ICBBU1lOQ19DT01QTEVUSU9OX0NBTExCQUNLX1dJVEhfTlVMTF9BUkcoY29tcGxldGlvbkNhbGxi YWNrKTsKKyAgICAgICAgSURCR2V0UmVzdWx0IHJlc3VsdChTaGFyZWRCdWZmZXI6OmFkb3B0VmVj dG9yKHZhbHVlKSwga2V5LCBvcGVyYXRpb24ua2V5UGF0aCgpKTsKKyAgICAgICAgY2FsbE9uTWFp blRocmVhZChbY29tcGxldGlvbkNhbGxiYWNrLCByZXN1bHRdKCkgeworICAgICAgICAgICAgY29t cGxldGlvbkNhbGxiYWNrKHJlc3VsdCwgbnVsbHB0cik7CisgICAgICAgIH0pOworCiAgICAgICAg IHJldHVybjsKICAgICB9Ci0gICAgb3BlcmF0aW9uLmNhbGxiYWNrcygpLT5vblN1Y2Nlc3MoU2hh cmVkQnVmZmVyOjphZG9wdFZlY3Rvcih2YWx1ZSkpOwotICAgIEFTWU5DX0NPTVBMRVRJT05fQ0FM TEJBQ0tfV0lUSF9OVUxMX0FSRyhjb21wbGV0aW9uQ2FsbGJhY2spOworCisgICAgSURCR2V0UmVz dWx0IHJlc3VsdChTaGFyZWRCdWZmZXI6OmFkb3B0VmVjdG9yKHZhbHVlKSk7CisgICAgY2FsbE9u TWFpblRocmVhZChbY29tcGxldGlvbkNhbGxiYWNrLCByZXN1bHRdKCkgeworICAgICAgICBjb21w bGV0aW9uQ2FsbGJhY2socmVzdWx0LCBudWxscHRyKTsKKyAgICB9KTsKIH0KIAogdm9pZCBJREJT ZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQjo6cHV0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYgdHJhbnNh Y3Rpb24sIGNvbnN0IFB1dE9wZXJhdGlvbiYgb3BlcmF0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQo UGFzc1JlZlB0cjxJREJLZXk+LCBQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxl dGlvbkNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5oIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9pbmRleGVkZGIvbGV2ZWxkYi9JREJTZXJ2ZXJDb25uZWN0aW9uTGV2ZWxEQi5oCmlu ZGV4IDI2ZDJkODguLjFiOWI4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL2xldmVsZGIvSURCU2VydmVyQ29ubmVjdGlvbkxldmVsREIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZXZlbGRiL0lEQlNlcnZlckNvbm5lY3Rpb25M ZXZlbERCLmgKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjcmVh dGVPYmplY3RTdG9yZShJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBDcmVhdGVPYmplY3RT dG9yZU9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFiYXNl RXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQg Y3JlYXRlSW5kZXgoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgQ3JlYXRlSW5kZXhPcGVy YXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+ IGNvbXBsZXRpb25DYWxsYmFjaykgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZUlu ZGV4KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IERlbGV0ZUluZGV4T3BlcmF0aW9uJiwg c3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0 aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBnZXQoSURCVHJhbnNhY3Rp b25CYWNrZW5kJiwgY29uc3QgR2V0T3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NS ZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwor ICAgIHZpcnR1YWwgdm9pZCBnZXQoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgR2V0T3Bl cmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IElEQkdldFJlc3VsdCYsIFBhc3NSZWZQ dHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwogICAg IHZpcnR1YWwgdm9pZCBwdXQoSURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgUHV0T3BlcmF0 aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCS2V5PiwgUGFzc1JlZlB0cjxJ REJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykgIG92ZXJyaWRlOwogICAgIHZp cnR1YWwgdm9pZCBvcGVuQ3Vyc29yKElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IE9wZW5D dXJzb3JPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFz ZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lk IGNvdW50KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IENvdW50T3BlcmF0aW9uJiwgc3Rk OjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9u Q2FsbGJhY2spIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDIxMTAzMmIuLjYxYTY2MjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0wMS0yMiAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIElEQiBiYWNraW5nIHN0b3JlIGdldCgpIG1ldGhv ZCBzaG91bGRuJ3QgY2FsbCBJREIgY2FsbGJhY2tzIGRpcmVjdGx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc0NTMKKyAgICAgICAgCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJJREJTZXJ2ZXJDb25uZWN0aW9uOjpnZXQpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv RGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmg6CisKIDIwMTQtMDEt MjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIElEQjogIlB1 dCIgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRhYmFz ZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9EYXRhYmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uY3Bw CmluZGV4IDAwMDE0MDYuLmY5MDljZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIvV2ViSURCU2Vy dmVyQ29ubmVjdGlvbi5jcHAKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIFdlYklEQlNlcnZlckNv bm5lY3Rpb246OmRlbGV0ZUluZGV4KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IERlbGV0 ZUluZAogewogfQogCi12b2lkIFdlYklEQlNlcnZlckNvbm5lY3Rpb246OmdldChJREJUcmFuc2Fj dGlvbkJhY2tlbmQmLCBjb25zdCBHZXRPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoUGFz c1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykKK3ZvaWQgV2Vi SURCU2VydmVyQ29ubmVjdGlvbjo6Z2V0KElEQlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IEdl dE9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBJREJHZXRSZXN1bHQmLCBQYXNz UmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKQogewogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9JbmRleGVkREIv V2ViSURCU2VydmVyQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9EYXRh YmFzZXMvSW5kZXhlZERCL1dlYklEQlNlcnZlckNvbm5lY3Rpb24uaAppbmRleCA2Njc2OTMwLi42 OWE1NDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0RhdGFiYXNlcy9J bmRleGVkREIvV2ViSURCU2VydmVyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvRGF0YWJhc2VzL0luZGV4ZWREQi9XZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmgKQEAg LTcwLDcgKzcwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVPYmplY3RTdG9y ZShXZWJDb3JlOjpJREJUcmFuc2FjdGlvbkJhY2tlbmQmLCBjb25zdCBXZWJDb3JlOjpDcmVhdGVP YmplY3RTdG9yZU9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPFdlYkNv cmU6OklEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgY3JlYXRlSW5kZXgoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5k JiwgY29uc3QgV2ViQ29yZTo6Q3JlYXRlSW5kZXhPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxs YmFjaykgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRlbGV0ZUluZGV4KFdlYkNvcmU6OklE QlRyYW5zYWN0aW9uQmFja2VuZCYsIGNvbnN0IFdlYkNvcmU6OkRlbGV0ZUluZGV4T3BlcmF0aW9u Jiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCRGF0YWJhc2VFcnJv cj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBnZXQo V2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgV2ViQ29yZTo6R2V0T3BlcmF0 aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCRGF0YWJhc2VF cnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJhY2spIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBn ZXQoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3QgV2ViQ29yZTo6R2V0T3Bl cmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OklEQkdldFJlc3VsdCYs IFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCRGF0YWJhc2VFcnJvcj4pPiBjb21wbGV0aW9uQ2FsbGJh Y2spIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBwdXQoV2ViQ29yZTo6SURCVHJhbnNhY3Rp b25CYWNrZW5kJiwgY29uc3QgV2ViQ29yZTo6UHV0T3BlcmF0aW9uJiwgc3RkOjpmdW5jdGlvbjx2 b2lkKFBhc3NSZWZQdHI8V2ViQ29yZTo6SURCS2V5PiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJREJE YXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFjaykgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCB2b2lkIG9wZW5DdXJzb3IoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNrZW5kJiwgY29uc3Qg V2ViQ29yZTo6T3BlbkN1cnNvck9wZXJhdGlvbiYsIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVm UHRyPFdlYkNvcmU6OklEQkRhdGFiYXNlRXJyb3I+KT4gY29tcGxldGlvbkNhbGxiYWNrKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgY291bnQoV2ViQ29yZTo6SURCVHJhbnNhY3Rpb25CYWNr ZW5kJiwgY29uc3QgV2ViQ29yZTo6Q291bnRPcGVyYXRpb24mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQo UGFzc1JlZlB0cjxXZWJDb3JlOjpJREJEYXRhYmFzZUVycm9yPik+IGNvbXBsZXRpb25DYWxsYmFj aykgb3ZlcnJpZGU7Cg==