100958 2012-11-01 08:17:04 -0700 Memory instrumentation: do not call checkCountedObject with wrong pointers 2012-11-02 01:06:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov benjamin keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 756260 0 yurys 2012-11-01 08:17:04 -0700 MemoryInstrumentationClient::checkCountedObject should be called only when we know that the address passed to the method is the heap address of an object that has been allocated by malloc. 756275 1 171857 yurys 2012-11-01 08:30:30 -0700 Created attachment 171857 Patch 756918 2 loislo 2012-11-01 23:39:46 -0700 lgtm 756941 3 171857 apavlov 2012-11-02 00:29:16 -0700 Comment on attachment 171857 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171857&action=review > Tools/TestWebKitAPI/Tests/WTF/MemoryInstrumentationTest.cpp:-791 > - blank line in between? 756954 4 yurys 2012-11-02 00:49:12 -0700 (In reply to comment #2) > lgtm Done. 756966 5 yurys 2012-11-02 01:06:56 -0700 Committed r133272: <http://trac.webkit.org/changeset/133272> 171857 2012-11-01 08:30:30 -0700 2012-11-02 00:29:15 -0700 Patch bug-100958-20121101192851.patch text/plain 11936 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDk4OTk1MTRkNGRkMzc1NjFhYTlhNjA1 YzAxN2M5NjU3NjViZjNlY2UuLmJhMGI5YTY3MjdlZDQxY2I1ZDRmNTU3MjZhMzYwYWI4NzY3Njg2 ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTItMTEtMDEgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgTWVtb3J5IGluc3RydW1lbnRhdGlvbjogZG8g bm90IGNhbGwgY2hlY2tDb3VudGVkT2JqZWN0IHdpdGggd3JvbmcgcG9pbnRlcnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDk1OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgY2FsbHMgdG8g Y2hlY2tDb3VudGVkT2JqZWN0IGZyb20gcGxhY2VzIHdoZXJlIHRoZSBwb2ludGVyIG1heSBjb250 YWluCisgICAgICAgIGFuIGFkZHJlc3Mgb2YgYSBiYXNlIGNsYXNzIHdoaWNoIG1heSBkaWZmZXIg ZnJvbSB0aGUgYWN0dWFsIG9iamVjdCBwb2ludGVyLiBJbnN0ZWFkCisgICAgICAgIGNoZWNrQ291 bnRlZE9iamVjdCBpcyBvbmx5IGNhbGxlZCByaWdodCBhZnRlciBwcm9jZXNzaW5nIGRlZmVycmVk IHBvaW50ZXIgd2hlcmUKKyAgICAgICAgd2Uga25vdyByZWFsIGFkZHJlc3MuCisKKyAgICAgICAg KiB3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3Ry dW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbCk6CisgICAgICAgIChXVEY6Ojo6cHJvY2Vzcyk6CisK KzIwMTItMTEtMDEgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgTWVtb3J5IGluc3RydW1lbnRhdGlvbjogcmVwb3J0IG1lbW9yeSBvY2N1cGllZCBieSBS ZXNvdXJjZVJlcXVlc3QgaW5zdGVhZCBvZiBpdHMgYmFzZSBSZXNvdXJjZVJlcXVlc3RCYXNlCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA0OTcKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGNlMmIwZTI0ZjJlZjIzYmQxYjJlZjQ0MDJiMWFhZTBmMTY5NzRhZWUuLmFj NWNlYWFjMjM2YWZkOTcyZTdhODk0MThiZTkzOGJhZWI1Y2U4ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMi0xMS0wMSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBNZW1vcnkgaW5zdHJ1bWVudGF0aW9uOiBkbyBub3QgY2FsbCBjaGVj a0NvdW50ZWRPYmplY3Qgd2l0aCB3cm9uZyBwb2ludGVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCByZWR1bmRhbnQgY2FsbCB0byBjaGVj a0NvdW50ZWRPYmplY3QuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb25DbGll bnRJbXBsOjpjb3VudE9iamVjdFNpemUpOgorCiAyMDEyLTEwLTMwICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE91dHB1dCBj b2RlIGV2YWx1YXRlZCBpbiB0aGUgY29uc29sZSB0aGUgc2FtZSBhcyBjb25zb2xlLmxvZwpkaWZm IC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2Uv V1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAppbmRleCA1ZDk1ZjJmYTk4OTI5MWJjOGVj M2EzYmI5NDFhMmRiZDYwMjU0YzlhLi5iNzAyYTdhOTdlYTk5YTk2YzM2YmNiM2ViNDhlMzI0YTA1 MDg4NTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24u aAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaApAQCAtMjMwLDcg KzIzMCw2IEBAIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0 IFQqIGNvbnN0JiBvYmplY3QsIE1lbW9yeU9iamVjdFR5CiAgICAgfSBlbHNlIHsKICAgICAgICAg aWYgKCFvYmplY3QgfHwgdmlzaXRlZChvYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICBjaGVja0NvdW50ZWRPYmplY3Qob2JqZWN0KTsKICAgICAgICAgZGVmZXJJbnN0cnVtZW50 ZWRQb2ludGVyKGFkb3B0UHRyKG5ldyBJbnN0cnVtZW50ZWRQb2ludGVyPFQ+KG9iamVjdCwgb3du ZXJPYmplY3RUeXBlKSkpOwogICAgIH0KIH0KQEAgLTI2Miw2ICsyNjEsNyBAQCB2b2lkIE1lbW9y eUluc3RydW1lbnRhdGlvbjo6SW5zdHJ1bWVudGVkUG9pbnRlcjxUPjo6cHJvY2VzcyhNZW1vcnlJ bnN0cnVtZW50YXRpbwogICAgIGlmIChwb2ludGVyICE9IG1fcG9pbnRlciAmJiBtZW1vcnlJbnN0 cnVtZW50YXRpb24tPnZpc2l0ZWQocG9pbnRlcikpCiAgICAgICAgIHJldHVybjsKICAgICBtZW1v cnlJbnN0cnVtZW50YXRpb24tPmNvdW50T2JqZWN0U2l6ZShwb2ludGVyLCBtZW1vcnlPYmplY3RJ bmZvLm9iamVjdFR5cGUoKSwgbWVtb3J5T2JqZWN0SW5mby5vYmplY3RTaXplKCkpOworICAgIG1l bW9yeUluc3RydW1lbnRhdGlvbi0+Y2hlY2tDb3VudGVkT2JqZWN0KHBvaW50ZXIpOwogfQogCiAv LyBMaW5rIHRpbWUgZ3VhcmQgZm9yIGNsYXNzZXMgd2l0aCBleHRlcm5hbCBtZW1vcnkgaW5zdHJ1 bWVudGF0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL01lbW9yeUlu c3RydW1lbnRhdGlvbkltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL01lbW9yeUlu c3RydW1lbnRhdGlvbkltcGwuY3BwCmluZGV4IDIwZDE2Y2IxZTAzYzI1N2I5ODczN2IzNDk2Y2M4 ZmY1ZTE4ZjVkODMuLmFlNTliOTkxYzk0ZjJiZmQ4YmFjZThlYTcyNTU5NTg1MDcyMjU0YTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9NZW1vcnlJbnN0cnVtZW50YXRpb25J bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uSW1wbC5jcHAKQEAgLTcwLDEwICs3MCw4IEBAIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9u Q2xpZW50SW1wbDo6Y291bnRPYmplY3RTaXplKGNvbnN0IHZvaWQqIG9iamVjdCwgTWVtb3J5CiAg ICAgaWYgKCFjaGVja0luc3RydW1lbnRlZE9iamVjdHMoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgaWYgKG9iamVjdCkgeworICAgIGlmIChvYmplY3QpCiAgICAgICAgIG1fY291bnRlZE9iamVj dHMuYWRkKG9iamVjdCwgc2l6ZSk7Ci0gICAgICAgIGNoZWNrQ291bnRlZE9iamVjdChvYmplY3Qp OwotICAgIH0KIH0KIAogYm9vbCBNZW1vcnlJbnN0cnVtZW50YXRpb25DbGllbnRJbXBsOjp2aXNp dGVkKGNvbnN0IHZvaWQqIG9iamVjdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBlMjkyZmNiODJhYjgwNWMyNWEwNWJkMTQ5MjJhMTUxMmQ5NmIy NjExLi41NzMxNTgzYTg0MjRjZTE1Y2E4OTA1MTU5ZmQ0ZWEyOTkyN2EyNGIzIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTItMTEtMDEgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgTWVtb3J5IGluc3RydW1lbnRhdGlvbjogZG8gbm90IGNhbGwgY2hlY2tDb3VudGVkT2Jq ZWN0IHdpdGggd3JvbmcgcG9pbnRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwMDk1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uVGVzdC5jcHA6IHRlc3QgdGhhdCBpZiB0aGVyZQorICAgICAgICBpZiB0aGVyZSBpcyBj bGFzcyBBIGRlcml2ZWQgZnJvbSBjbGFzc2VzIEIgYW5kIEMgYW5kIHdlIGhhdmUgcG9pbnRlciBC KiB0byBhbgorICAgICAgICBvYmplY3Qgb2YgY2xhc3MgQSB0aGVuIE1lbW9yeUluc3RydW1lbnRh dGlvbkNsaWVudDo6Y2hlY2tvdXRDb3VudGVkT2JqZWN0IHdvbid0CisgICAgICAgIGJlIGNhbGxl ZCBmb3IgQiogYnV0IG9ubHkgZm9yIEEqCisKKyAgICAgICAgQWxzbyBNZW1vcnlJbnN0cnVtZW50 YXRpb24gaW1wbGVtZW50YXRpb24gdXNlZCBpbiB0aGUgdGVzdCB3YXMgcmVmYWN0b3JlZCB0bwor ICAgICAgICBhbGxvdyBwYXNzaW5nIGNsaWVudCBhcyBhIHBhcmFtZXRlci4gVGhlIGNsaWVudCBp bXBsZW1lbnRhdGlvbiB3YXMgZXh0cmFjdGVkIGludG8KKyAgICAgICAgYSB0b3AtbGV2ZWwgY2xh c3MgTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdENsaWVudC4KKwogMjAxMi0xMC0zMSAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBOUldUOiBsaW50IHdhcm5p bmdzIGRvbid0IHNob3cgdXAgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XVEYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcAppbmRleCAz MDFjNGIxYWMzNzkxY2E3MzZkMTA4NTg1NDdlN2VhNGE0NmZiYjk3Li4yMDU5ODJlYTJhZGJjOWEz MjIyYjQ2ZjQyNDc5MzY3ZWRkZDQ2ZDBkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcAorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dURi9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcApAQCAtODEs NTcgKzgxLDY1IEBAIHVzaW5nIFdURjo6TWVtb3J5T2JqZWN0VHlwZTsKIAogTWVtb3J5T2JqZWN0 VHlwZSBUZXN0VHlwZSA9ICJUZXN0VHlwZSI7CiAKLWNsYXNzIEluc3RydW1lbnRhdGlvblRlc3RI ZWxwZXIgOiBwdWJsaWMgV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb24geworY2xhc3MgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uVGVzdENsaWVudCA6IHB1YmxpYyBXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbkNsaWVudCB7CiBwdWJsaWM6Ci0gICAgSW5zdHJ1bWVudGF0aW9uVGVzdEhlbHBlcigpCi0g ICAgICAgIDogTWVtb3J5SW5zdHJ1bWVudGF0aW9uKCZtX2NsaWVudCkKLSAgICB7IH0KKyAgICB2 aXJ0dWFsIHZvaWQgY291bnRPYmplY3RTaXplKGNvbnN0IHZvaWQqLCBNZW1vcnlPYmplY3RUeXBl IG9iamVjdFR5cGUsIHNpemVfdCBzaXplKQorICAgIHsKKyAgICAgICAgVHlwZVRvU2l6ZU1hcDo6 QWRkUmVzdWx0IHJlc3VsdCA9IG1fdG90YWxTaXplcy5hZGQob2JqZWN0VHlwZSwgc2l6ZSk7Cisg ICAgICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpCisgICAgICAgICAgICByZXN1bHQuaXRlcmF0 b3ItPnZhbHVlICs9IHNpemU7CisgICAgfQorICAgIHZpcnR1YWwgYm9vbCB2aXNpdGVkKGNvbnN0 IHZvaWQqIG9iamVjdCkgeyByZXR1cm4gIW1fdmlzaXRlZE9iamVjdHMuYWRkKG9iamVjdCkuaXNO ZXdFbnRyeTsgfQorICAgIHZpcnR1YWwgdm9pZCBjaGVja0NvdW50ZWRPYmplY3QoY29uc3Qgdm9p ZCopIHsgfQorCisgICAgc2l6ZV90IHZpc2l0ZWRPYmplY3RzKCkgY29uc3QgeyByZXR1cm4gbV92 aXNpdGVkT2JqZWN0cy5zaXplKCk7IH0KKyAgICBzaXplX3QgdG90YWxTaXplKGNvbnN0IE1lbW9y eU9iamVjdFR5cGUgb2JqZWN0VHlwZSkgY29uc3QKKyAgICB7CisgICAgICAgIFR5cGVUb1NpemVN YXA6OmNvbnN0X2l0ZXJhdG9yIGkgPSBtX3RvdGFsU2l6ZXMuZmluZChvYmplY3RUeXBlKTsKKyAg ICAgICAgcmV0dXJuIGkgPT0gbV90b3RhbFNpemVzLmVuZCgpID8gMCA6IGktPnZhbHVlOworICAg IH0KKworICAgIHNpemVfdCByZXBvcnRlZFNpemVGb3JBbGxUeXBlcygpIGNvbnN0CisgICAgewor ICAgICAgICBzaXplX3Qgc2l6ZSA9IDA7CisgICAgICAgIGZvciAoVHlwZVRvU2l6ZU1hcDo6Y29u c3RfaXRlcmF0b3IgaSA9IG1fdG90YWxTaXplcy5iZWdpbigpOyBpICE9IG1fdG90YWxTaXplcy5l bmQoKTsgKytpKQorICAgICAgICAgICAgc2l6ZSArPSBpLT52YWx1ZTsKKyAgICAgICAgcmV0dXJu IHNpemU7CisgICAgfQorCitwcml2YXRlOgorICAgIHR5cGVkZWYgSGFzaE1hcDxNZW1vcnlPYmpl Y3RUeXBlLCBzaXplX3Q+IFR5cGVUb1NpemVNYXA7CisgICAgVHlwZVRvU2l6ZU1hcCBtX3RvdGFs U2l6ZXM7CisgICAgV1RGOjpIYXNoU2V0PGNvbnN0IHZvaWQqPiBtX3Zpc2l0ZWRPYmplY3RzOwor fTsKKworY2xhc3MgSW5zdHJ1bWVudGF0aW9uVGVzdEltcGwgOiBwdWJsaWMgV1RGOjpNZW1vcnlJ bnN0cnVtZW50YXRpb24geworcHVibGljOgorICAgIGV4cGxpY2l0IEluc3RydW1lbnRhdGlvblRl c3RJbXBsKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3RDbGllbnQqIGNsaWVudCkKKyAgICAgICAg OiBNZW1vcnlJbnN0cnVtZW50YXRpb24oY2xpZW50KQorICAgICAgICAsIG1fY2xpZW50KGNsaWVu dCkgeyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RlZmVycmVkSW5zdHJ1bWVudGVkUG9p bnRlcnMoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVmZXJJbnN0cnVtZW50ZWRQb2ludGVyKFBhc3NP d25QdHI8SW5zdHJ1bWVudGVkUG9pbnRlckJhc2U+KTsKIAotICAgIHNpemVfdCB2aXNpdGVkT2Jq ZWN0cygpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50LnZpc2l0ZWRPYmplY3RzKCk7IH0KLSAgICBz aXplX3QgcmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudC5y ZXBvcnRlZFNpemVGb3JBbGxUeXBlcygpOyB9Ci0gICAgc2l6ZV90IHRvdGFsU2l6ZShjb25zdCBN ZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50LnRvdGFs U2l6ZShvYmplY3RUeXBlKTsgfQorICAgIHNpemVfdCB2aXNpdGVkT2JqZWN0cygpIGNvbnN0IHsg cmV0dXJuIG1fY2xpZW50LT52aXNpdGVkT2JqZWN0cygpOyB9CisgICAgc2l6ZV90IHJlcG9ydGVk U2l6ZUZvckFsbFR5cGVzKCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQtPnJlcG9ydGVkU2l6ZUZv ckFsbFR5cGVzKCk7IH0KKyAgICBzaXplX3QgdG90YWxTaXplKGNvbnN0IE1lbW9yeU9iamVjdFR5 cGUgb2JqZWN0VHlwZSkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQtPnRvdGFsU2l6ZShvYmplY3RU eXBlKTsgfQogCiBwcml2YXRlOgotICAgIGNsYXNzIENsaWVudCA6IHB1YmxpYyBXVEY6Ok1lbW9y eUluc3RydW1lbnRhdGlvbkNsaWVudCB7Ci0gICAgcHVibGljOgotICAgICAgICB2aXJ0dWFsIHZv aWQgY291bnRPYmplY3RTaXplKGNvbnN0IHZvaWQqLCBNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5 cGUsIHNpemVfdCBzaXplKQotICAgICAgICB7Ci0gICAgICAgICAgICBUeXBlVG9TaXplTWFwOjpB ZGRSZXN1bHQgcmVzdWx0ID0gbV90b3RhbFNpemVzLmFkZChvYmplY3RUeXBlLCBzaXplKTsKLSAg ICAgICAgICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgICAgICAgICAgcmVzdWx0 Lml0ZXJhdG9yLT52YWx1ZSArPSBzaXplOwotICAgICAgICB9Ci0gICAgICAgIHZpcnR1YWwgYm9v bCB2aXNpdGVkKGNvbnN0IHZvaWQqIG9iamVjdCkgeyByZXR1cm4gIW1fdmlzaXRlZE9iamVjdHMu YWRkKG9iamVjdCkuaXNOZXdFbnRyeTsgfQotICAgICAgICB2aXJ0dWFsIHZvaWQgY2hlY2tDb3Vu dGVkT2JqZWN0KGNvbnN0IHZvaWQqKSB7IH0KLQotICAgICAgICBzaXplX3QgdmlzaXRlZE9iamVj dHMoKSBjb25zdCB7IHJldHVybiBtX3Zpc2l0ZWRPYmplY3RzLnNpemUoKTsgfQotICAgICAgICBz aXplX3QgdG90YWxTaXplKGNvbnN0IE1lbW9yeU9iamVjdFR5cGUgb2JqZWN0VHlwZSkgY29uc3QK LSAgICAgICAgewotICAgICAgICAgICAgVHlwZVRvU2l6ZU1hcDo6Y29uc3RfaXRlcmF0b3IgaSA9 IG1fdG90YWxTaXplcy5maW5kKG9iamVjdFR5cGUpOwotICAgICAgICAgICAgcmV0dXJuIGkgPT0g bV90b3RhbFNpemVzLmVuZCgpID8gMCA6IGktPnZhbHVlOwotICAgICAgICB9Ci0KLSAgICAgICAg c2l6ZV90IHJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkgY29uc3QKLSAgICAgICAgewotICAgICAg ICAgICAgc2l6ZV90IHNpemUgPSAwOwotICAgICAgICAgICAgZm9yIChUeXBlVG9TaXplTWFwOjpj b25zdF9pdGVyYXRvciBpID0gbV90b3RhbFNpemVzLmJlZ2luKCk7IGkgIT0gbV90b3RhbFNpemVz LmVuZCgpOyArK2kpCi0gICAgICAgICAgICAgICAgc2l6ZSArPSBpLT52YWx1ZTsKLSAgICAgICAg ICAgIHJldHVybiBzaXplOwotICAgICAgICB9Ci0KLSAgICBwcml2YXRlOgotICAgICAgICB0eXBl ZGVmIEhhc2hNYXA8TWVtb3J5T2JqZWN0VHlwZSwgc2l6ZV90PiBUeXBlVG9TaXplTWFwOwotICAg ICAgICBUeXBlVG9TaXplTWFwIG1fdG90YWxTaXplczsKLSAgICAgICAgV1RGOjpIYXNoU2V0PGNv bnN0IHZvaWQqPiBtX3Zpc2l0ZWRPYmplY3RzOwotICAgIH07Ci0KLSAgICBDbGllbnQgbV9jbGll bnQ7CisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdENsaWVudCogbV9jbGllbnQ7CiAgICAg VmVjdG9yPE93blB0cjxJbnN0cnVtZW50ZWRQb2ludGVyQmFzZT4gPiBtX2RlZmVycmVkSW5zdHJ1 bWVudGVkUG9pbnRlcnM7CiB9OwogCi12b2lkIEluc3RydW1lbnRhdGlvblRlc3RIZWxwZXI6OnBy b2Nlc3NEZWZlcnJlZEluc3RydW1lbnRlZFBvaW50ZXJzKCkKK2NsYXNzIEluc3RydW1lbnRhdGlv blRlc3RIZWxwZXIgOiBwdWJsaWMgSW5zdHJ1bWVudGF0aW9uVGVzdEltcGwgeworcHVibGljOgor ICAgIEluc3RydW1lbnRhdGlvblRlc3RIZWxwZXIoKSA6IEluc3RydW1lbnRhdGlvblRlc3RJbXBs KCZtX2NsaWVudCkgeyB9CisKK3ByaXZhdGU6CisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVz dENsaWVudCBtX2NsaWVudDsKK307CisKK3ZvaWQgSW5zdHJ1bWVudGF0aW9uVGVzdEltcGw6OnBy b2Nlc3NEZWZlcnJlZEluc3RydW1lbnRlZFBvaW50ZXJzKCkKIHsKICAgICB3aGlsZSAoIW1fZGVm ZXJyZWRJbnN0cnVtZW50ZWRQb2ludGVycy5pc0VtcHR5KCkpIHsKICAgICAgICAgT3duUHRyPElu c3RydW1lbnRlZFBvaW50ZXJCYXNlPiBwb2ludGVyID0gbV9kZWZlcnJlZEluc3RydW1lbnRlZFBv aW50ZXJzLmxhc3QoKS5yZWxlYXNlKCk7CkBAIC0xNDAsNyArMTQ4LDcgQEAgdm9pZCBJbnN0cnVt ZW50YXRpb25UZXN0SGVscGVyOjpwcm9jZXNzRGVmZXJyZWRJbnN0cnVtZW50ZWRQb2ludGVycygp CiAgICAgfQogfQogCi12b2lkIEluc3RydW1lbnRhdGlvblRlc3RIZWxwZXI6OmRlZmVySW5zdHJ1 bWVudGVkUG9pbnRlcihQYXNzT3duUHRyPEluc3RydW1lbnRlZFBvaW50ZXJCYXNlPiBwb2ludGVy KQordm9pZCBJbnN0cnVtZW50YXRpb25UZXN0SW1wbDo6ZGVmZXJJbnN0cnVtZW50ZWRQb2ludGVy KFBhc3NPd25QdHI8SW5zdHJ1bWVudGVkUG9pbnRlckJhc2U+IHBvaW50ZXIpCiB7CiAgICAgbV9k ZWZlcnJlZEluc3RydW1lbnRlZFBvaW50ZXJzLmFwcGVuZChwb2ludGVyKTsKIH0KQEAgLTc4OCw4 ICs3OTYsNiBAQCBwdWJsaWM6CiAgICAgICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9i amVjdEluZm8sIHRoaXMsIFRlc3RUeXBlKTsKICAgICB9CiB9OwotCi0KIFRFU1QoTWVtb3J5SW5z dHJ1bWVudGF0aW9uVGVzdCwgaW5zdHJ1bWVudGVkV2l0aE11bHRpcGxlQW5jZXN0b3JzKQogewog ICAgIEluc3RydW1lbnRhdGlvblRlc3RIZWxwZXIgaGVscGVyOwpAQCAtNzk5LDExICs4MDUsNDMg QEAgVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LCBpbnN0cnVtZW50ZWRXaXRoTXVsdGlw bGVBbmNlc3RvcnMpCiAgICAgSW5zdHJ1bWVudGVkKiBhbmNlc3RvclBvaW50ZXIgPSBkZXNjZW5k YW50UG9pbnRlcjsKICAgICBJbnN0cnVtZW50ZWRPd25lcjxJbnN0cnVtZW50ZWQqPiBhbmNlc3Rv clBvaW50ZXJPd25lcihhbmNlc3RvclBvaW50ZXIpOwogICAgIEVYUEVDVF9ORShzdGF0aWNfY2Fz dDx2b2lkKj4oYW5jZXN0b3JQb2ludGVyKSwgc3RhdGljX2Nhc3Q8dm9pZCo+KGRlc2NlbmRhbnRQ b2ludGVyKSk7CisKICAgICBoZWxwZXIuYWRkUm9vdE9iamVjdChkZXNjZW5kYW50UG9pbnRlck93 bmVyKTsKICAgICBoZWxwZXIuYWRkUm9vdE9iamVjdChhbmNlc3RvclBvaW50ZXJPd25lcik7CiAg ICAgRVhQRUNUX0VRKHNpemVvZihDbGFzc1dpdGhUd29BbmNlc3RvcnMpLCBoZWxwZXIucmVwb3J0 ZWRTaXplRm9yQWxsVHlwZXMoKSk7CiAgICAgRVhQRUNUX0VRKDJ1LCBoZWxwZXIudmlzaXRlZE9i amVjdHMoKSk7CiB9CiAKK2NsYXNzIENoZWNrQ291bnRlZE9iamVjdHNDbGllbnQgOiBwdWJsaWMg TWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdENsaWVudCB7CitwdWJsaWM6CisgICAgQ2hlY2tDb3Vu dGVkT2JqZWN0c0NsaWVudChjb25zdCB2b2lkKiBleHBlY3RlZFBvaW50ZXIpIDogbV9leHBlY3Rl ZFBvaW50ZXIoZXhwZWN0ZWRQb2ludGVyKSwgbV9leHBlY3RlZFBvaW50ZXJGb3VuZChmYWxzZSkg eyB9CisgICAgdmlydHVhbCB2b2lkIGNoZWNrQ291bnRlZE9iamVjdChjb25zdCB2b2lkKiBwb2lu dGVyKQorICAgIHsKKyAgICAgICAgRVhQRUNUX0VRKHBvaW50ZXIsIG1fZXhwZWN0ZWRQb2ludGVy KTsKKyAgICAgICAgbV9leHBlY3RlZFBvaW50ZXJGb3VuZCA9IHRydWU7CisgICAgfQorICAgIGJv b2wgZXhwZWN0ZWRQb2ludGVyRm91bmQoKSB7IHJldHVybiBtX2V4cGVjdGVkUG9pbnRlckZvdW5k OyB9CisKK3ByaXZhdGU6CisgICAgY29uc3Qgdm9pZCogbV9leHBlY3RlZFBvaW50ZXI7CisgICAg Ym9vbCBtX2V4cGVjdGVkUG9pbnRlckZvdW5kOworfTsKKworVEVTVChNZW1vcnlJbnN0cnVtZW50 YXRpb25UZXN0LCBjaGVja0NvdW50ZWRPYmplY3RXaXRoTXVsdGlwbGVBbmNlc3RvcnMpCit7Cisg ICAgT3duUHRyPENsYXNzV2l0aFR3b0FuY2VzdG9ycz4gaW5zdGFuY2UgPSBhZG9wdFB0cihuZXcg Q2xhc3NXaXRoVHdvQW5jZXN0b3JzKCkpOworICAgIENsYXNzV2l0aFR3b0FuY2VzdG9ycyogZGVz Y2VuZGFudFBvaW50ZXIgPSBpbnN0YW5jZS5nZXQoKTsKKyAgICBJbnN0cnVtZW50ZWRPd25lcjxD bGFzc1dpdGhUd29BbmNlc3RvcnMqPiBkZXNjZW5kYW50UG9pbnRlck93bmVyKGRlc2NlbmRhbnRQ b2ludGVyKTsKKyAgICBJbnN0cnVtZW50ZWQqIGFuY2VzdG9yUG9pbnRlciA9IGRlc2NlbmRhbnRQ b2ludGVyOworICAgIEluc3RydW1lbnRlZE93bmVyPEluc3RydW1lbnRlZCo+IGFuY2VzdG9yUG9p bnRlck93bmVyKGFuY2VzdG9yUG9pbnRlcik7CisgICAgRVhQRUNUX05FKHN0YXRpY19jYXN0PHZv aWQqPihhbmNlc3RvclBvaW50ZXIpLCBzdGF0aWNfY2FzdDx2b2lkKj4oZGVzY2VuZGFudFBvaW50 ZXIpKTsKKworICAgIENoZWNrQ291bnRlZE9iamVjdHNDbGllbnQgY2xpZW50KGluc3RhbmNlLmdl dCgpKTsKKyAgICBJbnN0cnVtZW50YXRpb25UZXN0SW1wbCBpbnN0cnVtZW50YXRpb24oJmNsaWVu dCk7CisgICAgaW5zdHJ1bWVudGF0aW9uLmFkZFJvb3RPYmplY3QoZGVzY2VuZGFudFBvaW50ZXJP d25lcik7CisgICAgaW5zdHJ1bWVudGF0aW9uLmFkZFJvb3RPYmplY3QoYW5jZXN0b3JQb2ludGVy T3duZXIpOworICAgIEVYUEVDVF9UUlVFKGNsaWVudC5leHBlY3RlZFBvaW50ZXJGb3VuZCgpKTsK K30KKwogfSAvLyBuYW1lc3BhY2UKIAo=