74901 2011-12-19 18:43:19 -0800 [Refactoring] Replace imp with impl in CodeGeneratorJS.pm 2011-12-20 03:44:53 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth darin japhet webkit.review.bot oldest_to_newest 524359 0 haraken 2011-12-19 18:43:19 -0800 As pointed out in bug 74837, the generated code by CodeGeneratorJS.pm includes both 'imp' and 'impl'. We should unify them into 'impl'. 524393 1 119978 haraken 2011-12-19 19:43:17 -0800 Created attachment 119978 Patch 524394 2 haraken 2011-12-19 19:44:46 -0800 Patch diff is hard to read, but I just replaced imp with impl. I confirmed that "perl -lne 'print if /imp[^l]/' CodeGeneratorJS.pm" outputs nothing. 524517 3 119978 webkit.review.bot 2011-12-20 03:44:49 -0800 Comment on attachment 119978 Patch Clearing flags on attachment: 119978 Committed r103315: <http://trac.webkit.org/changeset/103315> 524518 4 webkit.review.bot 2011-12-20 03:44:53 -0800 All reviewed patches have been landed. Closing bug. 119978 2011-12-19 19:43:17 -0800 2011-12-20 03:44:49 -0800 Patch bug-74901-20111220124315.patch text/plain 109983 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTllNTUwY2FhM2JhNzI3 NGQ4OGVlMTg3YzYxODRiZTNjYTMyZTIzMS4uYjMzMDFkOTcwNDEyZWQwNWQ3NmNkYzYxMzVlOWI4 YjM3MDNlYzM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE0NSBAQAogMjAxMS0xMi0xOSAgS2Vu dGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW1JlZmFjdG9yaW5n XSBSZXBsYWNlIGltcCB3aXRoIGltcGwgaW4gQ29kZUdlbmVyYXRvckpTLnBtCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDkwMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHBvaW50ZWQgb3V0IGluIGJ1 ZyA3NDgzNywgdGhlIGdlbmVyYXRlZCBjb2RlIGJ5IENvZGVHZW5lcmF0b3JKUy5wbSBpbmNsdWRl cworICAgICAgICBib3RoICdpbXAnIGFuZCAnaW1wbCcuIFRoaXMgcGF0Y2ggdW5pZmllcyB0aGVt IGludG8gJ2ltcGwnLgorICAgICAgICBJIGNvbmZpcm1lZCB0aGF0ICJwZXJsIC1sbmUgJ3ByaW50 IGlmIC9pbXBbXmEtel0vJyBDb2RlR2VuZXJhdG9ySlMucG0iIG91dHB1dHMgbm90aGluZy4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVB dHRyaWJ1dGVFdmVudExpc3RlbmVyQ2FsbCk6CisgICAgICAgIChHZW5lcmF0ZUV2ZW50TGlzdGVu ZXJDYWxsKToKKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOgorICAgICAgICAoR2Vu ZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1 bmN0aW9uQ2FsbCk6CisgICAgICAgIChOYXRpdmVUb0pTVmFsdWUpOgorCisgICAgICAgICogYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTRmxvYXQ2NEFycmF5LmNwcDogVXBkYXRlZCBydW4tYmlu ZGluZ3MtdGVzdHMgcmVzdWx0cy4KKyAgICAgICAgKFdlYkNvcmU6OmpzRmxvYXQ2NEFycmF5UHJv dG90eXBlRnVuY3Rpb25Gb28pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9K U1Rlc3RFdmVudENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdEV2ZW50 Q29uc3RydWN0b3JBdHRyMSk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RFdmVudENvbnN0cnVj dG9yQXR0cjIpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbnRl cmZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0SW50ZXJmYWNlU3RyMSk6CisgICAg ICAgIChXZWJDb3JlOjpqc1Rlc3RJbnRlcmZhY2VTdHIyKToKKyAgICAgICAgKFdlYkNvcmU6Ompz VGVzdEludGVyZmFjZVN0cjMpOgorICAgICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0SW50ZXJmYWNl U3RyMik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RJbnRlcmZhY2VTdHIzKToKKyAgICAg ICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5l ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyUHJv dG90eXBlRnVuY3Rpb25NZXRob2QpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9K Uy9KU1Rlc3RPYmouY3BwOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUmVhZE9ubHlJbnRB dHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlYWRPbmx5U3RyaW5nQXR0cik6Cisg ICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpSZWFkT25seVRlc3RPYmpBdHRyKToKKyAgICAgICAg KFdlYkNvcmU6OmpzVGVzdE9ialNob3J0QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RP YmpVbnNpZ25lZFNob3J0QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpJbnRBdHRy KToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9iakxvbmdMb25nQXR0cik6CisgICAgICAgIChX ZWJDb3JlOjpqc1Rlc3RPYmpVbnNpZ25lZExvbmdMb25nQXR0cik6CisgICAgICAgIChXZWJDb3Jl Ojpqc1Rlc3RPYmpTdHJpbmdBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialRlc3RP YmpBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialhNTE9iakF0dHIpOgorICAgICAg ICAoV2ViQ29yZTo6anNUZXN0T2JqQ3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9i alJlZmxlY3RlZFN0cmluZ0F0dHIpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUmVmbGVj dGVkSW50ZWdyYWxBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlZmxlY3RlZFVu c2lnbmVkSW50ZWdyYWxBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlZmxlY3Rl ZEJvb2xlYW5BdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlZmxlY3RlZFVSTEF0 dHIpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUmVmbGVjdGVkTm9uRW1wdHlVUkxBdHRy KToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlZmxlY3RlZEN1c3RvbUludGVncmFsQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpSZWZsZWN0ZWRDdXN0b21Cb29sZWFuQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpSZWZsZWN0ZWRDdXN0b21VUkxBdHRyKToK KyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialJlZmxlY3RlZEN1c3RvbU5vbkVtcHR5VVJMQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpBdHRyV2l0aEdldHRlckV4Y2VwdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpBdHRyV2l0aFNldHRlckV4Y2VwdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpTdHJpbmdBdHRyV2l0aEdldHRlckV4Y2VwdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpTdHJpbmdBdHRyV2l0aFNldHRlckV4Y2VwdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpTY3JpcHRTdHJpbmdBdHRyKToKKyAgICAg ICAgKFdlYkNvcmU6OmpzVGVzdE9iakNvbmRpdGlvbmFsQXR0cjEpOgorICAgICAgICAoV2ViQ29y ZTo6anNUZXN0T2JqQ29uZGl0aW9uYWxBdHRyMik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RP YmpDb25kaXRpb25hbEF0dHIzKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9iakNhY2hlZEF0 dHJpYnV0ZTEpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqQ2FjaGVkQXR0cmlidXRlMik6 CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpEZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpqc1Rlc3RPYmpJZCk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpIYXNoKToKKyAg ICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialNob3J0QXR0cik6CisgICAgICAgIChXZWJDb3Jl OjpzZXRKU1Rlc3RPYmpVbnNpZ25lZFNob3J0QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpzZXRK U1Rlc3RPYmpJbnRBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9iakxvbmdMb25n QXR0cik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpVbnNpZ25lZExvbmdMb25nQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpTdHJpbmdBdHRyKToKKyAgICAgICAg KFdlYkNvcmU6OnNldEpTVGVzdE9ialRlc3RPYmpBdHRyKToKKyAgICAgICAgKFdlYkNvcmU6OnNl dEpTVGVzdE9ialhNTE9iakF0dHIpOgorICAgICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0T2JqQ3Jl YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZFN0cmluZ0F0dHIp OgorICAgICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0T2JqUmVmbGVjdGVkSW50ZWdyYWxBdHRyKToK KyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZFVuc2lnbmVkSW50ZWdyYWxB dHRyKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZEJvb2xlYW5BdHRy KToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZFVSTEF0dHIpOgorICAg ICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0T2JqUmVmbGVjdGVkTm9uRW1wdHlVUkxBdHRyKToKKyAg ICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZEN1c3RvbUludGVncmFsQXR0cik6 CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpSZWZsZWN0ZWRDdXN0b21Cb29sZWFuQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpSZWZsZWN0ZWRDdXN0b21VUkxBdHRy KToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9ialJlZmxlY3RlZEN1c3RvbU5vbkVtcHR5 VVJMQXR0cik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpBdHRyV2l0aEdldHRlckV4 Y2VwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpBdHRyV2l0aFNldHRlckV4 Y2VwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpTdHJpbmdBdHRyV2l0aEdl dHRlckV4Y2VwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpTdHJpbmdBdHRy V2l0aFNldHRlckV4Y2VwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpDb25k aXRpb25hbEF0dHIxKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9iakNvbmRpdGlvbmFs QXR0cjIpOgorICAgICAgICAoV2ViQ29yZTo6c2V0SlNUZXN0T2JqQ29uZGl0aW9uYWxBdHRyMyk6 CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpJZCk6CisgICAgICAgIChXZWJDb3JlOjpq c1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblZvaWRNZXRob2QpOgorICAgICAgICAoV2ViQ29yZTo6 anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25Wb2lkTWV0aG9kV2l0aEFyZ3MpOgorICAgICAgICAo V2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25JbnRNZXRob2QpOgorICAgICAgICAo V2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25JbnRNZXRob2RXaXRoQXJncyk6Cisg ICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk9iak1ldGhvZCk6Cisg ICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk9iak1ldGhvZFdpdGhB cmdzKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uTWV0aG9k VGhhdFJlcXVpcmVzQWxsQXJnc0FuZFRocm93cyk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RP YmpQcm90b3R5cGVGdW5jdGlvblNlcmlhbGl6ZWRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpq c1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbklkYktleSk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rl c3RPYmpQcm90b3R5cGVGdW5jdGlvbk9wdGlvbnNPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6 anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25NZXRob2RXaXRoRXhjZXB0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9tQXJnc0FuZEV4Y2VwdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkFkZEV2ZW50 TGlzdGVuZXIpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25S ZW1vdmVFdmVudExpc3RlbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlw ZUZ1bmN0aW9uV2l0aER5bmFtaWNGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQ cm90b3R5cGVGdW5jdGlvbldpdGhEeW5hbWljRnJhbWVBbmRBcmcpOgorICAgICAgICAoV2ViQ29y ZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoRHluYW1pY0ZyYW1lQW5kT3B0aW9uYWxB cmcpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoRHlu YW1pY0ZyYW1lQW5kVXNlckdlc3R1cmUpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJv dG90eXBlRnVuY3Rpb25XaXRoRHluYW1pY0ZyYW1lQW5kVXNlckdlc3R1cmVBU0FEKToKKyAgICAg ICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uV2l0aFNjcmlwdFN0YXRlVm9p ZCk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldpdGhTY3Jp cHRTdGF0ZU9iaik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv bldpdGhTY3JpcHRTdGF0ZVZvaWRFeGNlcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0 T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoU2NyaXB0U3RhdGVPYmpFeGNlcHRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk1l dGhvZFdpdGhPcHRpb25hbEFyZyk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5 cGVGdW5jdGlvbk1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZE9wdGlvbmFsQXJnKToKKyAgICAg ICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uTWV0aG9kV2l0aE5vbk9wdGlv bmFsQXJnQW5kVHdvT3B0aW9uYWxBcmdzKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uTWV0aG9kV2l0aENhbGxiYWNrQXJnKToKKyAgICAgICAgKFdlYkNvcmU6 OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uTWV0aG9kV2l0aE5vbkNhbGxiYWNrQXJnQW5kQ2Fs bGJhY2tBcmcpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25N ZXRob2RXaXRoQ2FsbGJhY2tBbmRPcHRpb25hbEFyZyk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rl c3RPYmpQcm90b3R5cGVGdW5jdGlvbkNvbmRpdGlvbmFsTWV0aG9kMSk6CisgICAgICAgIChXZWJD b3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkNvbmRpdGlvbmFsTWV0aG9kMik6CisgICAg ICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkNvbmRpdGlvbmFsTWV0aG9k Myk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk92ZXJsb2Fk ZWRNZXRob2QxKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9u T3ZlcmxvYWRlZE1ldGhvZDIpOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBl RnVuY3Rpb25PdmVybG9hZGVkTWV0aG9kMyk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQ cm90b3R5cGVGdW5jdGlvbk92ZXJsb2FkZWRNZXRob2Q0KToKKyAgICAgICAgKFdlYkNvcmU6Ompz VGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uT3ZlcmxvYWRlZE1ldGhvZDUpOgorICAgICAgICAoV2Vi Q29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PdmVybG9hZGVkTWV0aG9kNik6CisgICAg ICAgIChXZWJDb3JlOjpqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk92ZXJsb2FkZWRNZXRob2Q3 KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0U2VyaWFsaXplZFNj cmlwdFZhbHVlSW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZUludGVyZmFjZVZhbHVlKToKKworMjAxMS0xMi0xOSAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZC4gUmViYXNlbGlu ZWQgcnVuLWJpbmRpbmdzLXRlc3RzIHJlc3VsdHMuCiAKICAgICAgICAgKiBiaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJyYXkuaDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggMTBiN2ViM2I1Y2RmMWRhOTcw YTFkMTc3MzEyZWM4ZGU0OTA1NDdiZS4uOTY5NjIzZTJjNjE1NWQyMzQ2YzFjMzE1Y2M4MDMwZTQx YzViNTBmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0KQEAgLTE0OCwxNSArMTQ4LDE1IEBAIHN1YiBHZW5lcmF0ZUF0dHJpYnV0 ZUV2ZW50TGlzdGVuZXJDYWxsCiAgICAgICAgICR3cmFwcGVyT2JqZWN0ID0gImFzT2JqZWN0KGNv cnJlc3BvbmRpbmdFbGVtZW50V3JhcHBlcikiOwogCiAgICAgICAgIHB1c2goQEdlbmVyYXRlRXZl bnRMaXN0ZW5lckltcGwsIDw8RU5EKTsKLSAgICBKU1ZhbHVlIGNvcnJlc3BvbmRpbmdFbGVtZW50 V3JhcHBlciA9IHRvSlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIGltcC0+Y29y cmVzcG9uZGluZ0VsZW1lbnQoKSk7CisgICAgSlNWYWx1ZSBjb3JyZXNwb25kaW5nRWxlbWVudFdy YXBwZXIgPSB0b0pTKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBpbXBsLT5jb3Jy ZXNwb25kaW5nRWxlbWVudCgpKTsKICAgICBpZiAoY29ycmVzcG9uZGluZ0VsZW1lbnRXcmFwcGVy LmlzT2JqZWN0KCkpCiBFTkQKIAotICAgICAgICAjIEFkZCBsZWFkaW5nIHdoaXRlc3BhY2UgdG8g Zm9ybWF0IHRoZSBpbXAtPnNldC4uLiBsaW5lIGNvcnJlY3RseQorICAgICAgICAjIEFkZCBsZWFk aW5nIHdoaXRlc3BhY2UgdG8gZm9ybWF0IHRoZSBpbXBsLT5zZXQuLi4gbGluZSBjb3JyZWN0bHkK ICAgICAgICAgcHVzaChAR2VuZXJhdGVFdmVudExpc3RlbmVySW1wbCwgIiAgICAiKTsKICAgICB9 CiAKLSAgICBwdXNoKEBHZW5lcmF0ZUV2ZW50TGlzdGVuZXJJbXBsLCAiICAgIGltcC0+c2V0JGlt cGxTZXR0ZXJGdW5jdGlvbk5hbWUoY3JlYXRlSlNBdHRyaWJ1dGVFdmVudExpc3RlbmVyKGV4ZWMs IHZhbHVlLCAkd3JhcHBlck9iamVjdCkpO1xuIik7CisgICAgcHVzaChAR2VuZXJhdGVFdmVudExp c3RlbmVySW1wbCwgIiAgICBpbXBsLT5zZXQkaW1wbFNldHRlckZ1bmN0aW9uTmFtZShjcmVhdGVK U0F0dHJpYnV0ZUV2ZW50TGlzdGVuZXIoZXhlYywgdmFsdWUsICR3cmFwcGVyT2JqZWN0KSk7XG4i KTsKICAgICByZXR1cm4gQEdlbmVyYXRlRXZlbnRMaXN0ZW5lckltcGw7CiB9CiAKQEAgLTE3NSw3 ICsxNzUsNyBAQCBzdWIgR2VuZXJhdGVFdmVudExpc3RlbmVyQ2FsbAogICAgICAgICAkd3JhcHBl ck9iamVjdCA9ICJhc09iamVjdChjb3JyZXNwb25kaW5nRWxlbWVudFdyYXBwZXIpIjsKIAogICAg ICAgICBwdXNoKEBHZW5lcmF0ZUV2ZW50TGlzdGVuZXJJbXBsLCA8PEVORCk7Ci0gICAgSlNWYWx1 ZSBjb3JyZXNwb25kaW5nRWxlbWVudFdyYXBwZXIgPSB0b0pTKGV4ZWMsIGNhc3RlZFRoaXMtPmds b2JhbE9iamVjdCgpLCBpbXAtPmNvcnJlc3BvbmRpbmdFbGVtZW50KCkpOworICAgIEpTVmFsdWUg Y29ycmVzcG9uZGluZ0VsZW1lbnRXcmFwcGVyID0gdG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9i YWxPYmplY3QoKSwgaW1wbC0+Y29ycmVzcG9uZGluZ0VsZW1lbnQoKSk7CiAgICAgaWYgKCFjb3Jy ZXNwb25kaW5nRWxlbWVudFdyYXBwZXIuaXNPYmplY3QoKSkKICAgICAgICAgcmV0dXJuIEpTVmFs dWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIEVORApAQCAtMTg1LDcgKzE4NSw3IEBAIEVORAog ICAgIEpTVmFsdWUgbGlzdGVuZXIgPSBleGVjLT5hcmd1bWVudCgxKTsKICAgICBpZiAoIWxpc3Rl bmVyLmlzT2JqZWN0KCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmlu ZWQoKSk7Ci0gICAgaW1wLT4ke2Z1bmN0aW9uTmFtZX1FdmVudExpc3RlbmVyKHVzdHJpbmdUb0F0 b21pY1N0cmluZyhleGVjLT5hcmd1bWVudCgwKS50b1N0cmluZyhleGVjKSksIEpTRXZlbnRMaXN0 ZW5lcjo6Y3JlYXRlKGFzT2JqZWN0KGxpc3RlbmVyKSwgJHdyYXBwZXJPYmplY3QsIGZhbHNlLCBj dXJyZW50V29ybGQoZXhlYykpJHBhc3NSZWZQdHJIYW5kbGluZywgZXhlYy0+YXJndW1lbnQoMiku dG9Cb29sZWFuKGV4ZWMpKTsKKyAgICBpbXBsLT4ke2Z1bmN0aW9uTmFtZX1FdmVudExpc3RlbmVy KHVzdHJpbmdUb0F0b21pY1N0cmluZyhleGVjLT5hcmd1bWVudCgwKS50b1N0cmluZyhleGVjKSks IEpTRXZlbnRMaXN0ZW5lcjo6Y3JlYXRlKGFzT2JqZWN0KGxpc3RlbmVyKSwgJHdyYXBwZXJPYmpl Y3QsIGZhbHNlLCBjdXJyZW50V29ybGQoZXhlYykpJHBhc3NSZWZQdHJIYW5kbGluZywgZXhlYy0+ YXJndW1lbnQoMikudG9Cb29sZWFuKGV4ZWMpKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2Rl KGpzVW5kZWZpbmVkKCkpOwogRU5ECiAgICAgcmV0dXJuIEBHZW5lcmF0ZUV2ZW50TGlzdGVuZXJJ bXBsOwpAQCAtMTczOSwzMCArMTczOSwzMCBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgog CiAgICAgICAgICAgICAgICAgaWYgKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkN1c3RvbSJ9IHx8ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkpTQ0N1c3RvbSJ9IHx8ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkN1c3RvbUdldHRlciJ9IHx8ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkpTQ0N1c3RvbUdldHRlciJ9KSB7CiAgICAgICAgICAgICAgICAg ICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBs ZW1lbnRlZEJ5In0pIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgICR7aW50ZXJmYWNlTmFtZX0qIGltcCA9IHN0YXRpY19jYXN0PCR7aW50ZXJmYWNlTmFt ZX0qPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gY2FzdGVkVGhpcy0+JGltcGxHZXR0ZXJGdW5j dGlvbk5hbWUoaW1wLCBleGVjKTtcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgJHtpbnRlcmZhY2VOYW1lfSogaW1wbCA9IHN0YXRpY19jYXN0PCR7 aW50ZXJmYWNlTmFtZX0qPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CisgICAgICAgICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gY2FzdGVkVGhpcy0+JGlt cGxHZXR0ZXJGdW5jdGlvbk5hbWUoaW1wbCwgZXhlYyk7XG4iKTsKICAgICAgICAgICAgICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi ICAgIHJldHVybiBjYXN0ZWRUaGlzLT4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZShleGVjKTtcbiIp OwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJGF0dHJp YnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ2hlY2tOb2RlU2VjdXJpdHki fSkgewogICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1ZGVzeyJKU0RPTUJpbmRpbmcuaCJ9 ID0gMTsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxD bGFzc05hbWUqIGltcCA9IHN0YXRpY19jYXN0PCRpbXBsQ2xhc3NOYW1lKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTtcbiIpOwotICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICByZXR1cm4gY2hlY2tOb2RlU2VjdXJpdHkoZXhlYywgaW1wLT4kaW1wbEdldHRlckZ1bmN0aW9u TmFtZSgpKSA/ICIgLiBOYXRpdmVUb0pTVmFsdWUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLCAwLCAk aW1wbENsYXNzTmFtZSwgImltcC0+JGltcGxHZXR0ZXJGdW5jdGlvbk5hbWUoKSIsICJjYXN0ZWRU aGlzIikgLiAiIDoganNVbmRlZmluZWQoKTtcbiIpOworICAgICAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICAkaW1wbENsYXNzTmFtZSogaW1wbCA9IHN0YXRpY19jYXN0PCRp bXBsQ2xhc3NOYW1lKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTtcbiIpOworICAgICAgICAgICAgICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gY2hlY2tOb2RlU2VjdXJpdHkoZXhl YywgaW1wbC0+JGltcGxHZXR0ZXJGdW5jdGlvbk5hbWUoKSkgPyAiIC4gTmF0aXZlVG9KU1ZhbHVl KCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwgMCwgJGltcGxDbGFzc05hbWUsICJpbXBsLT4kaW1wbEdl dHRlckZ1bmN0aW9uTmFtZSgpIiwgImNhc3RlZFRoaXMiKSAuICIgOiBqc1VuZGVmaW5lZCgpO1xu Iik7CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ2hlY2tGcmFtZVNlY3VyaXR5In0pIHsKICAgICAgICAgICAgICAg ICAgICAgJGltcGxJbmNsdWRlc3siRG9jdW1lbnQuaCJ9ID0gMTsKICAgICAgICAgICAgICAgICAg ICAgJGltcGxJbmNsdWRlc3siSlNET01CaW5kaW5nLmgifSA9IDE7Ci0gICAgICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICRpbXBsQ2xhc3NOYW1lKiBpbXAgPSBzdGF0aWNf Y2FzdDwkaW1wbENsYXNzTmFtZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKLSAgICAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuIGNoZWNrTm9kZVNlY3Vy aXR5KGV4ZWMsIGltcC0+Y29udGVudERvY3VtZW50KCkpID8gIiAuIE5hdGl2ZVRvSlNWYWx1ZSgk YXR0cmlidXRlLT5zaWduYXR1cmUsIDAsICRpbXBsQ2xhc3NOYW1lLCAiaW1wLT4kaW1wbEdldHRl ckZ1bmN0aW9uTmFtZSgpIiwgImNhc3RlZFRoaXMiKSAuICIgOiBqc1VuZGVmaW5lZCgpO1xuIik7 CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICRpbXBsQ2xhc3NO YW1lKiBpbXBsID0gc3RhdGljX2Nhc3Q8JGltcGxDbGFzc05hbWUqPihjYXN0ZWRUaGlzLT5pbXBs KCkpO1xuIik7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJl dHVybiBjaGVja05vZGVTZWN1cml0eShleGVjLCBpbXBsLT5jb250ZW50RG9jdW1lbnQoKSkgPyAi IC4gTmF0aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwgMCwgJGltcGxDbGFzc05h bWUsICJpbXBsLT4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZSgpIiwgImNhc3RlZFRoaXMiKSAuICIg OiBqc1VuZGVmaW5lZCgpO1xuIik7CiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJHR5cGUgZXEg IkV2ZW50TGlzdGVuZXIiKSB7CiAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkV2 ZW50TGlzdGVuZXIuaCJ9ID0gMTsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgVU5VU0VEX1BBUkFNKGV4ZWMpO1xuIik7Ci0gICAgICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgICRpbXBsQ2xhc3NOYW1lKiBpbXAgPSBzdGF0aWNfY2FzdDwk aW1wbENsYXNzTmFtZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKLSAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVy ID0gaW1wLT4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZSgpKSB7XG4iKTsKKyAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxDbGFzc05hbWUqIGltcGwgPSBzdGF0 aWNfY2FzdDwkaW1wbENsYXNzTmFtZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKKyAgICAg ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKEV2ZW50TGlzdGVuZXIq IGxpc3RlbmVyID0gaW1wbC0+JGltcGxHZXR0ZXJGdW5jdGlvbk5hbWUoKSkge1xuIik7CiAgICAg ICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICBpZiAoY29uc3QgSlNF dmVudExpc3RlbmVyKiBqc0xpc3RlbmVyID0gSlNFdmVudExpc3RlbmVyOjpjYXN0KGxpc3RlbmVy KSkge1xuIik7CiAgICAgICAgICAgICAgICAgICAgIGlmICgkaW1wbENsYXNzTmFtZSBlcSAiRG9j dW1lbnQiIHx8ICRpbXBsQ2xhc3NOYW1lIGVxICJXb3JrZXJDb250ZXh0IiB8fCAkaW1wbENsYXNz TmFtZSBlcSAiU2hhcmVkV29ya2VyQ29udGV4dCIgfHwgJGltcGxDbGFzc05hbWUgZXEgIkRlZGlj YXRlZFdvcmtlckNvbnRleHQiKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgIiAgICAgICAgICAgIGlmIChKU09iamVjdCoganNGdW5jdGlvbiA9IGpzTGlzdGVu ZXItPmpzRnVuY3Rpb24oaW1wKSlcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgICAgICAgICBpZiAoSlNPYmplY3QqIGpzRnVuY3Rpb24gPSBqc0xp c3RlbmVyLT5qc0Z1bmN0aW9uKGltcGwpKVxuIik7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAg ICAgIGlmIChKU09iamVjdCoganNGdW5jdGlvbiA9IGpzTGlzdGVuZXItPmpzRnVuY3Rpb24oaW1w LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpKVxuIik7CisgICAgICAgICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgICAgIGlmIChKU09iamVjdCoganNGdW5jdGlv biA9IGpzTGlzdGVuZXItPmpzRnVuY3Rpb24oaW1wbC0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp KSlcbiIpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgICAgICAgICAgICAgIHJldHVybiBqc0Z1bmN0aW9uO1xuIik7CiAg ICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICB9XG4iKTsKQEAg LTE3ODcsMTEgKzE3ODcsMTEgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAg ICAgICAgICAgICAgaWYgKCRzdmdMaXN0UHJvcGVydHlUeXBlKSB7CiAgICAgICAgICAgICAgICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBKU1ZhbHVlIHJlc3VsdCA9ICAiIC4gTmF0 aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwgMCwgJGltcGxDbGFzc05hbWUsICJj YXN0ZWRUaGlzLT5pbXBsKCktPiRpbXBsR2V0dGVyRnVuY3Rpb25OYW1lKCkiLCAiY2FzdGVkVGhp cyIpIC4gIjtcbiIpOwogICAgICAgICAgICAgICAgICAgICB9IGVsc2lmICgkc3ZnUHJvcGVydHlP ckxpc3RQcm9wZXJ0eVR5cGUpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCAiICAgICRzdmdQcm9wZXJ0eU9yTGlzdFByb3BlcnR5VHlwZSYgaW1wID0gY2FzdGVk VGhpcy0+aW1wbCgpLT5wcm9wZXJ0eVJlZmVyZW5jZSgpO1xuIik7CisgICAgICAgICAgICAgICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAkc3ZnUHJvcGVydHlPckxpc3RQcm9wZXJ0 eVR5cGUmIGltcGwgPSBjYXN0ZWRUaGlzLT5pbXBsKCktPnByb3BlcnR5UmVmZXJlbmNlKCk7XG4i KTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkc3ZnUHJvcGVydHlPckxpc3RQcm9wZXJ0 eVR5cGUgZXEgImZsb2F0IikgeyAjIFNwZWNpYWwgY2FzZSBmb3IgSlNTVkdOdW1iZXIKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBKU1ZhbHVlIHJl c3VsdCA9ICAiIC4gTmF0aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwgMCwgJGlt cGxDbGFzc05hbWUsICJpbXAiLCAiY2FzdGVkVGhpcyIpIC4gIjtcbiIpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEpTVmFsdWUgcmVzdWx0ID0g ICIgLiBOYXRpdmVUb0pTVmFsdWUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLCAwLCAkaW1wbENsYXNz TmFtZSwgImltcGwiLCAiY2FzdGVkVGhpcyIpIC4gIjtcbiIpOwogICAgICAgICAgICAgICAgICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICBKU1ZhbHVlIHJlc3VsdCA9ICAiIC4gTmF0aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1 dGUtPnNpZ25hdHVyZSwgMCwgJGltcGxDbGFzc05hbWUsICJpbXAuJGltcGxHZXR0ZXJGdW5jdGlv bk5hbWUoKSIsICJjYXN0ZWRUaGlzIikgLiAiO1xuIik7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgSlNWYWx1ZSByZXN1bHQgPSAgIiAuIE5hdGl2 ZVRvSlNWYWx1ZSgkYXR0cmlidXRlLT5zaWduYXR1cmUsIDAsICRpbXBsQ2xhc3NOYW1lLCAiaW1w bC4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZSgpIiwgImNhc3RlZFRoaXMiKSAuICI7XG4iKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIG15ICgkZnVuY3Rpb25OYW1lLCBAYXJndW1lbnRzKSA9ICRj b2RlR2VuZXJhdG9yLT5HZXR0ZXJFeHByZXNzaW9uKFwlaW1wbEluY2x1ZGVzLCAkaW50ZXJmYWNl TmFtZSwgJGF0dHJpYnV0ZSk7CkBAIC0xNzk5LDEzICsxNzk5LDEzIEBAIHN1YiBHZW5lcmF0ZUlt cGxlbWVudGF0aW9uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXkgJGltcGxlbWVudGVk QnkgPSAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJbXBsZW1l bnRlZEJ5In07CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGltcGxJbmNsdWRlc3siJHtp bXBsZW1lbnRlZEJ5fS5oIn0gPSAxOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICRmdW5j dGlvbk5hbWUgPSAiJHtpbXBsZW1lbnRlZEJ5fTo6JHtmdW5jdGlvbk5hbWV9IjsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsICJpbXAiKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNoaWZ0KEBhcmd1bWVudHMsICJpbXBsIik7CiAgICAgICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICRm dW5jdGlvbk5hbWUgPSAiaW1wLT4ke2Z1bmN0aW9uTmFtZX0iOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICRmdW5jdGlvbk5hbWUgPSAiaW1wbC0+JHtmdW5jdGlvbk5hbWV9IjsKICAgICAg ICAgICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgICAgICAgICAgbXkgJGpzVHlw ZSA9IE5hdGl2ZVRvSlNWYWx1ZSgkYXR0cmlidXRlLT5zaWduYXR1cmUsIDAsICRpbXBsQ2xhc3NO YW1lLCAiJHtmdW5jdGlvbk5hbWV9KCIgLiBqb2luKCIsICIsIEBhcmd1bWVudHMpIC4gIikiLCAi Y2FzdGVkVGhpcyIpOwotICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgJGltcGxDbGFzc05hbWUqIGltcCA9IHN0YXRpY19jYXN0PCRpbXBsQ2xhc3NOYW1lKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTtcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgJGltcGxDbGFzc05hbWUqIGltcGwgPSBzdGF0aWNfY2FzdDwkaW1w bENsYXNzTmFtZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIGlmICgkY29kZUdlbmVyYXRvci0+SXNTVkdBbmltYXRlZFR5cGUoJHR5cGUpKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgUmVmUHRy PCR0eXBlPiBvYmogPSAkanNUeXBlO1xuIik7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgSlNWYWx1ZSByZXN1bHQgPSAgdG9KUyhleGVjLCBjYXN0 ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgb2JqLmdldCgpKTtcbiIpOwpAQCAtMTgyMCwxMSArMTgy MCwxMSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwO1xuIik7ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAg ICAgaWYgKCRzdmdQcm9wZXJ0eU9yTGlzdFByb3BlcnR5VHlwZSkgewotICAgICAgICAgICAgICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHN2Z1Byb3BlcnR5T3JMaXN0UHJvcGVy dHlUeXBlIGltcCgqY2FzdGVkVGhpcy0+aW1wbCgpKTtcbiIpOwotICAgICAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9ICIgLiBO YXRpdmVUb0pTVmFsdWUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLCAwLCAkaW1wbENsYXNzTmFtZSwg ImltcC4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZShlYykiLCAiY2FzdGVkVGhpcyIpIC4gIjtcbiIp OworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHN2Z1By b3BlcnR5T3JMaXN0UHJvcGVydHlUeXBlIGltcGwoKmNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEpTQzo6SlNW YWx1ZSByZXN1bHQgPSAiIC4gTmF0aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwg MCwgJGltcGxDbGFzc05hbWUsICJpbXBsLiRpbXBsR2V0dGVyRnVuY3Rpb25OYW1lKGVjKSIsICJj YXN0ZWRUaGlzIikgLiAiO1xuIik7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAkaW1wbENsYXNzTmFt ZSogaW1wID0gc3RhdGljX2Nhc3Q8JGltcGxDbGFzc05hbWUqPihjYXN0ZWRUaGlzLT5pbXBsKCkp O1xuIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBK U0M6OkpTVmFsdWUgcmVzdWx0ID0gIiAuIE5hdGl2ZVRvSlNWYWx1ZSgkYXR0cmlidXRlLT5zaWdu YXR1cmUsIDAsICRpbXBsQ2xhc3NOYW1lLCAiaW1wLT4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZShl YykiLCAiY2FzdGVkVGhpcyIpIC4gIjtcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJGltcGxDbGFzc05hbWUqIGltcGwgPSBzdGF0aWNfY2FzdDwk aW1wbENsYXNzTmFtZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIEpTQzo6SlNWYWx1ZSByZXN1bHQgPSAi IC4gTmF0aXZlVG9KU1ZhbHVlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSwgMCwgJGltcGxDbGFzc05h bWUsICJpbXBsLT4kaW1wbEdldHRlckZ1bmN0aW9uTmFtZShlYykiLCAiY2FzdGVkVGhpcyIpIC4g IjtcbiIpOwogICAgICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgc2V0RE9NRXhjZXB0aW9uKGV4ZWMsIGVjKTtcbiIpOwpAQCAt MTkyOCw4ICsxOTI4LDggQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAg ICAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJKU0NDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJDdXN0b21TZXR0ZXIifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJKU0NDdXN0b21TZXR0ZXIifSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJ bXBsZW1lbnRlZEJ5In0pIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgJHtjbGFzc05hbWV9KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8 JHtjbGFzc05hbWV9Kj4odGhpc09iamVjdCk7XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHtpbnRlcmZhY2VOYW1lfSogaW1wID0g c3RhdGljX2Nhc3Q8JHtpbnRlcmZhY2VOYW1lfSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg Y2FzdGVkVGhpcy0+c2V0JGltcGxTZXR0ZXJGdW5jdGlvbk5hbWUoaW1wLCBleGVjLCB2YWx1ZSk7 XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgJHtpbnRlcmZhY2VOYW1lfSogaW1wbCA9IHN0YXRpY19jYXN0PCR7aW50ZXJmYWNlTmFt ZX0qPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGNhc3RlZFRoaXMtPnNldCRpbXBsU2V0dGVy RnVuY3Rpb25OYW1lKGltcGwsIGV4ZWMsIHZhbHVlKTtcbiIpOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgIHN0YXRpY19jYXN0PCRjbGFzc05hbWUqPih0aGlzT2JqZWN0KS0+ c2V0JGltcGxTZXR0ZXJGdW5jdGlvbk5hbWUoZXhlYywgdmFsdWUpO1xuIik7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfQpAQCAtMTk0MSwxMCArMTk0MSwxMCBAQCBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkd2luZG93RXZl bnRMaXN0ZW5lcikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgIiAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gY2FzdGVkVGhp cy0+Z2xvYmFsT2JqZWN0KCk7XG4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGltcGxD bGFzc05hbWUqIGltcCA9IHN0YXRpY19jYXN0PCRpbXBsQ2xhc3NOYW1lKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTtcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICRpbXBsQ2xhc3NOYW1lKiBpbXBsID0gc3RhdGljX2Nhc3Q8JGltcGxDbGFzc05h bWUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKCgoJGludGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIpIG9yICgkaW50ZXJmYWNlTmFt ZSBlcSAiV29ya2VyQ29udGV4dCIpKSBhbmQgJG5hbWUgZXEgIm9uZXJyb3IiKSB7CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkpTRXJyb3JIYW5kbGVyLmgi fSA9IDE7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIGltcC0+c2V0JGltcGxTZXR0ZXJGdW5jdGlvbk5hbWUoY3JlYXRlSlNFcnJvckhhbmRs ZXIoZXhlYywgdmFsdWUsIHRoaXNPYmplY3QpKTtcbiIpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpbXBsLT5zZXQkaW1wbFNldHRlckZ1 bmN0aW9uTmFtZShjcmVhdGVKU0Vycm9ySGFuZGxlcihleGVjLCB2YWx1ZSwgdGhpc09iamVjdCkp O1xuIik7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIEdlbmVyYXRlQXR0cmlidXRl RXZlbnRMaXN0ZW5lckNhbGwoJGNsYXNzTmFtZSwgJGltcGxTZXR0ZXJGdW5jdGlvbk5hbWUsICR3 aW5kb3dFdmVudExpc3RlbmVyKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQpAQCAt MTk2OSw3ICsxOTY5LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBzdGF0aWNfY2FzdDwkY2xh c3NOYW1lKj4odGhpc09iamVjdCktPnB1dERpcmVjdChleGVjLT5nbG9iYWxEYXRhKCksIElkZW50 aWZpZXIoZXhlYywgXCIkbmFtZVwiKSwgdmFsdWUpO1xuIik7CiAgICAgICAgICAgICAgICAgICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICRjbGFzc05hbWUqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDwkY2xhc3NOYW1l Kj4odGhpc09iamVjdCk7XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIiAgICAkaW1wbFR5cGUqIGltcCA9IHN0YXRpY19jYXN0PCRpbXBsVHlwZSo+ KGNhc3RlZFRoaXMtPmltcGwoKSk7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIiAgICAkaW1wbFR5cGUqIGltcGwgPSBzdGF0aWNfY2FzdDwkaW1w bFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIik7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7XG4iKSBp ZiBAeyRhdHRyaWJ1dGUtPnNldHRlckV4Y2VwdGlvbnN9OwogCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIyBJZiB0aGUgIlN0cmljdFR5cGVDaGVja2luZyIgZXh0ZW5kZWQgYXR0cmlidXRl IGlzIHByZXNlbnQsIGFuZCB0aGUgYXR0cmlidXRlJ3MgdHlwZSBpcyBhbgpAQCAtMTk5MiwxNyAr MTk5MiwxNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG15ICRuYXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkYXR0cmlidXRlLT5z aWduYXR1cmUsICJ2YWx1ZSIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkc3Zn UHJvcGVydHlPckxpc3RQcm9wZXJ0eVR5cGUpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKCRzdmdQcm9wZXJ0eVR5cGUpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmIChpbXAtPnJvbGUoKSA9PSBBbmlt VmFsUm9sZSkge1xuIik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICBpZiAoaW1wbC0+cm9sZSgpID09IEFuaW1WYWxSb2xlKSB7XG4i KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURf RVJSKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1w bENvbnRlbnQsICIgICAgICAgIHJldHVybjtcbiIpOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgfVxuIik7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAkaW1wbEluY2x1ZGVzeyJFeGNlcHRpb25Db2RlLmgifSA9 IDE7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHN2Z1Byb3BlcnR5T3JMaXN0 UHJvcGVydHlUeXBlJiBwb2RJbXAgPSBpbXAtPnByb3BlcnR5UmVmZXJlbmNlKCk7XG4iKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJHN2 Z1Byb3BlcnR5T3JMaXN0UHJvcGVydHlUeXBlJiBwb2RJbXBsID0gaW1wbC0+cHJvcGVydHlSZWZl cmVuY2UoKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJHN2Z1By b3BlcnR5T3JMaXN0UHJvcGVydHlUeXBlIGVxICJmbG9hdCIpIHsgIyBTcGVjaWFsIGNhc2UgZm9y IEpTU1ZHTnVtYmVyCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIiAgICBwb2RJbXAgPSAkbmF0aXZlVmFsdWU7XG4iKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHBvZEltcGwg PSAkbmF0aXZlVmFsdWU7XG4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgIHBvZEltcC5zZXQkaW1wbFNldHRlckZ1bmN0aW9uTmFtZSgkbmF0aXZlVmFsdWUi KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIHBvZEltcGwuc2V0JGltcGxTZXR0ZXJGdW5jdGlvbk5hbWUoJG5hdGl2ZVZhbHVlIik7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwg IiwgZWMiKSBpZiBAeyRhdHRyaWJ1dGUtPnNldHRlckV4Y2VwdGlvbnN9OwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIpO1xuIik7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBz ZXRET01FeGNlcHRpb24oZXhlYywgZWMpO1xuIikgaWYgQHskYXR0cmlidXRlLT5zZXR0ZXJFeGNl cHRpb25zfTsKQEAgLTIwMTAsOSArMjAxMCw5IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9u CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoQHskYXR0cmlidXRlLT5z ZXR0ZXJFeGNlcHRpb25zfSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghZWMpXG4iKTsgCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIGlt cC0+Y29tbWl0Q2hhbmdlKCk7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgaW1wbC0+Y29tbWl0Q2hhbmdlKCk7 XG4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgaW1wLT5jb21taXRDaGFuZ2UoKTtcbiIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGltcGwtPmNvbW1pdENoYW5nZSgp O1xuIik7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9IGVs c2UgewpAQCAtMjAyMSwxMCArMjAyMSwxMCBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJl LT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSW1wbGVtZW50ZWRCeSJ9KSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBteSAkaW1wbGVtZW50ZWRCeSA9ICRhdHRyaWJ1dGUtPnNp Z25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkltcGxlbWVudGVkQnkifTsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IiR7aW1wbGVtZW50ZWRC eX0uaCJ9ID0gMTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2hpZnQo QGFyZ3VtZW50cywgImltcCIpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dW5zaGlmdChAYXJndW1lbnRzLCAiaW1wbCIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJGZ1bmN0aW9uTmFtZSA9ICIke2ltcGxlbWVudGVkQnl9Ojoke2Z1bmN0aW9uTmFt ZX0iOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJGZ1bmN0aW9uTmFtZSA9ICJpbXAtPiR7ZnVuY3Rp b25OYW1lfSI7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZnVuY3Rpb25O YW1lID0gImltcGwtPiR7ZnVuY3Rpb25OYW1lfSI7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAYXJndW1lbnRz LCAiZWMiKSBpZiBAeyRhdHRyaWJ1dGUtPnNldHRlckV4Y2VwdGlvbnN9OwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAke2Z1bmN0aW9uTmFt ZX0oIiAuIGpvaW4oIiwgIiwgQGFyZ3VtZW50cykgLiAiKTtcbiIpOwpAQCAtMjE0NSwxMyArMjE0 NSwxMyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgaWYgKCRpc0N1 c3RvbSkgewogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUoY2FzdGVkVGhpcy0+IiAuICRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFt ZSAuICIoZXhlYykpO1xuIikgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKICAgICAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgJGlt cGxUeXBlKiBpbXAgPSBzdGF0aWNfY2FzdDwkaW1wbFR5cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkp O1xuIikgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGljKTsKKyAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICAkaW1wbFR5cGUqIGltcGwgPSBzdGF0aWNfY2FzdDwkaW1wbFR5 cGUqPihjYXN0ZWRUaGlzLT5pbXBsKCkpO1xuIikgdW5sZXNzICgkZnVuY3Rpb24tPmlzU3RhdGlj KTsKICAgICAgICAgICAgICAgICBpZiAoJHN2Z1Byb3BlcnR5VHlwZSBhbmQgISRmdW5jdGlvbi0+ aXNTdGF0aWMpIHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg aWYgKGltcC0+cm9sZSgpID09IEFuaW1WYWxSb2xlKSB7XG4iKTsKKyAgICAgICAgICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKGltcGwtPnJvbGUoKSA9PSBBbmltVmFsUm9s ZSkge1xuIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAg ICBzZXRET01FeGNlcHRpb24oZXhlYywgTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJSKTtcbiIp OwogICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTtcbiIpOwogICAgICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICB9XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgJHN2Z1Byb3BlcnR5VHlwZSYgcG9kSW1wID0gaW1wLT5wcm9w ZXJ0eVJlZmVyZW5jZSgpO1xuIik7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICRzdmdQcm9wZXJ0eVR5cGUmIHBvZEltcGwgPSBpbXBsLT5wcm9wZXJ0eVJlZmVy ZW5jZSgpO1xuIik7CiAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkV4Y2VwdGlv bkNvZGUuaCJ9ID0gMTsKICAgICAgICAgICAgICAgICB9CiAKQEAgLTIxNjIsNyArMjE2Miw3IEBA IHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICAgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi U1ZHQ2hlY2tTZWN1cml0eURvY3VtZW50In0gYW5kICEkZnVuY3Rpb24tPmlzU3RhdGljKSB7Ci0g ICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghY2hlY2tOb2Rl U2VjdXJpdHkoZXhlYywgaW1wLT5nZXRTVkdEb2N1bWVudCgiIC4gKEB7JGZ1bmN0aW9uLT5yYWlz ZXNFeGNlcHRpb25zfSA/ICJlYyIgOiAiIikgLiIpKSlcbiIpOworICAgICAgICAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpZiAoIWNoZWNrTm9kZVNlY3VyaXR5KGV4ZWMsIGlt cGwtPmdldFNWR0RvY3VtZW50KCIgLiAoQHskZnVuY3Rpb24tPnJhaXNlc0V4Y2VwdGlvbnN9ID8g ImVjIiA6ICIiKSAuIikpKVxuIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpO1xuIik7 CiAgICAgICAgICAgICAgICAgICAgICRpbXBsSW5jbHVkZXN7IkpTRE9NQmluZGluZy5oIn0gPSAx OwogICAgICAgICAgICAgICAgIH0KQEAgLTI0MTksOSArMjQxOSw5IEBAIHN1YiBHZW5lcmF0ZVBh cmFtZXRlcnNDaGVjawogICAgIGlmICgkZnVuY3Rpb24tPmlzU3RhdGljKSB7CiAgICAgICAgICRm dW5jdGlvbkJhc2UgPSAiJHtpbXBsQ2xhc3NOYW1lfTo6IjsKICAgICB9IGVsc2lmICgkc3ZnUHJv cGVydHlPckxpc3RQcm9wZXJ0eVR5cGUgYW5kICEkc3ZnTGlzdFByb3BlcnR5VHlwZSkgewotICAg ICAgICAkZnVuY3Rpb25CYXNlID0gInBvZEltcC4iOworICAgICAgICAkZnVuY3Rpb25CYXNlID0g InBvZEltcGwuIjsKICAgICB9IGVsc2UgewotICAgICAgICAkZnVuY3Rpb25CYXNlID0gImltcC0+ IjsKKyAgICAgICAgJGZ1bmN0aW9uQmFzZSA9ICJpbXBsLT4iOwogICAgIH0KICAgICBteSAkZnVu Y3Rpb25TdHJpbmcgPSAiJGZ1bmN0aW9uQmFzZSRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSgi OwogCkBAIC0yNzYwLDkgKzI3NjAsOSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1bmN0 aW9uQ2FsbCgpCiAgICAgICAgIGlmICgkc3ZnUHJvcGVydHlUeXBlIGFuZCAhJGZ1bmN0aW9uLT5p c1N0YXRpYykgewogICAgICAgICAgICAgaWYgKEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25z fSkgewogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAkaW5kZW50IC4gImlmICgh ZWMpXG4iKTsgCi0gICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICRpbmRlbnQgLiAi ICAgIGltcC0+Y29tbWl0Q2hhbmdlKCk7XG4iKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgJGluZGVudCAuICIgICAgaW1wbC0+Y29tbWl0Q2hhbmdlKCk7XG4iKTsKICAgICAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICRpbmRl bnQgLiAiaW1wLT5jb21taXRDaGFuZ2UoKTtcbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAkaW5kZW50IC4gImltcGwtPmNvbW1pdENoYW5nZSgpO1xuIik7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KIApAQCAtMzAzNCw4ICszMDM0LDggQEAgc3ViIE5hdGl2ZVRvSlNW YWx1ZQogICAgICAgICBteSAkdGVhck9mZlR5cGUgPSAkY29kZUdlbmVyYXRvci0+R2V0U1ZHVHlw ZU5lZWRpbmdUZWFyT2ZmKCR0eXBlKTsKICAgICAgICAgaWYgKCRjb2RlR2VuZXJhdG9yLT5Jc1NW R1R5cGVXaXRoV3JpdGFibGVQcm9wZXJ0aWVzTmVlZGluZ1RlYXJPZmYoJHR5cGUpIGFuZCAkaW5G dW5jdGlvbkNhbGwgZXEgMCBhbmQgbm90IGRlZmluZWQgJHNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkltbXV0YWJsZSJ9KSB7CiAgICAgICAgICAgICBteSAkZ2V0dGVyID0gJHZhbHVl OwotICAgICAgICAgICAgJGdldHRlciA9fiBzL2ltcFwuLy87Ci0gICAgICAgICAgICAkZ2V0dGVy ID1+IHMvaW1wLT4vLzsKKyAgICAgICAgICAgICRnZXR0ZXIgPX4gcy9pbXBsXC4vLzsKKyAgICAg ICAgICAgICRnZXR0ZXIgPX4gcy9pbXBsLT4vLzsKICAgICAgICAgICAgICRnZXR0ZXIgPX4gcy9c KFwpLy87CiAgICAgICAgICAgICBteSAkdXBkYXRlTWV0aG9kID0gIiYke2ltcGxDbGFzc05hbWV9 Ojp1cGRhdGUiIC4gJGNvZGVHZW5lcmF0b3ItPldLX3VjZmlyc3QoJGdldHRlcik7CiAKQEAgLTMw NTQsMTAgKzMwNTQsMTAgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiU1ZHU3RhdGljUHJvcGVydHlU ZWFyT2ZmLmgiLCAkY29uZGl0aW9uYWwpOwogICAgICAgICAgICAgICAgICR0ZWFyT2ZmVHlwZSA9 fiBzL1NWR1Byb3BlcnR5VGVhck9mZjwvU1ZHU3RhdGljUHJvcGVydHlUZWFyT2ZmPCRpbXBsQ2xh c3NOYW1lLCAvOwotICAgICAgICAgICAgICAgICR2YWx1ZSA9ICIke3RlYXJPZmZUeXBlfTo6Y3Jl YXRlKGltcCwgJHZhbHVlLCAkdXBkYXRlTWV0aG9kKSI7CisgICAgICAgICAgICAgICAgJHZhbHVl ID0gIiR7dGVhck9mZlR5cGV9OjpjcmVhdGUoaW1wbCwgJHZhbHVlLCAkdXBkYXRlTWV0aG9kKSI7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzaWYgKCR0ZWFyT2ZmVHlwZSA9fiAvU1ZHU3Rh dGljTGlzdFByb3BlcnR5VGVhck9mZi8pIHsKLSAgICAgICAgICAgICR2YWx1ZSA9ICIke3RlYXJP ZmZUeXBlfTo6Y3JlYXRlKGltcCwgJHZhbHVlKSI7CisgICAgICAgICAgICAkdmFsdWUgPSAiJHt0 ZWFyT2ZmVHlwZX06OmNyZWF0ZShpbXBsLCAkdmFsdWUpIjsKICAgICAgICAgfSBlbHNpZiAobm90 ICR0ZWFyT2ZmVHlwZSA9fiAvU1ZHKFBvaW50fFBhdGhTZWcpTGlzdC8pIHsKICAgICAgICAgICAg ICR2YWx1ZSA9ICIke3RlYXJPZmZUeXBlfTo6Y3JlYXRlKCR2YWx1ZSkiOwogICAgICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNGbG9h dDY0QXJyYXkuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT RmxvYXQ2NEFycmF5LmNwcAppbmRleCA4Mjc3NDc4NjQ5NTY5NGM4MTcwMjY3NzM0M2I4M2I5YjIw YmUyMTA0Li5lMmFhYmNkMzVmZGM0MTQ3ZWU1MDM1YWJlZjBiMDNjMDU1OTRlMTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNGbG9hdDY0QXJy YXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU0Zs b2F0NjRBcnJheS5jcHAKQEAgLTIzMiwxNCArMjMyLDE0IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNGbG9hdDY0QXJyYXlQcm90b3R5cGVGdW5jdGlvbkZvbyhFeGVjU3RhdGUqIGV4 ZWMpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTRmxvYXQ2 NEFycmF5KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNGbG9hdDY0QXJyYXkqPihhc09iamVj dCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMs ICZKU0Zsb2F0NjRBcnJheTo6c19pbmZvKTsKLSAgICBGbG9hdDY0QXJyYXkqIGltcCA9IHN0YXRp Y19jYXN0PEZsb2F0NjRBcnJheSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgRmxvYXQ2NEFy cmF5KiBpbXBsID0gc3RhdGljX2Nhc3Q8RmxvYXQ2NEFycmF5Kj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRo cm93Vk1FcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1l bnRzIikpOwogICAgIEZsb2F0MzJBcnJheSogYXJyYXkodG9GbG9hdDMyQXJyYXkoTUFZQkVfTUlT U0lOR19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5kZWZpbmVkKSkpOwogICAgIGlmIChl eGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1Vu ZGVmaW5lZCgpKTsKIAotICAgIEpTQzo6SlNWYWx1ZSByZXN1bHQgPSB0b0pTKGV4ZWMsIGNhc3Rl ZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBXVEY6OmdldFB0cihpbXAtPmZvbyhhcnJheSkpKTsKKyAg ICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0gdG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmpl Y3QoKSwgV1RGOjpnZXRQdHIoaW1wbC0+Zm9vKGFycmF5KSkpOwogICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUocmVzdWx0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEV2ZW50Q29uc3RydWN0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEV2ZW50Q29uc3RydWN0b3IuY3Bw CmluZGV4IGY4MGI2NDk3MzFkYTMzZjUzNmZmOWNlNzEwMWNiMWZmYTU0YjJiYmUuLjBlYTQ5ZTll ODcxMjNlMzc3OWJhMTZkMTEwZDA3Yjg0MTQ2MjJlNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RFdmVudENvbnN0cnVjdG9yLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0RXZlbnRD b25zdHJ1Y3Rvci5jcHAKQEAgLTE3NCw4ICsxNzQsOCBAQCBKU1ZhbHVlIGpzVGVzdEV2ZW50Q29u c3RydWN0b3JBdHRyMShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElk ZQogewogICAgIEpTVGVzdEV2ZW50Q29uc3RydWN0b3IqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2Fz dDxKU1Rlc3RFdmVudENvbnN0cnVjdG9yKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVT RURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdEV2ZW50Q29uc3RydWN0b3IqIGltcCA9IHN0YXRpY19j YXN0PFRlc3RFdmVudENvbnN0cnVjdG9yKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1Zh bHVlIHJlc3VsdCA9IGpzU3RyaW5nKGV4ZWMsIGltcC0+YXR0cjEoKSk7CisgICAgVGVzdEV2ZW50 Q29uc3RydWN0b3IqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0RXZlbnRDb25zdHJ1Y3Rvcio+KGNh c3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBp bXBsLT5hdHRyMSgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC0xODQsOCArMTg0LDgg QEAgSlNWYWx1ZSBqc1Rlc3RFdmVudENvbnN0cnVjdG9yQXR0cjIoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIHNsb3RCYXNlLCBjb25zdCBJZGUKIHsKICAgICBKU1Rlc3RFdmVudENvbnN0cnVjdG9y KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0RXZlbnRDb25zdHJ1Y3Rvcio+KGFzT2Jq ZWN0KHNsb3RCYXNlKSk7CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RFdmVudENv bnN0cnVjdG9yKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0RXZlbnRDb25zdHJ1Y3Rvcio+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAt PmF0dHIyKCkpOworICAgIFRlc3RFdmVudENvbnN0cnVjdG9yKiBpbXBsID0gc3RhdGljX2Nhc3Q8 VGVzdEV2ZW50Q29uc3RydWN0b3IqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUg cmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+YXR0cjIoKSk7CiAgICAgcmV0dXJuIHJlc3Vs dDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0pTL0pTVGVzdEludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0SW50ZXJmYWNlLmNwcAppbmRleCBkYWMyOTI4ODMwNThmOWQyOGRhNzk3 ZmM1ZjQ5OTJiNTc3ZTdjNDczLi5hYzg3ZDVlODE4NzRjZGQxNGVlZGYyMDk0ZDM3Y2E1Y2E1YzAy M2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMv SlNUZXN0SW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0SW50ZXJmYWNlLmNwcApAQCAtMTc3LDggKzE3Nyw4IEBAIEpTVmFsdWUg anNUZXN0SW50ZXJmYWNlU3RyMShFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNv bnN0IElkZW50aWZpZXImCiB7CiAgICAgSlNUZXN0SW50ZXJmYWNlKiBjYXN0ZWRUaGlzID0gc3Rh dGljX2Nhc3Q8SlNUZXN0SW50ZXJmYWNlKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVT RURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdEludGVyZmFjZSogaW1wID0gc3RhdGljX2Nhc3Q8VGVz dEludGVyZmFjZSo+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBq c1N0cmluZyhleGVjLCBUZXN0U3VwcGxlbWVudGFsOjpzdHIxKGltcCkpOworICAgIFRlc3RJbnRl cmZhY2UqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNlKj4oY2FzdGVkVGhpcy0+aW1w bCgpKTsKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IGpzU3RyaW5nKGV4ZWMsIFRlc3RTdXBwbGVtZW50 YWw6OnN0cjEoaW1wbCkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTE4OSw4ICsxODks OCBAQCBKU1ZhbHVlIGpzVGVzdEludGVyZmFjZVN0cjIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVl IHNsb3RCYXNlLCBjb25zdCBJZGVudGlmaWVyJgogewogICAgIEpTVGVzdEludGVyZmFjZSogY2Fz dGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdEludGVyZmFjZSo+KGFzT2JqZWN0KHNsb3RCYXNl KSk7CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RJbnRlcmZhY2UqIGltcCA9IHN0 YXRpY19jYXN0PFRlc3RJbnRlcmZhY2UqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFs dWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgVGVzdFN1cHBsZW1lbnRhbDo6c3RyMihpbXApKTsK KyAgICBUZXN0SW50ZXJmYWNlKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdEludGVyZmFjZSo+KGNh c3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBU ZXN0U3VwcGxlbWVudGFsOjpzdHIyKGltcGwpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBA IC0yMDAsOCArMjAwLDggQEAgSlNWYWx1ZSBqc1Rlc3RJbnRlcmZhY2VTdHIyKEV4ZWNTdGF0ZSog ZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllciYKIEpTVmFsdWUganNUZXN0 SW50ZXJmYWNlU3RyMyhFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElk ZW50aWZpZXImKQogewogICAgIEpTVGVzdEludGVyZmFjZSogY2FzdGVkVGhpcyA9IHN0YXRpY19j YXN0PEpTVGVzdEludGVyZmFjZSo+KGFzT2JqZWN0KHNsb3RCYXNlKSk7Ci0gICAgVGVzdEludGVy ZmFjZSogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdEludGVyZmFjZSo+KGNhc3RlZFRoaXMtPmltcGwo KSk7Ci0gICAgcmV0dXJuIGNhc3RlZFRoaXMtPnN0cjMoaW1wLCBleGVjKTsKKyAgICBUZXN0SW50 ZXJmYWNlKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdEludGVyZmFjZSo+KGNhc3RlZFRoaXMtPmlt cGwoKSk7CisgICAgcmV0dXJuIGNhc3RlZFRoaXMtPnN0cjMoaW1wbCwgZXhlYyk7CiB9CiAKICNl bmRpZgpAQCAtMjIzLDggKzIyMyw4IEBAIHZvaWQgSlNUZXN0SW50ZXJmYWNlOjpwdXQoSlNDZWxs KiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlCiB2b2lkIHNl dEpTVGVzdEludGVyZmFjZVN0cjIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVj dCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RJbnRlcmZhY2UqIGNhc3RlZFRoaXMgPSBz dGF0aWNfY2FzdDxKU1Rlc3RJbnRlcmZhY2UqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0SW50ZXJm YWNlKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNlKj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKLSAgICBUZXN0U3VwcGxlbWVudGFsOjpzZXRTdHIyKGltcCwgdXN0cmluZ1RvU3RyaW5nKHZh bHVlLmlzRW1wdHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4ZWMpKSk7CisgICAg VGVzdEludGVyZmFjZSogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RJbnRlcmZhY2UqPihjYXN0ZWRU aGlzLT5pbXBsKCkpOworICAgIFRlc3RTdXBwbGVtZW50YWw6OnNldFN0cjIoaW1wbCwgdXN0cmlu Z1RvU3RyaW5nKHZhbHVlLmlzRW1wdHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4 ZWMpKSk7CiB9CiAKICNlbmRpZgpAQCAtMjMzLDggKzIzMyw4IEBAIHZvaWQgc2V0SlNUZXN0SW50 ZXJmYWNlU3RyMihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVl IHZhbHVlCiB2b2lkIHNldEpTVGVzdEludGVyZmFjZVN0cjMoRXhlY1N0YXRlKiBleGVjLCBKU09i amVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RJbnRlcmZhY2Uq IGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RJbnRlcmZhY2UqPih0aGlzT2JqZWN0KTsK LSAgICBUZXN0SW50ZXJmYWNlKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNlKj4oY2Fz dGVkVGhpcy0+aW1wbCgpKTsKLSAgICBjYXN0ZWRUaGlzLT5zZXRTdHIzKGltcCwgZXhlYywgdmFs dWUpOworICAgIFRlc3RJbnRlcmZhY2UqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0SW50ZXJmYWNl Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBjYXN0ZWRUaGlzLT5zZXRTdHIzKGltcGwsIGV4 ZWMsIHZhbHVlKTsKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0TWVkaWFRdWVyeUxp c3RMaXN0ZW5lci5jcHAKaW5kZXggMWMzNGJkYjQ1ZWViYjRmNjg0MGJhMmFiZTA4OGQ0YTQzNjcw ZjI1MC4uZmY2ZWYxNmVjODM5NTUzYzVmMzJmYzc5YzlhNjk3MTdjNjc2YWYwOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE1lZGlhUXVl cnlMaXN0TGlzdGVuZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9KUy9KU1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmNwcApAQCAtMTU3LDEzICsxNTcs MTMgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RNZWRpYVF1ZXJ5TGlzdExp c3RlbmVyUHJvdG90eXBlRnVuY3Rpb25NZXRob2QKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBl RXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lciogY2FzdGVkVGhp cyA9IHN0YXRpY19jYXN0PEpTVGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXIqPihhc09iamVjdCh0 aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZK U1Rlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyOjpzX2luZm8pOwotICAgIFRlc3RNZWRpYVF1ZXJ5 TGlzdExpc3RlbmVyKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5l cio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXIq IGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcio+KGNhc3RlZFRo aXMtPmltcGwoKSk7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCiAgICAgICAg IHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5v dWdoIGFyZ3VtZW50cyIpKTsKICAgICBSZWZQdHI8TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcj4gbGlz dGVuZXIoTWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6Y3JlYXRlKFNjcmlwdFZhbHVlKGV4ZWMtPmds b2JhbERhdGEoKSwgTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5k ZWZpbmVkKSkpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaW1wLT5tZXRob2QobGlzdGVu ZXIpOworICAgIGltcGwtPm1ldGhvZChsaXN0ZW5lcik7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVu Y29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAppbmRleCBkMzA0ZjlkMDkwNDJjNTNk OWI4NDJkYjVlNGZmZGE2YmMxMTFlZjZhLi5lNWIyZjRlYWEzY2Q2Y2RjZmYzNjk1MTQwM2M2ZDRm N2UyZWJhY2Q4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvSlMvSlNUZXN0T2JqLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0T2JqLmNwcApAQCAtMzI4LDggKzMyOCw4IEBAIEpTVmFsdWUganNUZXN0 T2JqUmVhZE9ubHlJbnRBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29u c3QgSWRlbnRpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNU ZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0g ICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwo KSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXAtPnJlYWRPbmx5SW50QXR0cigp KTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXBsLT5yZWFkT25seUlu dEF0dHIoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtMzM4LDggKzMzOCw4IEBAIEpT VmFsdWUganNUZXN0T2JqUmVhZE9ubHlTdHJpbmdBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1 ZSBzbG90QmFzZSwgY29uc3QgSWRlCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3Rh dGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFS QU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAt PnJlYWRPbmx5U3RyaW5nQXR0cigpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0 cmluZyhleGVjLCBpbXBsLT5yZWFkT25seVN0cmluZ0F0dHIoKSk7CiAgICAgcmV0dXJuIHJlc3Vs dDsKIH0KIApAQCAtMzQ4LDggKzM0OCw4IEBAIEpTVmFsdWUganNUZXN0T2JqUmVhZE9ubHlUZXN0 T2JqQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkCiB7CiAg ICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmpl Y3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1w ID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1 ZSByZXN1bHQgPSB0b0pTKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBXVEY6Omdl dFB0cihpbXAtPnJlYWRPbmx5VGVzdE9iakF0dHIoKSkpOworICAgIFRlc3RPYmoqIGltcGwgPSBz dGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBKU1ZhbHVlIHJl c3VsdCA9IHRvSlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRy KGltcGwtPnJlYWRPbmx5VGVzdE9iakF0dHIoKSkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK QEAgLTM1OCw4ICszNTgsOCBAQCBKU1ZhbHVlIGpzVGVzdE9ialNob3J0QXR0cihFeGVjU3RhdGUq IGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXImKQogewogICAgIEpTVGVz dE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RC YXNlKSk7CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0 ID0ganNOdW1iZXIoaW1wLT5zaG9ydEF0dHIoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0 ID0ganNOdW1iZXIoaW1wbC0+c2hvcnRBdHRyKCkpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK QEAgLTM2OCw4ICszNjgsOCBAQCBKU1ZhbHVlIGpzVGVzdE9ialVuc2lnbmVkU2hvcnRBdHRyKEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbgogewogICAgIEpTVGVz dE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RC YXNlKSk7CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0 ID0ganNOdW1iZXIoaW1wLT51bnNpZ25lZFNob3J0QXR0cigpKTsKKyAgICBUZXN0T2JqKiBpbXBs ID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1 ZSByZXN1bHQgPSBqc051bWJlcihpbXBsLT51bnNpZ25lZFNob3J0QXR0cigpKTsKICAgICByZXR1 cm4gcmVzdWx0OwogfQogCkBAIC0zNzgsOCArMzc4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpJbnRB dHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllciYp CiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4o YXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9i aiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAg SlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXAtPmludEF0dHIoKSk7CisgICAgVGVzdE9iaiog aW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpT VmFsdWUgcmVzdWx0ID0ganNOdW1iZXIoaW1wbC0+aW50QXR0cigpKTsKICAgICByZXR1cm4gcmVz dWx0OwogfQogCkBAIC0zODgsOCArMzg4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpMb25nTG9uZ0F0 dHIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zdCBJZGVudGlmaWUKIHsK ICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09i amVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2JqKiBp bXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1Zh bHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcC0+bG9uZ0xvbmdBdHRyKCkpOworICAgIFRlc3RPYmoq IGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBK U1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcGwtPmxvbmdMb25nQXR0cigpKTsKICAgICByZXR1 cm4gcmVzdWx0OwogfQogCkBAIC0zOTgsOCArMzk4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpVbnNp Z25lZExvbmdMb25nQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0 IEkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoq Pihhc09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0 T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAg ICBKU1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcC0+dW5zaWduZWRMb25nTG9uZ0F0dHIoKSk7 CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0ganNOdW1iZXIoaW1wbC0+dW5zaWduZWRMb25n TG9uZ0F0dHIoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNDA4LDggKzQwOCw4IEBA IEpTVmFsdWUganNUZXN0T2JqU3RyaW5nQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xv dEJhc2UsIGNvbnN0IElkZW50aWZpZXImCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0g c3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURf UEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNh c3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBp bXAtPnN0cmluZ0F0dHIoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RP YmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0ganNTdHJpbmco ZXhlYywgaW1wbC0+c3RyaW5nQXR0cigpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC00 MTgsOCArNDE4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpUZXN0T2JqQXR0cihFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXIKIHsKICAgICBKU1Rlc3RPYmoq IGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdChzbG90QmFzZSkp OwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2Fz dDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IHRv SlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcC0+dGVz dE9iakF0dHIoKSkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IHRvSlMoZXhlYywgY2Fz dGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcGwtPnRlc3RPYmpBdHRyKCkp KTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC00MjgsOCArNDI4LDggQEAgSlNWYWx1ZSBq c1Rlc3RPYmpYTUxPYmpBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29u c3QgSWRlbnRpZmllciYKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2Fz dDxKU1Rlc3RPYmoqPihhc09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVj KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IHRvSlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xv YmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcC0+eG1sT2JqQXR0cigpKSk7CisgICAgVGVzdE9i aiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAg IEpTVmFsdWUgcmVzdWx0ID0gdG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwg V1RGOjpnZXRQdHIoaW1wbC0+eG1sT2JqQXR0cigpKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K IApAQCAtNDM4LDggKzQzOCw4IEBAIEpTVmFsdWUganNUZXN0T2JqQ3JlYXRlKEV4ZWNTdGF0ZSog ZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllciYpCiB7CiAgICAgSlNUZXN0 T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJh c2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQg PSBqc0Jvb2xlYW4oaW1wLT5pc0NyZWF0ZSgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQg PSBqc0Jvb2xlYW4oaW1wbC0+aXNDcmVhdGUoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApA QCAtNDQ4LDggKzQ0OCw4IEBAIEpTVmFsdWUganNUZXN0T2JqUmVmbGVjdGVkU3RyaW5nQXR0cihF eGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkCiB7CiAgICAgSlNUZXN0 T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJh c2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQg PSBqc1N0cmluZyhleGVjLCBpbXAtPmdldEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJl ZmxlY3RlZHN0cmluZ2F0dHJBdHRyKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0ganNT dHJpbmcoZXhlYywgaW1wbC0+Z2V0QXR0cmlidXRlKFdlYkNvcmU6OkhUTUxOYW1lczo6cmVmbGVj dGVkc3RyaW5nYXR0ckF0dHIpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC00NTgsOCAr NDU4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpSZWZsZWN0ZWRJbnRlZ3JhbEF0dHIoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zdAogewogICAgIEpTVGVzdE9iaiogY2FzdGVk VGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RCYXNlKSk7CiAgICAg VU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RP YmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0ganNOdW1iZXIo aW1wLT5nZXRJbnRlZ3JhbEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZGlu dGVncmFsYXR0ckF0dHIpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9i aio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihp bXBsLT5nZXRJbnRlZ3JhbEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZGlu dGVncmFsYXR0ckF0dHIpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC00NjgsOCArNDY4 LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpSZWZsZWN0ZWRVbnNpZ25lZEludGVncmFsQXR0cihFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRo aXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdChzbG90QmFzZSkpOwogICAgIFVO VVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2Jq Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKHN0 ZDo6bWF4KDAsIGltcC0+Z2V0SW50ZWdyYWxBdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpy ZWZsZWN0ZWR1bnNpZ25lZGludGVncmFsYXR0ckF0dHIpKSk7CisgICAgVGVzdE9iaiogaW1wbCA9 IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUg cmVzdWx0ID0ganNOdW1iZXIoc3RkOjptYXgoMCwgaW1wbC0+Z2V0SW50ZWdyYWxBdHRyaWJ1dGUo V2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWR1bnNpZ25lZGludGVncmFsYXR0ckF0dHIpKSk7 CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNDc4LDggKzQ3OCw4IEBAIEpTVmFsdWUganNU ZXN0T2JqUmVmbGVjdGVkQm9vbGVhbkF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RC YXNlLCBjb25zdCBJCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8 SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7 Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmlt cGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc0Jvb2xlYW4oaW1wLT5oYXNBdHRyaWJ1dGUo V2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWRib29sZWFuYXR0ckF0dHIpKTsKKyAgICBUZXN0 T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Cisg ICAgSlNWYWx1ZSByZXN1bHQgPSBqc0Jvb2xlYW4oaW1wbC0+aGFzQXR0cmlidXRlKFdlYkNvcmU6 OkhUTUxOYW1lczo6cmVmbGVjdGVkYm9vbGVhbmF0dHJBdHRyKSk7CiAgICAgcmV0dXJuIHJlc3Vs dDsKIH0KIApAQCAtNDg4LDggKzQ4OCw4IEBAIEpTVmFsdWUganNUZXN0T2JqUmVmbGVjdGVkVVJM QXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50CiB7CiAg ICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmpl Y3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1w ID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1 ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAtPmdldFVSTEF0dHJpYnV0ZShXZWJDb3JlOjpI VE1MTmFtZXM6OnJlZmxlY3RlZHVybGF0dHJBdHRyKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0 YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVz dWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+Z2V0VVJMQXR0cmlidXRlKFdlYkNvcmU6OkhUTUxO YW1lczo6cmVmbGVjdGVkdXJsYXR0ckF0dHIpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBA IC00OTgsOCArNDk4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpSZWZsZWN0ZWROb25FbXB0eVVSTEF0 dHIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb24KIHsKICAgICBKU1Rlc3RP YmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdChzbG90QmFz ZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNf Y2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9 IGpzU3RyaW5nKGV4ZWMsIGltcC0+Z2V0Tm9uRW1wdHlVUkxBdHRyaWJ1dGUoV2ViQ29yZTo6SFRN TE5hbWVzOjpyZWZsZWN0ZWRub25lbXB0eXVybGF0dHJBdHRyKSk7CisgICAgVGVzdE9iaiogaW1w bCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFs dWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+Z2V0Tm9uRW1wdHlVUkxBdHRyaWJ1dGUo V2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWRub25lbXB0eXVybGF0dHJBdHRyKSk7CiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNTA4LDggKzUwOCw4IEBAIEpTVmFsdWUganNUZXN0T2Jq UmVmbGVjdGVkU3RyaW5nQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNv bnN0IElkCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0 T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAg VGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAtPmdldEF0dHJpYnV0ZShX ZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRTdHJpbmdBdHRyQXR0cikpOworICAgIFRl c3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsK KyAgICBKU1ZhbHVlIHJlc3VsdCA9IGpzU3RyaW5nKGV4ZWMsIGltcGwtPmdldEF0dHJpYnV0ZShX ZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRTdHJpbmdBdHRyQXR0cikpOwogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKQEAgLTUxOCw4ICs1MTgsOCBAQCBKU1ZhbHVlIGpzVGVzdE9ialJl ZmxlY3RlZEN1c3RvbUludGVncmFsQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJh c2UsCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2Jq Kj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVz dE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0g ICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXAtPmdldEludGVncmFsQXR0cmlidXRlKFdl YkNvcmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29udGVudEludGVncmFsQXR0ckF0dHIpKTsKKyAgICBU ZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXBsLT5nZXRJbnRlZ3JhbEF0dHJpYnV0 ZShXZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRJbnRlZ3JhbEF0dHJBdHRyKSk7CiAg ICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNTI4LDggKzUyOCw4IEBAIEpTVmFsdWUganNUZXN0 T2JqUmVmbGVjdGVkQ3VzdG9tQm9vbGVhbkF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNs b3RCYXNlLCBjCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNU ZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0g ICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwo KSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc0Jvb2xlYW4oaW1wLT5oYXNBdHRyaWJ1dGUoV2Vi Q29yZTo6SFRNTE5hbWVzOjpjdXN0b21Db250ZW50Qm9vbGVhbkF0dHJBdHRyKSk7CisgICAgVGVz dE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwor ICAgIEpTVmFsdWUgcmVzdWx0ID0ganNCb29sZWFuKGltcGwtPmhhc0F0dHJpYnV0ZShXZWJDb3Jl OjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRCb29sZWFuQXR0ckF0dHIpKTsKICAgICByZXR1cm4g cmVzdWx0OwogfQogCkBAIC01MzgsOCArNTM4LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpSZWZsZWN0 ZWRDdXN0b21VUkxBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QK IHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihh c09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2Jq KiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBK U1ZhbHVlIHJlc3VsdCA9IGpzU3RyaW5nKGV4ZWMsIGltcC0+Z2V0VVJMQXR0cmlidXRlKFdlYkNv cmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29udGVudFVSTEF0dHJBdHRyKSk7CisgICAgVGVzdE9iaiog aW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpT VmFsdWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+Z2V0VVJMQXR0cmlidXRlKFdlYkNv cmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29udGVudFVSTEF0dHJBdHRyKSk7CiAgICAgcmV0dXJuIHJl c3VsdDsKIH0KIApAQCAtNTQ4LDggKzU0OCw4IEBAIEpTVmFsdWUganNUZXN0T2JqUmVmbGVjdGVk Q3VzdG9tTm9uRW1wdHlVUkxBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzCiB7 CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNP YmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiog aW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNW YWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAtPmdldE5vbkVtcHR5VVJMQXR0cmlidXRl KFdlYkNvcmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29udGVudE5vbkVtcHR5VVJMQXR0ckF0dHIpKTsK KyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmlt cGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXBsLT5nZXROb25F bXB0eVVSTEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnROb25FbXB0 eVVSTEF0dHJBdHRyKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNTU4LDggKzU1OCw4 IEBAIEpTVmFsdWUganNUZXN0T2JqQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24oRXhlY1N0YXRlKiBl eGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlz ID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBFeGNl cHRpb25Db2RlIGVjID0gMDsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2Jq Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0ganNOdW1i ZXIoaW1wLT5hdHRyV2l0aEdldHRlckV4Y2VwdGlvbihlYykpOworICAgIFRlc3RPYmoqIGltcGwg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBKU0M6OkpT VmFsdWUgcmVzdWx0ID0ganNOdW1iZXIoaW1wbC0+YXR0cldpdGhHZXR0ZXJFeGNlcHRpb24oZWMp KTsKICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVybiByZXN1bHQ7CiB9 CkBAIC01NjksOCArNTY5LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpBdHRyV2l0aFNldHRlckV4Y2Vw dGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnMKIHsKICAgICBKU1Rl c3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdChzbG90 QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0 aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3Vs dCA9IGpzTnVtYmVyKGltcC0+YXR0cldpdGhTZXR0ZXJFeGNlcHRpb24oKSk7CisgICAgVGVzdE9i aiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAg IEpTVmFsdWUgcmVzdWx0ID0ganNOdW1iZXIoaW1wbC0+YXR0cldpdGhTZXR0ZXJFeGNlcHRpb24o KSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNTc5LDggKzU3OSw4IEBAIEpTVmFsdWUg anNUZXN0T2JqU3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIHNsb3RCYXNlCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nh c3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBFeGNlcHRpb25Db2RlIGVj ID0gMDsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhp cy0+aW1wbCgpKTsKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1w LT5zdHJpbmdBdHRyV2l0aEdldHRlckV4Y2VwdGlvbihlYykpOworICAgIFRlc3RPYmoqIGltcGwg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBKU0M6OkpT VmFsdWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+c3RyaW5nQXR0cldpdGhHZXR0ZXJF eGNlcHRpb24oZWMpKTsKICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVy biByZXN1bHQ7CiB9CkBAIC01OTAsOCArNTkwLDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpTdHJpbmdB dHRyV2l0aFNldHRlckV4Y2VwdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UK IHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihh c09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2Jq KiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBK U1ZhbHVlIHJlc3VsdCA9IGpzU3RyaW5nKGV4ZWMsIGltcC0+c3RyaW5nQXR0cldpdGhTZXR0ZXJF eGNlcHRpb24oKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihj YXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywg aW1wbC0+c3RyaW5nQXR0cldpdGhTZXR0ZXJFeGNlcHRpb24oKSk7CiAgICAgcmV0dXJuIHJlc3Vs dDsKIH0KIApAQCAtNjA3LDggKzYwNyw4IEBAIEpTVmFsdWUganNUZXN0T2JqU2NyaXB0U3RyaW5n QXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50CiB7CiAg ICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmpl Y3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1w ID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1 ZSByZXN1bHQgPSBqc093bmVkU3RyaW5nT3JOdWxsKGV4ZWMsIGltcC0+c2NyaXB0U3RyaW5nQXR0 cigpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRo aXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc093bmVkU3RyaW5nT3JOdWxsKGV4 ZWMsIGltcGwtPnNjcmlwdFN0cmluZ0F0dHIoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApA QCAtNjE4LDggKzYxOCw4IEBAIEpTVmFsdWUganNUZXN0T2JqQ29uZGl0aW9uYWxBdHRyMShFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50CiB7CiAgICAgSlNUZXN0 T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJh c2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQg PSBqc051bWJlcihpbXAtPmNvbmRpdGlvbmFsQXR0cjEoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9 IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUg cmVzdWx0ID0ganNOdW1iZXIoaW1wbC0+Y29uZGl0aW9uYWxBdHRyMSgpKTsKICAgICByZXR1cm4g cmVzdWx0OwogfQogCkBAIC02MzAsOCArNjMwLDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpDb25kaXRp b25hbEF0dHIyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnQK IHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihh c09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShleGVjKTsKLSAgICBUZXN0T2Jq KiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBK U1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcC0+Y29uZGl0aW9uYWxBdHRyMigpKTsKKyAgICBU ZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXBsLT5jb25kaXRpb25hbEF0dHIyKCkp OwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTY0Miw4ICs2NDIsOCBAQCBKU1ZhbHVlIGpz VGVzdE9iakNvbmRpdGlvbmFsQXR0cjMoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNl LCBjb25zdCBJZGVudAogewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0 PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RCYXNlKSk7CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMp OwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0ganNOdW1iZXIoaW1wLT5jb25kaXRpb25hbEF0 dHIzKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVk VGhpcy0+aW1wbCgpKTsKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcGwtPmNvbmRp dGlvbmFsQXR0cjMoKSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtNjgyLDggKzY4Miw4 IEBAIEpTVmFsdWUganNUZXN0T2JqQ2FjaGVkQXR0cmlidXRlMShFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwogICAg IGlmIChKU1ZhbHVlIGNhY2hlZFZhbHVlID0gbV9jYWNoZWRBdHRyaWJ1dGUxLmdldCgpKQogICAg ICAgICByZXR1cm4gY2FjaGVkVmFsdWU7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBpbXAt PmNhY2hlZEF0dHJpYnV0ZTEoKSA/IGltcC0+Y2FjaGVkQXR0cmlidXRlMSgpLT5kZXNlcmlhbGl6 ZShleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSkgOiBqc051bGwoKTsKKyAgICBUZXN0 T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Cisg ICAgSlNWYWx1ZSByZXN1bHQgPSBpbXBsLT5jYWNoZWRBdHRyaWJ1dGUxKCkgPyBpbXBsLT5jYWNo ZWRBdHRyaWJ1dGUxKCktPmRlc2VyaWFsaXplKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVj dCgpKSA6IGpzTnVsbCgpOwogICAgIG1fY2FjaGVkQXR0cmlidXRlMS5zZXQoZXhlYy0+Z2xvYmFs RGF0YSgpLCB0aGlzLCByZXN1bHQpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CkBAIC02OTUsOCAr Njk1LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpDYWNoZWRBdHRyaWJ1dGUyKEV4ZWNTdGF0ZSogZXhl YywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnQKICAgICBVTlVTRURfUEFSQU0oZXhlYyk7 CiAgICAgaWYgKEpTVmFsdWUgY2FjaGVkVmFsdWUgPSBtX2NhY2hlZEF0dHJpYnV0ZTIuZ2V0KCkp CiAgICAgICAgIHJldHVybiBjYWNoZWRWYWx1ZTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNf Y2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9 IGltcC0+Y2FjaGVkQXR0cmlidXRlMigpID8gaW1wLT5jYWNoZWRBdHRyaWJ1dGUyKCktPmRlc2Vy aWFsaXplKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpKSA6IGpzTnVsbCgpOworICAg IFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IGltcGwtPmNhY2hlZEF0dHJpYnV0ZTIoKSA/IGltcGwt PmNhY2hlZEF0dHJpYnV0ZTIoKS0+ZGVzZXJpYWxpemUoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFs T2JqZWN0KCkpIDoganNOdWxsKCk7CiAgICAgbV9jYWNoZWRBdHRyaWJ1dGUyLnNldChleGVjLT5n bG9iYWxEYXRhKCksIHRoaXMsIHJlc3VsdCk7CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KQEAgLTcw Niw4ICs3MDYsOCBAQCBKU1ZhbHVlIGpzVGVzdE9iakRlc2NyaXB0aW9uKEV4ZWNTdGF0ZSogZXhl YywgSlNWYWx1ZSBzbG90QmFzZSwgY29uc3QgSWRlbnRpZmllcgogewogICAgIEpTVGVzdE9iaiog Y2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RCYXNlKSk7 CiAgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0ganNO dW1iZXIoaW1wLT5kZXNjcmlwdGlvbigpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nh c3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBq c051bWJlcihpbXBsLT5kZXNjcmlwdGlvbigpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBA IC03MTYsOCArNzE2LDggQEAgSlNWYWx1ZSBqc1Rlc3RPYmpJZChFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXImKQogewogICAgIEpTVGVzdE9iaiogY2Fz dGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RCYXNlKSk7CiAg ICAgVU5VU0VEX1BBUkFNKGV4ZWMpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRl c3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0ganNOdW1i ZXIoaW1wLT5pZCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+ KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgSlNWYWx1ZSByZXN1bHQgPSBqc051bWJlcihpbXBs LT5pZCgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC03MjYsOCArNzI2LDggQEAgSlNW YWx1ZSBqc1Rlc3RPYmpIYXNoKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90QmFzZSwgY29u c3QgSWRlbnRpZmllciYpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nh c3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsKICAgICBVTlVTRURfUEFSQU0oZXhl Yyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7Ci0gICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXAtPmhhc2go KSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlz LT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgaW1wbC0+aGFz aCgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC03NDgsMTY5ICs3NDgsMTY5IEBAIHZv aWQgSlNUZXN0T2JqOjpwdXQoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElk ZW50aWZpZXImIHByb3BlcnR5TmFtCiB2b2lkIHNldEpTVGVzdE9ialNob3J0QXR0cihFeGVjU3Rh dGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpT VGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3Qp OwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOwotICAgIGltcC0+c2V0U2hvcnRBdHRyKHZhbHVlLnRvSW50MzIoZXhlYykpOworICAg IFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKKyAgICBpbXBsLT5zZXRTaG9ydEF0dHIodmFsdWUudG9JbnQzMihleGVjKSk7CiB9CiAKIAog dm9pZCBzZXRKU1Rlc3RPYmpVbnNpZ25lZFNob3J0QXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTT2Jq ZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9iaiogY2FzdGVk VGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAgIFRlc3RPYmoq IGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGlt cC0+c2V0VW5zaWduZWRTaG9ydEF0dHIodmFsdWUudG9VSW50MzIoZXhlYykpOworICAgIFRlc3RP YmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAg ICBpbXBsLT5zZXRVbnNpZ25lZFNob3J0QXR0cih2YWx1ZS50b1VJbnQzMihleGVjKSk7CiB9CiAK IAogdm9pZCBzZXRKU1Rlc3RPYmpJbnRBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRo aXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0g c3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0g c3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRJ bnRBdHRyKHZhbHVlLnRvSW50MzIoZXhlYykpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNf Y2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBpbXBsLT5zZXRJbnRBdHRy KHZhbHVlLnRvSW50MzIoZXhlYykpOwogfQogCiAKIHZvaWQgc2V0SlNUZXN0T2JqTG9uZ0xvbmdB dHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUgdmFsdWUp CiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4o dGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNh c3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRMb25nTG9uZ0F0dHIoc3RhdGljX2Nhc3Q8 bG9uZyBsb25nPih2YWx1ZS50b0ludGVnZXIoZXhlYykpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0g c3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+c2V0 TG9uZ0xvbmdBdHRyKHN0YXRpY19jYXN0PGxvbmcgbG9uZz4odmFsdWUudG9JbnRlZ2VyKGV4ZWMp KSk7CiB9CiAKIAogdm9pZCBzZXRKU1Rlc3RPYmpVbnNpZ25lZExvbmdMb25nQXR0cihFeGVjU3Rh dGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpT VGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3Qp OwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOwotICAgIGltcC0+c2V0VW5zaWduZWRMb25nTG9uZ0F0dHIoc3RhdGljX2Nhc3Q8dW5z aWduZWQgbG9uZyBsb25nPih2YWx1ZS50b0ludGVnZXIoZXhlYykpKTsKKyAgICBUZXN0T2JqKiBp bXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1w bC0+c2V0VW5zaWduZWRMb25nTG9uZ0F0dHIoc3RhdGljX2Nhc3Q8dW5zaWduZWQgbG9uZyBsb25n Pih2YWx1ZS50b0ludGVnZXIoZXhlYykpKTsKIH0KIAogCiB2b2lkIHNldEpTVGVzdE9ialN0cmlu Z0F0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1 ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoq Pih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBpbXAtPnNldFN0cmluZ0F0dHIodXN0cmluZ1RvU3Ry aW5nKHZhbHVlLmlzRW1wdHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4ZWMpKSk7 CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOworICAgIGltcGwtPnNldFN0cmluZ0F0dHIodXN0cmluZ1RvU3RyaW5nKHZhbHVlLmlz RW1wdHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4ZWMpKSk7CiB9CiAKIAogdm9p ZCBzZXRKU1Rlc3RPYmpUZXN0T2JqQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlz T2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0 YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0 YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGltcC0+c2V0VGVz dE9iakF0dHIodG9UZXN0T2JqKHZhbHVlKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19j YXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPnNldFRlc3RPYmpB dHRyKHRvVGVzdE9iaih2YWx1ZSkpOwogfQogCiAKIHZvaWQgc2V0SlNUZXN0T2JqWE1MT2JqQXR0 cihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQog ewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRo aXNPYmplY3QpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0 ZWRUaGlzLT5pbXBsKCkpOwotICAgIGltcC0+c2V0WE1MT2JqQXR0cih0b1Rlc3RPYmoodmFsdWUp KTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7CisgICAgaW1wbC0+c2V0WE1MT2JqQXR0cih0b1Rlc3RPYmoodmFsdWUpKTsKIH0K IAogCiB2b2lkIHNldEpTVGVzdE9iakNyZWF0ZShFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0 aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9 IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAgIFRlc3RPYmoqIGltcCA9 IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGltcC0+c2V0 Q3JlYXRlKHZhbHVlLnRvQm9vbGVhbihleGVjKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPnNldENyZWF0 ZSh2YWx1ZS50b0Jvb2xlYW4oZXhlYykpOwogfQogCiAKIHZvaWQgc2V0SlNUZXN0T2JqUmVmbGVj dGVkU3RyaW5nQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1Zh bHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpT VGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRl c3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGltcC0+c2V0QXR0cmlidXRlKFdlYkNv cmU6OkhUTUxOYW1lczo6cmVmbGVjdGVkc3RyaW5nYXR0ckF0dHIsIHZhbHVlVG9TdHJpbmdXaXRo TnVsbENoZWNrKGV4ZWMsIHZhbHVlKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPnNldEF0dHJpYnV0ZShX ZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZHN0cmluZ2F0dHJBdHRyLCB2YWx1ZVRvU3RyaW5n V2l0aE51bGxDaGVjayhleGVjLCB2YWx1ZSkpOwogfQogCiAKIHZvaWQgc2V0SlNUZXN0T2JqUmVm bGVjdGVkSW50ZWdyYWxBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3Qs IEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nh c3Q8SlNUZXN0T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nh c3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRJbnRlZ3JhbEF0 dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZGludGVncmFsYXR0ckF0dHIsIHZh bHVlLnRvSW50MzIoZXhlYykpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0 T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBpbXBsLT5zZXRJbnRlZ3JhbEF0dHJpYnV0 ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZGludGVncmFsYXR0ckF0dHIsIHZhbHVlLnRv SW50MzIoZXhlYykpOwogfQogCiAKIHZvaWQgc2V0SlNUZXN0T2JqUmVmbGVjdGVkVW5zaWduZWRJ bnRlZ3JhbEF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1 ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rl c3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0 T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBpbXAtPnNldFVuc2lnbmVkSW50ZWdyYWxB dHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWR1bnNpZ25lZGludGVncmFsYXR0 ckF0dHIsIHZhbHVlLnRvVUludDMyKGV4ZWMpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+c2V0VW5zaWdu ZWRJbnRlZ3JhbEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZHVuc2lnbmVk aW50ZWdyYWxhdHRyQXR0ciwgdmFsdWUudG9VSW50MzIoZXhlYykpOwogfQogCiAKIHZvaWQgc2V0 SlNUZXN0T2JqUmVmbGVjdGVkQm9vbGVhbkF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCog dGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMg PSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBpbXAg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBpbXAtPnNl dEJvb2xlYW5BdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWRib29sZWFuYXR0 ckF0dHIsIHZhbHVlLnRvQm9vbGVhbihleGVjKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPnNldEJvb2xl YW5BdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpyZWZsZWN0ZWRib29sZWFuYXR0ckF0dHIs IHZhbHVlLnRvQm9vbGVhbihleGVjKSk7CiB9CiAKIAogdm9pZCBzZXRKU1Rlc3RPYmpSZWZsZWN0 ZWRVUkxBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUg dmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0 T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9i aio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRBdHRyaWJ1dGUoV2ViQ29yZTo6 SFRNTE5hbWVzOjpyZWZsZWN0ZWR1cmxhdHRyQXR0ciwgdmFsdWVUb1N0cmluZ1dpdGhOdWxsQ2hl Y2soZXhlYywgdmFsdWUpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9i aio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+c2V0QXR0cmlidXRlKFdlYkNvcmU6 OkhUTUxOYW1lczo6cmVmbGVjdGVkdXJsYXR0ckF0dHIsIHZhbHVlVG9TdHJpbmdXaXRoTnVsbENo ZWNrKGV4ZWMsIHZhbHVlKSk7CiB9CiAKIAogdm9pZCBzZXRKU1Rlc3RPYmpSZWZsZWN0ZWROb25F bXB0eVVSTEF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1 ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rl c3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0 T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBpbXAtPnNldEF0dHJpYnV0ZShXZWJDb3Jl OjpIVE1MTmFtZXM6OnJlZmxlY3RlZG5vbmVtcHR5dXJsYXR0ckF0dHIsIHZhbHVlVG9TdHJpbmdX aXRoTnVsbENoZWNrKGV4ZWMsIHZhbHVlKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19j YXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPnNldEF0dHJpYnV0 ZShXZWJDb3JlOjpIVE1MTmFtZXM6OnJlZmxlY3RlZG5vbmVtcHR5dXJsYXR0ckF0dHIsIHZhbHVl VG9TdHJpbmdXaXRoTnVsbENoZWNrKGV4ZWMsIHZhbHVlKSk7CiB9CiAKIAogdm9pZCBzZXRKU1Rl c3RPYmpSZWZsZWN0ZWRTdHJpbmdBdHRyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNP YmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3Rh dGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3Rh dGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRBdHRy aWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpjdXN0b21Db250ZW50U3RyaW5nQXR0ckF0dHIsIHZh bHVlVG9TdHJpbmdXaXRoTnVsbENoZWNrKGV4ZWMsIHZhbHVlKSk7CisgICAgVGVzdE9iaiogaW1w bCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwt PnNldEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRTdHJpbmdBdHRy QXR0ciwgdmFsdWVUb1N0cmluZ1dpdGhOdWxsQ2hlY2soZXhlYywgdmFsdWUpKTsKIH0KIAogCiB2 b2lkIHNldEpTVGVzdE9ialJlZmxlY3RlZEN1c3RvbUludGVncmFsQXR0cihFeGVjU3RhdGUqIGV4 ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9i aiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAg IFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkp OwotICAgIGltcC0+c2V0SW50ZWdyYWxBdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpjdXN0 b21Db250ZW50SW50ZWdyYWxBdHRyQXR0ciwgdmFsdWUudG9JbnQzMihleGVjKSk7CisgICAgVGVz dE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwor ICAgIGltcGwtPnNldEludGVncmFsQXR0cmlidXRlKFdlYkNvcmU6OkhUTUxOYW1lczo6Y3VzdG9t Q29udGVudEludGVncmFsQXR0ckF0dHIsIHZhbHVlLnRvSW50MzIoZXhlYykpOwogfQogCiAKIHZv aWQgc2V0SlNUZXN0T2JqUmVmbGVjdGVkQ3VzdG9tQm9vbGVhbkF0dHIoRXhlY1N0YXRlKiBleGVj LCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoq IGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBU ZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsK LSAgICBpbXAtPnNldEJvb2xlYW5BdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpjdXN0b21D b250ZW50Qm9vbGVhbkF0dHJBdHRyLCB2YWx1ZS50b0Jvb2xlYW4oZXhlYykpOworICAgIFRlc3RP YmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAg ICBpbXBsLT5zZXRCb29sZWFuQXR0cmlidXRlKFdlYkNvcmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29u dGVudEJvb2xlYW5BdHRyQXR0ciwgdmFsdWUudG9Cb29sZWFuKGV4ZWMpKTsKIH0KIAogCiB2b2lk IHNldEpTVGVzdE9ialJlZmxlY3RlZEN1c3RvbVVSTEF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09i amVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3Rl ZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2Jq KiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKLSAgICBp bXAtPnNldEF0dHJpYnV0ZShXZWJDb3JlOjpIVE1MTmFtZXM6OmN1c3RvbUNvbnRlbnRVUkxBdHRy QXR0ciwgdmFsdWVUb1N0cmluZ1dpdGhOdWxsQ2hlY2soZXhlYywgdmFsdWUpKTsKKyAgICBUZXN0 T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Cisg ICAgaW1wbC0+c2V0QXR0cmlidXRlKFdlYkNvcmU6OkhUTUxOYW1lczo6Y3VzdG9tQ29udGVudFVS TEF0dHJBdHRyLCB2YWx1ZVRvU3RyaW5nV2l0aE51bGxDaGVjayhleGVjLCB2YWx1ZSkpOwogfQog CiAKIHZvaWQgc2V0SlNUZXN0T2JqUmVmbGVjdGVkQ3VzdG9tTm9uRW1wdHlVUkxBdHRyKEV4ZWNT dGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAg SlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVj dCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7Ci0gICAgaW1wLT5zZXRBdHRyaWJ1dGUoV2ViQ29yZTo6SFRNTE5hbWVzOjpjdXN0 b21Db250ZW50Tm9uRW1wdHlVUkxBdHRyQXR0ciwgdmFsdWVUb1N0cmluZ1dpdGhOdWxsQ2hlY2so ZXhlYywgdmFsdWUpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+ KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+c2V0QXR0cmlidXRlKFdlYkNvcmU6OkhU TUxOYW1lczo6Y3VzdG9tQ29udGVudE5vbkVtcHR5VVJMQXR0ckF0dHIsIHZhbHVlVG9TdHJpbmdX aXRoTnVsbENoZWNrKGV4ZWMsIHZhbHVlKSk7CiB9CiAKIAogdm9pZCBzZXRKU1Rlc3RPYmpBdHRy V2l0aEdldHRlckV4Y2VwdGlvbihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiB0aGlzT2JqZWN0 LCBKU1ZhbHVlIHZhbHVlKQogewogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19j YXN0PEpTVGVzdE9iaio+KHRoaXNPYmplY3QpOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19j YXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBz dGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBFeGNlcHRpb25D b2RlIGVjID0gMDsKLSAgICBpbXAtPnNldEF0dHJXaXRoR2V0dGVyRXhjZXB0aW9uKHZhbHVlLnRv SW50MzIoZXhlYyksIGVjKTsKKyAgICBpbXBsLT5zZXRBdHRyV2l0aEdldHRlckV4Y2VwdGlvbih2 YWx1ZS50b0ludDMyKGV4ZWMpLCBlYyk7CiAgICAgc2V0RE9NRXhjZXB0aW9uKGV4ZWMsIGVjKTsK IH0KIApAQCAtOTE4LDkgKzkxOCw5IEBAIHZvaWQgc2V0SlNUZXN0T2JqQXR0cldpdGhHZXR0ZXJF eGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwKIHZvaWQgc2V0 SlNUZXN0T2JqQXR0cldpdGhTZXR0ZXJFeGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBKU09iamVj dCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRo aXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBp bXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0 T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAg ICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgaW1wLT5zZXRBdHRyV2l0aFNldHRlckV4Y2Vw dGlvbih2YWx1ZS50b0ludDMyKGV4ZWMpLCBlYyk7CisgICAgaW1wbC0+c2V0QXR0cldpdGhTZXR0 ZXJFeGNlcHRpb24odmFsdWUudG9JbnQzMihleGVjKSwgZWMpOwogICAgIHNldERPTUV4Y2VwdGlv bihleGVjLCBlYyk7CiB9CiAKQEAgLTkyOCw5ICs5MjgsOSBAQCB2b2lkIHNldEpTVGVzdE9iakF0 dHJXaXRoU2V0dGVyRXhjZXB0aW9uKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmpl Y3QsCiB2b2lkIHNldEpTVGVzdE9ialN0cmluZ0F0dHJXaXRoR2V0dGVyRXhjZXB0aW9uKEV4ZWNT dGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAg SlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVj dCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0 ZWRUaGlzLT5pbXBsKCkpOwogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgIGltcC0+c2V0 U3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24odXN0cmluZ1RvU3RyaW5nKHZhbHVlLmlzRW1w dHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4ZWMpKSwgZWMpOworICAgIGltcGwt PnNldFN0cmluZ0F0dHJXaXRoR2V0dGVyRXhjZXB0aW9uKHVzdHJpbmdUb1N0cmluZyh2YWx1ZS5p c0VtcHR5KCkgPyBVU3RyaW5nKCkgOiB2YWx1ZS50b1N0cmluZyhleGVjKSksIGVjKTsKICAgICBz ZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogfQogCkBAIC05MzgsOSArOTM4LDkgQEAgdm9pZCBz ZXRKU1Rlc3RPYmpTdHJpbmdBdHRyV2l0aEdldHRlckV4Y2VwdGlvbihFeGVjU3RhdGUqIGV4ZWMs IEpTT2JqZWN0KiB0aGlzT2IKIHZvaWQgc2V0SlNUZXN0T2JqU3RyaW5nQXR0cldpdGhTZXR0ZXJF eGNlcHRpb24oRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2 YWx1ZSkKIHsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RP YmoqPih0aGlzT2JqZWN0KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2Jq Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7 Ci0gICAgaW1wLT5zZXRTdHJpbmdBdHRyV2l0aFNldHRlckV4Y2VwdGlvbih1c3RyaW5nVG9TdHJp bmcodmFsdWUuaXNFbXB0eSgpID8gVVN0cmluZygpIDogdmFsdWUudG9TdHJpbmcoZXhlYykpLCBl Yyk7CisgICAgaW1wbC0+c2V0U3RyaW5nQXR0cldpdGhTZXR0ZXJFeGNlcHRpb24odXN0cmluZ1Rv U3RyaW5nKHZhbHVlLmlzRW1wdHkoKSA/IFVTdHJpbmcoKSA6IHZhbHVlLnRvU3RyaW5nKGV4ZWMp KSwgZWMpOwogICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7CiB9CiAKQEAgLTk1NSw4ICs5 NTUsOCBAQCB2b2lkIHNldEpTVGVzdE9iakN1c3RvbUF0dHIoRXhlY1N0YXRlKiBleGVjLCBKU09i amVjdCogdGhpc09iamVjdCwgSlNWYWx1ZSB2YWx1ZQogdm9pZCBzZXRKU1Rlc3RPYmpDb25kaXRp b25hbEF0dHIxKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUg dmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0 T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9i aio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRDb25kaXRpb25hbEF0dHIxKHZh bHVlLnRvSW50MzIoZXhlYykpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0 T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBpbXBsLT5zZXRDb25kaXRpb25hbEF0dHIx KHZhbHVlLnRvSW50MzIoZXhlYykpOwogfQogCiAjZW5kaWYKQEAgLTk2NSw4ICs5NjUsOCBAQCB2 b2lkIHNldEpTVGVzdE9iakNvbmRpdGlvbmFsQXR0cjEoRXhlY1N0YXRlKiBleGVjLCBKU09iamVj dCogdGhpc09iamVjdCwgSlNWYWx1ZQogdm9pZCBzZXRKU1Rlc3RPYmpDb25kaXRpb25hbEF0dHIy KEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7 CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhp c09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRDb25kaXRpb25hbEF0dHIyKHZhbHVlLnRvSW50 MzIoZXhlYykpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2Fz dGVkVGhpcy0+aW1wbCgpKTsKKyAgICBpbXBsLT5zZXRDb25kaXRpb25hbEF0dHIyKHZhbHVlLnRv SW50MzIoZXhlYykpOwogfQogCiAjZW5kaWYKQEAgLTk3NSw4ICs5NzUsOCBAQCB2b2lkIHNldEpT VGVzdE9iakNvbmRpdGlvbmFsQXR0cjIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogdGhpc09i amVjdCwgSlNWYWx1ZQogdm9pZCBzZXRKU1Rlc3RPYmpDb25kaXRpb25hbEF0dHIzKEV4ZWNTdGF0 ZSogZXhlYywgSlNPYmplY3QqIHRoaXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgSlNU ZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVjdCk7 Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmlt cGwoKSk7Ci0gICAgaW1wLT5zZXRDb25kaXRpb25hbEF0dHIzKHZhbHVlLnRvSW50MzIoZXhlYykp OworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTsKKyAgICBpbXBsLT5zZXRDb25kaXRpb25hbEF0dHIzKHZhbHVlLnRvSW50MzIoZXhl YykpOwogfQogCiAjZW5kaWYKQEAgLTEwMTEsOCArMTAxMSw4IEBAIHZvaWQgc2V0SlNUZXN0T2Jq Q29uZGl0aW9uYWxBdHRyNkNvbnN0cnVjdG9yKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRo aXNPYmplCiB2b2lkIHNldEpTVGVzdE9iaklkKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHRo aXNPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0g c3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4odGhpc09iamVjdCk7Ci0gICAgVGVzdE9iaiogaW1wID0g c3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5zZXRJ ZCh2YWx1ZS50b0ludDMyKGV4ZWMpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+c2V0SWQodmFsdWUudG9J bnQzMihleGVjKSk7CiB9CiAKIApAQCAtMTAyOCw4ICsxMDI4LDggQEAgRW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblZvaWRNZXRob2QoRXhlY1N0 YXRlKiBleGUKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNU ZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhp c1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNU ZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoq PihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGltcC0+dm9pZE1ldGhvZCgpOworICAgIFRlc3RP YmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAg ICBpbXBsLT52b2lkTWV0aG9kKCk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVm aW5lZCgpKTsKIH0KIApAQCAtMTA0MCw3ICsxMDQwLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hP U1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblZvaWRNZXRob2RXaXRoQXJncyhFeGVj U3QKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0T2Jq KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVl KSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2Jq OjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0 ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2Jq Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwg MykKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhl YywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIGludCBpbnRBcmcoTUFZQkVfTUlTU0lO R19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5kZWZpbmVkKS50b0ludDMyKGV4ZWMpKTsK QEAgLTEwNTIsNyArMTA1Miw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0 T2JqUHJvdG90eXBlRnVuY3Rpb25Wb2lkTWV0aG9kV2l0aEFyZ3MoRXhlY1N0CiAgICAgVGVzdE9i aiogb2JqQXJnKHRvVGVzdE9iaihNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAyLCBNaXNz aW5nSXNVbmRlZmluZWQpKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwotICAgIGltcC0+dm9pZE1l dGhvZFdpdGhBcmdzKGludEFyZywgc3RyQXJnLCBvYmpBcmcpOworICAgIGltcGwtPnZvaWRNZXRo b2RXaXRoQXJncyhpbnRBcmcsIHN0ckFyZywgb2JqQXJnKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0xMDYzLDkgKzEwNjMsOSBAQCBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uSW50TWV0aG9k KEV4ZWNTdGF0ZSogZXhlYwogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsK ICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09i amVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRo aXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogCi0gICAgSlNDOjpKU1ZhbHVl IHJlc3VsdCA9IGpzTnVtYmVyKGltcC0+aW50TWV0aG9kKCkpOworICAgIEpTQzo6SlNWYWx1ZSBy ZXN1bHQgPSBqc051bWJlcihpbXBsLT5pbnRNZXRob2QoKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZShyZXN1bHQpOwogfQogCkBAIC0xMDc2LDcgKzEwNzYsNyBAQCBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uSW50TWV0aG9kV2l0aEFy Z3MoRXhlY1N0YQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBK U1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0 aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZK U1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9i aio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1bWVudENv dW50KCkgPCAzKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVF cnJvcihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgaW50IGludEFyZyhNQVlC RV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAwLCBNaXNzaW5nSXNVbmRlZmluZWQpLnRvSW50MzIo ZXhlYykpOwpAQCAtMTA4OSw3ICsxMDg5LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkludE1ldGhvZFdpdGhBcmdzKEV4ZWNTdGEKICAg ICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoanNVbmRlZmluZWQoKSk7CiAKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0ganNOdW1iZXIo aW1wLT5pbnRNZXRob2RXaXRoQXJncyhpbnRBcmcsIHN0ckFyZywgb2JqQXJnKSk7CisgICAgSlND OjpKU1ZhbHVlIHJlc3VsdCA9IGpzTnVtYmVyKGltcGwtPmludE1ldGhvZFdpdGhBcmdzKGludEFy Zywgc3RyQXJnLCBvYmpBcmcpKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlc3VsdCk7 CiB9CiAKQEAgLTExMDAsOSArMTEwMCw5IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwg anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PYmpNZXRob2QoRXhlY1N0YXRlKiBleGVjCiAgICAg ICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVk VGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAg IEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZv KTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7CiAKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0gdG9KUyhleGVjLCBj YXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgV1RGOjpnZXRQdHIoaW1wLT5vYmpNZXRob2QoKSkp OworICAgIEpTQzo6SlNWYWx1ZSByZXN1bHQgPSB0b0pTKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2Jh bE9iamVjdCgpLCBXVEY6OmdldFB0cihpbXBsLT5vYmpNZXRob2QoKSkpOwogICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKIH0KIApAQCAtMTExMyw3ICsxMTEzLDcgQEAgRW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk9iak1ldGhv ZFdpdGhBcmdzKEV4ZWNTdGEKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7 CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNP YmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRU aGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0 aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhlYy0+YXJn dW1lbnRDb3VudCgpIDwgMykKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVh dGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIGludCBpbnRB cmcoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5kZWZpbmVkKS50 b0ludDMyKGV4ZWMpKTsKQEAgLTExMjYsNyArMTEyNiw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PYmpNZXRob2RXaXRoQXJncyhFeGVj U3RhCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogCi0gICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IHRv SlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcC0+b2Jq TWV0aG9kV2l0aEFyZ3MoaW50QXJnLCBzdHJBcmcsIG9iakFyZykpKTsKKyAgICBKU0M6OkpTVmFs dWUgcmVzdWx0ID0gdG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgV1RGOjpn ZXRQdHIoaW1wbC0+b2JqTWV0aG9kV2l0aEFyZ3MoaW50QXJnLCBzdHJBcmcsIG9iakFyZykpKTsK ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlc3VsdCk7CiB9CiAKQEAgLTExMzcsNyArMTEz Nyw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVu Y3Rpb25NZXRob2RUaGF0UmVxdWlyZXNBbGxBcmdzCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlw ZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpT VGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5I RVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2Jq KiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAg aWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDIpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNRXJy b3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsK ICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKQEAgLTExNDgsNyArMTE0OCw3IEBAIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25NZXRob2RUaGF0 UmVxdWlyZXNBbGxBcmdzCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogCi0gICAgSlNDOjpKU1ZhbHVl IHJlc3VsdCA9IHRvSlMoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0 UHRyKGltcC0+bWV0aG9kVGhhdFJlcXVpcmVzQWxsQXJnc0FuZFRocm93cyhzdHJBcmcsIG9iakFy ZywgZWMpKSk7CisgICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IHRvSlMoZXhlYywgY2FzdGVkVGhp cy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcGwtPm1ldGhvZFRoYXRSZXF1aXJlc0Fs bEFyZ3NBbmRUaHJvd3Moc3RyQXJnLCBvYmpBcmcsIGVjKSkpOwogICAgIHNldERPTUV4Y2VwdGlv bihleGVjLCBlYyk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShyZXN1bHQpOwogfQpAQCAt MTE2MCwxMyArMTE2MCwxMyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9i alByb3RvdHlwZUZ1bmN0aW9uU2VyaWFsaXplZFZhbHVlKEV4ZWNTdGF0ZQogICAgICAgICByZXR1 cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBz dGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRf R0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAg VGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPCAxKQogICAgICAgICByZXR1 cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVjLCAiTm90IGVub3VnaCBh cmd1bWVudHMiKSk7CiAgICAgUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gc2VyaWFsaXpl ZEFyZyhTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0ZShleGVjLCBNQVlCRV9NSVNTSU5HX1BB UkFNRVRFUihleGVjLCAwLCBNaXNzaW5nSXNVbmRlZmluZWQpKSk7CiAgICAgaWYgKGV4ZWMtPmhh ZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVk KCkpOwotICAgIGltcC0+c2VyaWFsaXplZFZhbHVlKHNlcmlhbGl6ZWRBcmcpOworICAgIGltcGwt PnNlcmlhbGl6ZWRWYWx1ZShzZXJpYWxpemVkQXJnKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0xMTc3LDEzICsxMTc3LDEzIEBAIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25JZGJLZXkoRXhl Y1N0YXRlKiBleGVjKQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAg ICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVj dCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMs ICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVz dE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19j YXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1bWVu dENvdW50KCkgPCAxKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5 cGVFcnJvcihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgUmVmUHRyPElEQktl eT4ga2V5KGNyZWF0ZUlEQktleUZyb21WYWx1ZShleGVjLCBNQVlCRV9NSVNTSU5HX1BBUkFNRVRF UihleGVjLCAwLCBNaXNzaW5nSXNVbmRlZmluZWQpKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2Vw dGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwot ICAgIGltcC0+aWRiS2V5KGtleSk7CisgICAgaW1wbC0+aWRiS2V5KGtleSk7CiAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAtMTE5NCw3ICsxMTk0LDcg QEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv bk9wdGlvbnNPYmplY3QoRXhlY1N0YXRlKgogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJv cihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RP YmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRT KGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3Rh dGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1w bCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChl eGVjLT5hcmd1bWVudENvdW50KCkgPCAxKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4 ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAg T3B0aW9uc09iamVjdCogb28odG9PcHRpb25zT2JqZWN0KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVS KGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkpKTsKQEAgLTEyMDMsMTQgKzEyMDMsMTQgQEAg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk9w dGlvbnNPYmplY3QoRXhlY1N0YXRlKgogCiAgICAgc2l6ZV90IGFyZ3NDb3VudCA9IGV4ZWMtPmFy Z3VtZW50Q291bnQoKTsKICAgICBpZiAoYXJnc0NvdW50IDw9IDEpIHsKLSAgICAgICAgaW1wLT5v cHRpb25zT2JqZWN0KG9vKTsKKyAgICAgICAgaW1wbC0+b3B0aW9uc09iamVjdChvbyk7CiAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAgfQogCiAgICAg T3B0aW9uc09iamVjdCogb29vKHRvT3B0aW9uc09iamVjdChNQVlCRV9NSVNTSU5HX1BBUkFNRVRF UihleGVjLCAxLCBNaXNzaW5nSXNVbmRlZmluZWQpKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2Vw dGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwot ICAgIGltcC0+b3B0aW9uc09iamVjdChvbywgb29vKTsKKyAgICBpbXBsLT5vcHRpb25zT2JqZWN0 KG9vLCBvb28pOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9 CiAKQEAgLTEyMjEsOSArMTIyMSw5IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNU ZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25NZXRob2RXaXRoRXhjZXB0aW9uKEV4ZWNTCiAgICAgICAg IHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhp cyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFT U0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsK LSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1w bCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRo aXMtPmltcGwoKSk7CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgaW1wLT5tZXRob2RX aXRoRXhjZXB0aW9uKGVjKTsKKyAgICBpbXBsLT5tZXRob2RXaXRoRXhjZXB0aW9uKGVjKTsKICAg ICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo anNVbmRlZmluZWQoKSk7CiB9CkBAIC0xMjU1LDcgKzEyNTUsNyBAQCBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9tQXJnc0FuZEV4Y2Vw dGlvbihFeAogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rl c3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlz VmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rl c3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+ KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRl c3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50 KCkgPCAxKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJv cihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9 IDA7CkBAIC0xMjY0LDcgKzEyNjQsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpz VGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ3VzdG9tQXJnc0FuZEV4Y2VwdGlvbihFeAogICAgIGxv ZyogaW50QXJnKHRvbG9nKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJ c1VuZGVmaW5lZCkpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaW1wLT5jdXN0b21Bcmdz QW5kRXhjZXB0aW9uKGludEFyZywgc2NyaXB0QXJndW1lbnRzLCBjYWxsU3RhY2ssIGVjKTsKKyAg ICBpbXBsLT5jdXN0b21BcmdzQW5kRXhjZXB0aW9uKGludEFyZywgc2NyaXB0QXJndW1lbnRzLCBj YWxsU3RhY2ssIGVjKTsKICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CkBAIC0xMjc2LDEzICsxMjc2LDEz IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25BZGRFdmVudExpc3RlbmVyKEV4ZWNTdGF0CiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVy cm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVz dE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJ VFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBz dGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBp bXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAgaWYg KGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDIpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNRXJyb3Io ZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsKICAg ICBKU1ZhbHVlIGxpc3RlbmVyID0gZXhlYy0+YXJndW1lbnQoMSk7CiAgICAgaWYgKCFsaXN0ZW5l ci5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVk KCkpOwotICAgIGltcC0+YWRkRXZlbnRMaXN0ZW5lcih1c3RyaW5nVG9BdG9taWNTdHJpbmcoZXhl Yy0+YXJndW1lbnQoMCkudG9TdHJpbmcoZXhlYykpLCBKU0V2ZW50TGlzdGVuZXI6OmNyZWF0ZShh c09iamVjdChsaXN0ZW5lciksIGNhc3RlZFRoaXMsIGZhbHNlLCBjdXJyZW50V29ybGQoZXhlYykp LCBleGVjLT5hcmd1bWVudCgyKS50b0Jvb2xlYW4oZXhlYykpOworICAgIGltcGwtPmFkZEV2ZW50 TGlzdGVuZXIodXN0cmluZ1RvQXRvbWljU3RyaW5nKGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5n KGV4ZWMpKSwgSlNFdmVudExpc3RlbmVyOjpjcmVhdGUoYXNPYmplY3QobGlzdGVuZXIpLCBjYXN0 ZWRUaGlzLCBmYWxzZSwgY3VycmVudFdvcmxkKGV4ZWMpKSwgZXhlYy0+YXJndW1lbnQoMikudG9C b29sZWFuKGV4ZWMpKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkp OwogfQogCkBAIC0xMjkzLDEzICsxMjkzLDEzIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25SZW1vdmVFdmVudExpc3RlbmVyKEV4ZWNTCiAg ICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2Fz dGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwog ICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19p bmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhp cy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNh c3RlZFRoaXMtPmltcGwoKSk7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDIpCiAg ICAgICAgIHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJO b3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsKICAgICBKU1ZhbHVlIGxpc3RlbmVyID0gZXhlYy0+YXJn dW1lbnQoMSk7CiAgICAgaWYgKCFsaXN0ZW5lci5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwotICAgIGltcC0+cmVtb3ZlRXZlbnRMaXN0 ZW5lcih1c3RyaW5nVG9BdG9taWNTdHJpbmcoZXhlYy0+YXJndW1lbnQoMCkudG9TdHJpbmcoZXhl YykpLCBKU0V2ZW50TGlzdGVuZXI6OmNyZWF0ZShhc09iamVjdChsaXN0ZW5lciksIGNhc3RlZFRo aXMsIGZhbHNlLCBjdXJyZW50V29ybGQoZXhlYykpLmdldCgpLCBleGVjLT5hcmd1bWVudCgyKS50 b0Jvb2xlYW4oZXhlYykpOworICAgIGltcGwtPnJlbW92ZUV2ZW50TGlzdGVuZXIodXN0cmluZ1Rv QXRvbWljU3RyaW5nKGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5nKGV4ZWMpKSwgSlNFdmVudExp c3RlbmVyOjpjcmVhdGUoYXNPYmplY3QobGlzdGVuZXIpLCBjYXN0ZWRUaGlzLCBmYWxzZSwgY3Vy cmVudFdvcmxkKGV4ZWMpKS5nZXQoKSwgZXhlYy0+YXJndW1lbnQoMikudG9Cb29sZWFuKGV4ZWMp KTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0x MzEwLDExICsxMzEwLDExIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2Jq UHJvdG90eXBlRnVuY3Rpb25XaXRoRHluYW1pY0ZyYW1lKEV4ZWNTdGF0CiAgICAgICAgIHJldHVy biB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0 YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9H Q19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBU ZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsK KyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmlt cGwoKSk7CiAgICAgRnJhbWUqIGR5bmFtaWNGcmFtZSA9IHRvRHluYW1pY0ZyYW1lKGV4ZWMpOwog ICAgIGlmICghZHluYW1pY0ZyYW1lKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpz VW5kZWZpbmVkKCkpOwotICAgIGltcC0+d2l0aER5bmFtaWNGcmFtZShkeW5hbWljRnJhbWUpOwor ICAgIGltcGwtPndpdGhEeW5hbWljRnJhbWUoZHluYW1pY0ZyYW1lKTsKICAgICByZXR1cm4gSlNW YWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0xMzI1LDcgKzEzMjUsNyBAQCBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uV2l0 aER5bmFtaWNGcmFtZUFuZEFyZyhFeAogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihl eGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoq Pihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNh c3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9 IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVj LT5hcmd1bWVudENvdW50KCkgPCAxKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMs IGNyZWF0ZVR5cGVFcnJvcihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgRnJh bWUqIGR5bmFtaWNGcmFtZSA9IHRvRHluYW1pY0ZyYW1lKGV4ZWMpOwpAQCAtMTMzNCw3ICsxMzM0 LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5j dGlvbldpdGhEeW5hbWljRnJhbWVBbmRBcmcoRXgKICAgICBpbnQgaW50QXJnKE1BWUJFX01JU1NJ TkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkudG9JbnQzMihleGVjKSk7 CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwotICAgIGltcC0+d2l0aER5bmFtaWNGcmFtZUFuZEFyZyhk eW5hbWljRnJhbWUsIGludEFyZyk7CisgICAgaW1wbC0+d2l0aER5bmFtaWNGcmFtZUFuZEFyZyhk eW5hbWljRnJhbWUsIGludEFyZyk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVm aW5lZCgpKTsKIH0KIApAQCAtMTM0NSw3ICsxMzQ1LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hP U1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldpdGhEeW5hbWljRnJhbWVBbmRPcHRp b24KICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0T2Jq KiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVl KSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2Jq OjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0 ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2Jq Kj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwg MSkKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhl YywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIEZyYW1lKiBkeW5hbWljRnJhbWUgPSB0 b0R5bmFtaWNGcmFtZShleGVjKTsKQEAgLTEzNTcsMTQgKzEzNTcsMTQgQEAgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldpdGhEeW5hbWljRnJh bWVBbmRPcHRpb24KIAogICAgIHNpemVfdCBhcmdzQ291bnQgPSBleGVjLT5hcmd1bWVudENvdW50 KCk7CiAgICAgaWYgKGFyZ3NDb3VudCA8PSAxKSB7Ci0gICAgICAgIGltcC0+d2l0aER5bmFtaWNG cmFtZUFuZE9wdGlvbmFsQXJnKGR5bmFtaWNGcmFtZSwgaW50QXJnKTsKKyAgICAgICAgaW1wbC0+ d2l0aER5bmFtaWNGcmFtZUFuZE9wdGlvbmFsQXJnKGR5bmFtaWNGcmFtZSwgaW50QXJnKTsKICAg ICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKICAgICB9CiAKICAg ICBpbnQgb3B0aW9uYWxBcmcoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMSwgTWlzc2lu Z0lzVW5kZWZpbmVkKS50b0ludDMyKGV4ZWMpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9u KCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAg aW1wLT53aXRoRHluYW1pY0ZyYW1lQW5kT3B0aW9uYWxBcmcoZHluYW1pY0ZyYW1lLCBpbnRBcmcs IG9wdGlvbmFsQXJnKTsKKyAgICBpbXBsLT53aXRoRHluYW1pY0ZyYW1lQW5kT3B0aW9uYWxBcmco ZHluYW1pY0ZyYW1lLCBpbnRBcmcsIG9wdGlvbmFsQXJnKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0xMzc1LDcgKzEzNzUsNyBAQCBFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uV2l0aER5bmFt aWNGcmFtZUFuZFVzZXJHZQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsK ICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09i amVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRo aXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8 VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1 bWVudENvdW50KCkgPCAxKQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0 ZVR5cGVFcnJvcihleGVjLCAiTm90IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgRnJhbWUqIGR5 bmFtaWNGcmFtZSA9IHRvRHluYW1pY0ZyYW1lKGV4ZWMpOwpAQCAtMTM4NCw3ICsxMzg0LDcgQEAg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldp dGhEeW5hbWljRnJhbWVBbmRVc2VyR2UKICAgICBpbnQgaW50QXJnKE1BWUJFX01JU1NJTkdfUEFS QU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkudG9JbnQzMihleGVjKSk7CiAgICAg aWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2Rl KGpzVW5kZWZpbmVkKCkpOwotICAgIGltcC0+d2l0aER5bmFtaWNGcmFtZUFuZFVzZXJHZXN0dXJl KGR5bmFtaWNGcmFtZSwgaW50QXJnLCBTY3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdl c3R1cmUoKSk7CisgICAgaW1wbC0+d2l0aER5bmFtaWNGcmFtZUFuZFVzZXJHZXN0dXJlKGR5bmFt aWNGcmFtZSwgaW50QXJnLCBTY3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUo KSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAt MTM5NSw3ICsxMzk1LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQ cm90b3R5cGVGdW5jdGlvbldpdGhEeW5hbWljRnJhbWVBbmRVc2VyR2UKICAgICAgICAgcmV0dXJu IHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3Rh dGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dD X09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRl c3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwor ICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1w bCgpKTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJu IHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJn dW1lbnRzIikpOwogICAgIEZyYW1lKiBkeW5hbWljRnJhbWUgPSB0b0R5bmFtaWNGcmFtZShleGVj KTsKQEAgLTE0MDcsMTQgKzE0MDcsMTQgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBq c1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldpdGhEeW5hbWljRnJhbWVBbmRVc2VyR2UKIAogICAg IHNpemVfdCBhcmdzQ291bnQgPSBleGVjLT5hcmd1bWVudENvdW50KCk7CiAgICAgaWYgKGFyZ3ND b3VudCA8PSAxKSB7Ci0gICAgICAgIGltcC0+d2l0aER5bmFtaWNGcmFtZUFuZFVzZXJHZXN0dXJl QVNBRChkeW5hbWljRnJhbWUsIGludEFyZyk7CisgICAgICAgIGltcGwtPndpdGhEeW5hbWljRnJh bWVBbmRVc2VyR2VzdHVyZUFTQUQoZHluYW1pY0ZyYW1lLCBpbnRBcmcpOwogICAgICAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogICAgIH0KIAogICAgIGludCBvcHRp b25hbEFyZyhNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAxLCBNaXNzaW5nSXNVbmRlZmlu ZWQpLnRvSW50MzIoZXhlYykpOwogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKLSAgICBpbXAtPndpdGhE eW5hbWljRnJhbWVBbmRVc2VyR2VzdHVyZUFTQUQoZHluYW1pY0ZyYW1lLCBpbnRBcmcsIG9wdGlv bmFsQXJnLCBTY3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSk7CisgICAg aW1wbC0+d2l0aER5bmFtaWNGcmFtZUFuZFVzZXJHZXN0dXJlQVNBRChkeW5hbWljRnJhbWUsIGlu dEFyZywgb3B0aW9uYWxBcmcsIFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVy ZSgpKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBA IC0xNDI1LDggKzE0MjUsOCBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9i alByb3RvdHlwZUZ1bmN0aW9uV2l0aFNjcmlwdFN0YXRlVm9pZChFeGVjUwogICAgICAgICByZXR1 cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBz dGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRf R0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAg VGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 Ci0gICAgaW1wLT53aXRoU2NyaXB0U3RhdGVWb2lkKGV4ZWMpOworICAgIFRlc3RPYmoqIGltcGwg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBpbXBsLT53 aXRoU2NyaXB0U3RhdGVWb2lkKGV4ZWMpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNV bmRlZmluZWQoKSk7CiB9CiAKQEAgLTE0MzcsOSArMTQzNyw5IEBAIEVuY29kZWRKU1ZhbHVlIEpT Q19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoU2NyaXB0U3RhdGVPYmoo RXhlY1N0CiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVz dE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNW YWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVz dE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVz dE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAKLSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0g dG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgV1RGOjpnZXRQdHIoaW1wLT53 aXRoU2NyaXB0U3RhdGVPYmooZXhlYykpKTsKKyAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0gdG9K UyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgV1RGOjpnZXRQdHIoaW1wbC0+d2l0 aFNjcmlwdFN0YXRlT2JqKGV4ZWMpKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQog ICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKQEAgLTE0NTIsOSArMTQ1Miw5IEBAIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoU2NyaXB0 U3RhdGVWb2lkRXhjZXB0CiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwog ICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2Jq ZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhp cywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxU ZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGlj X2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAgRXhjZXB0aW9uQ29kZSBl YyA9IDA7Ci0gICAgaW1wLT53aXRoU2NyaXB0U3RhdGVWb2lkRXhjZXB0aW9uKGV4ZWMsIGVjKTsK KyAgICBpbXBsLT53aXRoU2NyaXB0U3RhdGVWb2lkRXhjZXB0aW9uKGV4ZWMsIGVjKTsKICAgICBz ZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNV bmRlZmluZWQoKSk7CiB9CkBAIC0xNDY2LDEwICsxNDY2LDEwIEBAIEVuY29kZWRKU1ZhbHVlIEpT Q19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25XaXRoU2NyaXB0U3RhdGVPYmpF eGNlcHRpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVz dE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNW YWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVz dE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4o Y2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVz dE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAK LSAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0gdG9KUyhleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxP YmplY3QoKSwgV1RGOjpnZXRQdHIoaW1wLT53aXRoU2NyaXB0U3RhdGVPYmpFeGNlcHRpb24oZXhl YywgZWMpKSk7CisgICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IHRvSlMoZXhlYywgY2FzdGVkVGhp cy0+Z2xvYmFsT2JqZWN0KCksIFdURjo6Z2V0UHRyKGltcGwtPndpdGhTY3JpcHRTdGF0ZU9iakV4 Y2VwdGlvbihleGVjLCBlYykpKTsKICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAg IGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShqc1VuZGVmaW5lZCgpKTsKQEAgLTE0ODMsMTEgKzE0ODMsMTEgQEAgRW5jb2RlZEpTVmFsdWUg SlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbldpdGhTY3JpcHRFeGVjdXRp b25Db250ZXgKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNU ZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhp c1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNU ZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoq PihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxU ZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiBzY3JpcHRDb250ZXh0ID0gc3RhdGljX2Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihleGVjLT5s ZXhpY2FsR2xvYmFsT2JqZWN0KCkpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7CiAgICAgaWYg KCFzY3JpcHRDb250ZXh0KQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZp bmVkKCkpOwotICAgIGltcC0+d2l0aFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoc2NyaXB0Q29udGV4 dCk7CisgICAgaW1wbC0+d2l0aFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoc2NyaXB0Q29udGV4dCk7 CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAtMTQ5 OCwxOCArMTQ5OCwxOCBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uTWV0aG9kV2l0aE9wdGlvbmFsQXJnKEV4ZQogICAgICAgICByZXR1cm4g dGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0 aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0Nf T0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVz dE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Cisg ICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBs KCkpOwogCiAgICAgc2l6ZV90IGFyZ3NDb3VudCA9IGV4ZWMtPmFyZ3VtZW50Q291bnQoKTsKICAg ICBpZiAoYXJnc0NvdW50IDw9IDApIHsKLSAgICAgICAgaW1wLT5tZXRob2RXaXRoT3B0aW9uYWxB cmcoKTsKKyAgICAgICAgaW1wbC0+bWV0aG9kV2l0aE9wdGlvbmFsQXJnKCk7CiAgICAgICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAgfQogCiAgICAgaW50IG9w dChNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAwLCBNaXNzaW5nSXNVbmRlZmluZWQpLnRv SW50MzIoZXhlYykpOwogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0 dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKLSAgICBpbXAtPm1ldGhvZFdpdGhP cHRpb25hbEFyZyhvcHQpOworICAgIGltcGwtPm1ldGhvZFdpdGhPcHRpb25hbEFyZyhvcHQpOwog ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE1MjAs NyArMTUyMCw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90 eXBlRnVuY3Rpb25NZXRob2RXaXRoTm9uT3B0aW9uYWxBcmdBCiAgICAgICAgIHJldHVybiB0aHJv d1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19j YXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpF Q1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2Jq KiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBU ZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7 CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCiAgICAgICAgIHJldHVybiB0aHJv d1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3VtZW50 cyIpKTsKICAgICBpbnQgbm9uT3B0KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1p c3NpbmdJc1VuZGVmaW5lZCkudG9JbnQzMihleGVjKSk7CkBAIC0xNTI5LDE0ICsxNTI5LDE0IEBA IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25N ZXRob2RXaXRoTm9uT3B0aW9uYWxBcmdBCiAKICAgICBzaXplX3QgYXJnc0NvdW50ID0gZXhlYy0+ YXJndW1lbnRDb3VudCgpOwogICAgIGlmIChhcmdzQ291bnQgPD0gMSkgewotICAgICAgICBpbXAt Pm1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZE9wdGlvbmFsQXJnKG5vbk9wdCk7CisgICAgICAg IGltcGwtPm1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZE9wdGlvbmFsQXJnKG5vbk9wdCk7CiAg ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAgfQogCiAg ICAgaW50IG9wdChNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAxLCBNaXNzaW5nSXNVbmRl ZmluZWQpLnRvSW50MzIoZXhlYykpOwogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAg ICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKLSAgICBpbXAtPm1l dGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZE9wdGlvbmFsQXJnKG5vbk9wdCwgb3B0KTsKKyAgICBp bXBsLT5tZXRob2RXaXRoTm9uT3B0aW9uYWxBcmdBbmRPcHRpb25hbEFyZyhub25PcHQsIG9wdCk7 CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAtMTU0 Nyw3ICsxNTQ3LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90 b3R5cGVGdW5jdGlvbk1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0EKICAgICAgICAgcmV0dXJuIHRo cm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGlj X2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09C SkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RP YmoqIGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAg IFRlc3RPYmoqIGltcGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRo cm93Vk1FcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1l bnRzIikpOwogICAgIGludCBub25PcHQoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMCwg TWlzc2luZ0lzVW5kZWZpbmVkKS50b0ludDMyKGV4ZWMpKTsKQEAgLTE1NTYsNyArMTU1Niw3IEBA IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25N ZXRob2RXaXRoTm9uT3B0aW9uYWxBcmdBCiAKICAgICBzaXplX3QgYXJnc0NvdW50ID0gZXhlYy0+ YXJndW1lbnRDb3VudCgpOwogICAgIGlmIChhcmdzQ291bnQgPD0gMSkgewotICAgICAgICBpbXAt Pm1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZFR3b09wdGlvbmFsQXJncyhub25PcHQpOworICAg ICAgICBpbXBsLT5tZXRob2RXaXRoTm9uT3B0aW9uYWxBcmdBbmRUd29PcHRpb25hbEFyZ3Mobm9u T3B0KTsKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKICAg ICB9CiAKQEAgLTE1NjQsMTQgKzE1NjQsMTQgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0EKICAg ICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoanNVbmRlZmluZWQoKSk7CiAgICAgaWYgKGFyZ3NDb3VudCA8PSAyKSB7Ci0gICAgICAgIGlt cC0+bWV0aG9kV2l0aE5vbk9wdGlvbmFsQXJnQW5kVHdvT3B0aW9uYWxBcmdzKG5vbk9wdCwgb3B0 MSk7CisgICAgICAgIGltcGwtPm1ldGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZFR3b09wdGlvbmFs QXJncyhub25PcHQsIG9wdDEpOwogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5k ZWZpbmVkKCkpOwogICAgIH0KIAogICAgIGludCBvcHQyKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVS KGV4ZWMsIDIsIE1pc3NpbmdJc1VuZGVmaW5lZCkudG9JbnQzMihleGVjKSk7CiAgICAgaWYgKGV4 ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5k ZWZpbmVkKCkpOwotICAgIGltcC0+bWV0aG9kV2l0aE5vbk9wdGlvbmFsQXJnQW5kVHdvT3B0aW9u YWxBcmdzKG5vbk9wdCwgb3B0MSwgb3B0Mik7CisgICAgaW1wbC0+bWV0aG9kV2l0aE5vbk9wdGlv bmFsQXJnQW5kVHdvT3B0aW9uYWxBcmdzKG5vbk9wdCwgb3B0MSwgb3B0Mik7CiAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAtMTU4Miw3ICsxNTgyLDcg QEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv bk1ldGhvZFdpdGhDYWxsYmFja0FyZyhFeGUKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJy b3IoZXhlYyk7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0 T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklU UyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0 YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGlt cGwgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAo ZXhlYy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihl eGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAg IGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPD0gMCB8fCAhZXhlYy0+YXJndW1lbnQoMCkuaXNP YmplY3QoKSkgewpAQCAtMTU5MCw3ICsxNTkwLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1Rf Q0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk1ldGhvZFdpdGhDYWxsYmFja0FyZyhFeGUK ICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKICAgICB9CiAg ICAgUmVmUHRyPFRlc3RDYWxsYmFjaz4gY2FsbGJhY2sgPSBKU1Rlc3RDYWxsYmFjazo6Y3JlYXRl KGFzT2JqZWN0KGV4ZWMtPmFyZ3VtZW50KDApKSwgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCkp OwotICAgIGltcC0+bWV0aG9kV2l0aENhbGxiYWNrQXJnKGNhbGxiYWNrKTsKKyAgICBpbXBsLT5t ZXRob2RXaXRoQ2FsbGJhY2tBcmcoY2FsbGJhY2spOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE2MDEsNyArMTYwMSw3IEBAIEVuY29kZWRKU1Zh bHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25NZXRob2RXaXRoTm9u Q2FsbGJhY2tBcmdBCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAg IEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0 KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywg JkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0 T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nh c3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50 Q291bnQoKSA8IDIpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlw ZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsKICAgICBpbnQgbm9uQ2FsbGJh Y2soTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5kZWZpbmVkKS50 b0ludDMyKGV4ZWMpKTsKQEAgLTE2MTIsNyArMTYxMiw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25NZXRob2RXaXRoTm9uQ2FsbGJhY2tB cmdBCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAg fQogICAgIFJlZlB0cjxUZXN0Q2FsbGJhY2s+IGNhbGxiYWNrID0gSlNUZXN0Q2FsbGJhY2s6OmNy ZWF0ZShhc09iamVjdChleGVjLT5hcmd1bWVudCgxKSksIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVj dCgpKTsKLSAgICBpbXAtPm1ldGhvZFdpdGhOb25DYWxsYmFja0FyZ0FuZENhbGxiYWNrQXJnKG5v bkNhbGxiYWNrLCBjYWxsYmFjayk7CisgICAgaW1wbC0+bWV0aG9kV2l0aE5vbkNhbGxiYWNrQXJn QW5kQ2FsbGJhY2tBcmcobm9uQ2FsbGJhY2ssIGNhbGxiYWNrKTsKICAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCkBAIC0xNjIzLDcgKzE2MjMsNyBAQCBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uTWV0aG9k V2l0aENhbGxiYWNrQW5kT3B0aQogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVj KTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihh c09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3Rl ZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nh c3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0 YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogICAgIFJlZlB0cjxUZXN0 Q2FsbGJhY2s+IGNhbGxiYWNrOwogICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPiAwICYm ICFleGVjLT5hcmd1bWVudCgwKS5pc1VuZGVmaW5lZE9yTnVsbCgpKSB7CiAgICAgICAgIGlmICgh ZXhlYy0+YXJndW1lbnQoMCkuaXNPYmplY3QoKSkgewpAQCAtMTYzMiw3ICsxNjMyLDcgQEAgRW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk1ldGhv ZFdpdGhDYWxsYmFja0FuZE9wdGkKICAgICAgICAgfQogICAgICAgICBjYWxsYmFjayA9IEpTVGVz dENhbGxiYWNrOjpjcmVhdGUoYXNPYmplY3QoZXhlYy0+YXJndW1lbnQoMCkpLCBjYXN0ZWRUaGlz LT5nbG9iYWxPYmplY3QoKSk7CiAgICAgfQotICAgIGltcC0+bWV0aG9kV2l0aENhbGxiYWNrQW5k T3B0aW9uYWxBcmcoY2FsbGJhY2spOworICAgIGltcGwtPm1ldGhvZFdpdGhDYWxsYmFja0FuZE9w dGlvbmFsQXJnKGNhbGxiYWNrKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZp bmVkKCkpOwogfQogCkBAIC0xNjQ0LDkgKzE2NDQsOSBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9T VF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQ29uZGl0aW9uYWxNZXRob2QxKEV4ZWNT dAogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rlc3RPYmoq IGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlzVmFsdWUp KTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6 OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoq PihjYXN0ZWRUaGlzLT5pbXBsKCkpOwogCi0gICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IGpzU3Ry aW5nKGV4ZWMsIGltcC0+Y29uZGl0aW9uYWxNZXRob2QxKCkpOworICAgIEpTQzo6SlNWYWx1ZSBy ZXN1bHQgPSBqc1N0cmluZyhleGVjLCBpbXBsLT5jb25kaXRpb25hbE1ldGhvZDEoKSk7CiAgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShyZXN1bHQpOwogfQogCkBAIC0xNjYwLDggKzE2NjAsOCBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9u Q29uZGl0aW9uYWxNZXRob2QyKEV4ZWNTdAogICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJv cihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RP YmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAgICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRT KGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5mbyk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3Rh dGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7Ci0gICAgaW1wLT5jb25kaXRp b25hbE1ldGhvZDIoKTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+ KGNhc3RlZFRoaXMtPmltcGwoKSk7CisgICAgaW1wbC0+Y29uZGl0aW9uYWxNZXRob2QyKCk7CiAg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIH0KIApAQCAtMTY3NSw4 ICsxNjc1LDggQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5 cGVGdW5jdGlvbkNvbmRpdGlvbmFsTWV0aG9kMyhFeGVjU3QKICAgICAgICAgcmV0dXJuIHRocm93 Vk1UeXBlRXJyb3IoZXhlYyk7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nh c3Q8SlNUZXN0T2JqKj4oYXNPYmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVD VF9JTkhFUklUUyhjYXN0ZWRUaGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoq IGltcCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOwotICAgIGlt cC0+Y29uZGl0aW9uYWxNZXRob2QzKCk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIGltcGwtPmNvbmRpdGlvbmFsTWV0 aG9kMygpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAK QEAgLTE2ODksNyArMTY4OSw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uT3ZlcmxvYWRlZE1ldGhvZDEoCiAgICAgICAgIHJl dHVybiB0aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9 IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VS VF9HQ19PQkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAg ICBUZXN0T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgp KTsKKyAgICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDIpCiAgICAgICAgIHJl dHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdo IGFyZ3VtZW50cyIpKTsKICAgICBUZXN0T2JqKiBvYmpBcmcodG9UZXN0T2JqKE1BWUJFX01JU1NJ TkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkpKTsKQEAgLTE2OTgsNyAr MTY5OCw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uT3ZlcmxvYWRlZE1ldGhvZDEoCiAgICAgY29uc3QgU3RyaW5nJiBzdHJB cmcodXN0cmluZ1RvU3RyaW5nKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4ZWMsIDEsIE1pc3Np bmdJc1VuZGVmaW5lZCkuaXNFbXB0eSgpID8gVVN0cmluZygpIDogTUFZQkVfTUlTU0lOR19QQVJB TUVURVIoZXhlYywgMSwgTWlzc2luZ0lzVW5kZWZpbmVkKS50b1N0cmluZyhleGVjKSkpOwogICAg IGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShqc1VuZGVmaW5lZCgpKTsKLSAgICBpbXAtPm92ZXJsb2FkZWRNZXRob2Qob2JqQXJnLCBzdHJB cmcpOworICAgIGltcGwtPm92ZXJsb2FkZWRNZXRob2Qob2JqQXJnLCBzdHJBcmcpOwogICAgIHJl dHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE3MDksNyArMTcw OSw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3Rv dHlwZUZ1bmN0aW9uT3ZlcmxvYWRlZE1ldGhvZDIoCiAgICAgICAgIHJldHVybiB0aHJvd1ZNVHlw ZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpT VGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19PQkpFQ1RfSU5I RVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0T2JqKiBpbXAg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAgICBUZXN0T2Jq KiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwoKSk7CiAgICAg aWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCiAgICAgICAgIHJldHVybiB0aHJvd1ZNRXJy b3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3VtZW50cyIpKTsK ICAgICBUZXN0T2JqKiBvYmpBcmcodG9UZXN0T2JqKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4 ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkpKTsKQEAgLTE3MTgsMTQgKzE3MTgsMTQgQEAgc3Rh dGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25PdmVybG9hZGVkTWV0aG9kMigKIAogICAgIHNpemVfdCBhcmdzQ291bnQgPSBleGVjLT5hcmd1 bWVudENvdW50KCk7CiAgICAgaWYgKGFyZ3NDb3VudCA8PSAxKSB7Ci0gICAgICAgIGltcC0+b3Zl cmxvYWRlZE1ldGhvZChvYmpBcmcpOworICAgICAgICBpbXBsLT5vdmVybG9hZGVkTWV0aG9kKG9i akFyZyk7CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAg ICAgfQogCiAgICAgaW50IGludEFyZyhNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAxLCBN aXNzaW5nSXNVbmRlZmluZWQpLnRvSW50MzIoZXhlYykpOwogICAgIGlmIChleGVjLT5oYWRFeGNl cHRpb24oKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsK LSAgICBpbXAtPm92ZXJsb2FkZWRNZXRob2Qob2JqQXJnLCBpbnRBcmcpOworICAgIGltcGwtPm92 ZXJsb2FkZWRNZXRob2Qob2JqQXJnLCBpbnRBcmcpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE3MzYsMTMgKzE3MzYsMTMgQEAgc3RhdGljIEVu Y29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PdmVy bG9hZGVkTWV0aG9kMygKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7CiAg ICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmpl Y3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRUaGlz LCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0PFRl c3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0aWNf Y2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhlYy0+YXJndW1l bnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVU eXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIGNvbnN0IFN0cmlu ZyYgc3RyQXJnKHVzdHJpbmdUb1N0cmluZyhNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAw LCBNaXNzaW5nSXNVbmRlZmluZWQpLmlzRW1wdHkoKSA/IFVTdHJpbmcoKSA6IE1BWUJFX01JU1NJ TkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkudG9TdHJpbmcoZXhlYykp KTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaW1wLT5vdmVybG9hZGVkTWV0aG9kKHN0ckFy Zyk7CisgICAgaW1wbC0+b3ZlcmxvYWRlZE1ldGhvZChzdHJBcmcpOwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE3NTMsMTMgKzE3NTMsMTMgQEAg c3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVu Y3Rpb25PdmVybG9hZGVkTWV0aG9kNCgKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3Io ZXhlYyk7CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2Jq Kj4oYXNPYmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhj YXN0ZWRUaGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwg PSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhl Yy0+YXJndW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVj LCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIGlu dCBpbnRBcmcoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMCwgTWlzc2luZ0lzVW5kZWZp bmVkKS50b0ludDMyKGV4ZWMpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaW1wLT5vdmVy bG9hZGVkTWV0aG9kKGludEFyZyk7CisgICAgaW1wbC0+b3ZlcmxvYWRlZE1ldGhvZChpbnRBcmcp OwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE3 NzAsNyArMTc3MCw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVz dE9ialByb3RvdHlwZUZ1bmN0aW9uT3ZlcmxvYWRlZE1ldGhvZDUoCiAgICAgICAgIHJldHVybiB0 aHJvd1ZNVHlwZUVycm9yKGV4ZWMpOwogICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IHN0YXRp Y19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHRoaXNWYWx1ZSkpOwogICAgIEFTU0VSVF9HQ19P QkpFQ1RfSU5IRVJJVFMoY2FzdGVkVGhpcywgJkpTVGVzdE9iajo6c19pbmZvKTsKLSAgICBUZXN0 T2JqKiBpbXAgPSBzdGF0aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKKyAg ICBUZXN0T2JqKiBpbXBsID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMtPmltcGwo KSk7CiAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA8IDEpCiAgICAgICAgIHJldHVybiB0 aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsICJOb3QgZW5vdWdoIGFyZ3Vt ZW50cyIpKTsKICAgICBpZiAoZXhlYy0+YXJndW1lbnRDb3VudCgpIDw9IDAgfHwgIWV4ZWMtPmFy Z3VtZW50KDApLmlzT2JqZWN0KCkpIHsKQEAgLTE3NzgsNyArMTc3OCw3IEBAIHN0YXRpYyBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uT3Zlcmxv YWRlZE1ldGhvZDUoCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQo KSk7CiAgICAgfQogICAgIFJlZlB0cjxUZXN0Q2FsbGJhY2s+IGNhbGxiYWNrID0gSlNUZXN0Q2Fs bGJhY2s6OmNyZWF0ZShhc09iamVjdChleGVjLT5hcmd1bWVudCgwKSksIGNhc3RlZFRoaXMtPmds b2JhbE9iamVjdCgpKTsKLSAgICBpbXAtPm92ZXJsb2FkZWRNZXRob2QoY2FsbGJhY2spOworICAg IGltcGwtPm92ZXJsb2FkZWRNZXRob2QoY2FsbGJhY2spOwogICAgIHJldHVybiBKU1ZhbHVlOjpl bmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKQEAgLTE3ODksMTMgKzE3ODksMTMgQEAgc3RhdGlj IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25P dmVybG9hZGVkTWV0aG9kNigKICAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7 CiAgICAgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNP YmplY3QodGhpc1ZhbHVlKSk7CiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyhjYXN0ZWRU aGlzLCAmSlNUZXN0T2JqOjpzX2luZm8pOwotICAgIFRlc3RPYmoqIGltcCA9IHN0YXRpY19jYXN0 PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIFRlc3RPYmoqIGltcGwgPSBzdGF0 aWNfY2FzdDxUZXN0T2JqKj4oY2FzdGVkVGhpcy0+aW1wbCgpKTsKICAgICBpZiAoZXhlYy0+YXJn dW1lbnRDb3VudCgpIDwgMSkKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVh dGVUeXBlRXJyb3IoZXhlYywgIk5vdCBlbm91Z2ggYXJndW1lbnRzIikpOwogICAgIERPTVN0cmlu Z0xpc3QqIGxpc3RBcmcodG9ET01TdHJpbmdMaXN0KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4 ZWMsIDAsIE1pc3NpbmdJc1VuZGVmaW5lZCkpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9u KCkpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAg aW1wLT5vdmVybG9hZGVkTWV0aG9kKGxpc3RBcmcpOworICAgIGltcGwtPm92ZXJsb2FkZWRNZXRo b2QobGlzdEFyZyk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsK IH0KIApAQCAtMTgwNiwxMyArMTgwNiwxMyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hP U1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbk92ZXJsb2FkZWRNZXRob2Q3KAogICAg ICAgICByZXR1cm4gdGhyb3dWTVR5cGVFcnJvcihleGVjKTsKICAgICBKU1Rlc3RPYmoqIGNhc3Rl ZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RPYmoqPihhc09iamVjdCh0aGlzVmFsdWUpKTsKICAg ICBBU1NFUlRfR0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsICZKU1Rlc3RPYmo6OnNfaW5m byk7Ci0gICAgVGVzdE9iaiogaW1wID0gc3RhdGljX2Nhc3Q8VGVzdE9iaio+KGNhc3RlZFRoaXMt PmltcGwoKSk7CisgICAgVGVzdE9iaiogaW1wbCA9IHN0YXRpY19jYXN0PFRlc3RPYmoqPihjYXN0 ZWRUaGlzLT5pbXBsKCkpOwogICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPCAxKQogICAg ICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVjLCAiTm90 IGVub3VnaCBhcmd1bWVudHMiKSk7CiAgICAgRE9NU3RyaW5nTGlzdCogYXJyYXlBcmcodG9ET01T dHJpbmdMaXN0KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGV4ZWMsIDAsIE1pc3NpbmdJc1VuZGVm aW5lZCkpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaW1wLT5vdmVybG9hZGVkTWV0aG9k KGFycmF5QXJnKTsKKyAgICBpbXBsLT5vdmVybG9hZGVkTWV0aG9kKGFycmF5QXJnKTsKICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0U2VyaWFsaXplZFNj cmlwdFZhbHVlSW50ZXJmYWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9KUy9KU1Rlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UuY3BwCmluZGV4IGJj MGNmNWNmNWQxZTExNzFkOGU2N2ExYTlhN2YxMTM4Y2U3NDllOTYuLmViYTk4YjgwZWZiNGIzZDBl NjZlMzkyOTRjYTU0ZWUwNGIzYjRlN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RT ZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UuY3BwCkBAIC0xMzEsOCArMTMxLDggQEAgSlNW YWx1ZSBqc1Rlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2VWYWx1ZShFeGVjU3RhdGUq IGV4ZWMsIEpTVmFsdWUgc2xvdEIKIHsKICAgICBKU1Rlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJ bnRlcmZhY2UqIGNhc3RlZFRoaXMgPSBzdGF0aWNfY2FzdDxKU1Rlc3RTZXJpYWxpemVkU2NyaXB0 VmFsdWVJbnRlcmZhY2UqPihhc09iamVjdChzbG90QmFzZSkpOwogICAgIFVOVVNFRF9QQVJBTShl eGVjKTsKLSAgICBUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlKiBpbXAgPSBzdGF0 aWNfY2FzdDxUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlKj4oY2FzdGVkVGhpcy0+ aW1wbCgpKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IGltcC0+dmFsdWUoKSA/IGltcC0+dmFsdWUo KS0+ZGVzZXJpYWxpemUoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCkpIDoganNOdWxs KCk7CisgICAgVGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZSogaW1wbCA9IHN0YXRp Y19jYXN0PFRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UqPihjYXN0ZWRUaGlzLT5p bXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0ID0gaW1wbC0+dmFsdWUoKSA/IGltcGwtPnZhbHVl KCktPmRlc2VyaWFsaXplKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpKSA6IGpzTnVs bCgpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAK