148668 2015-08-31 21:09:08 -0700 Possible CFArray leak in MediaPlayerPrivateAVFoundationCF.cpp 2015-09-01 08:49:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck bfulgham commit-queue eric.carlson joepeck oldest_to_newest 1122456 0 joepeck 2015-08-31 21:09:08 -0700 * SUMMARY Possible CFArray leak in MediaPlayerPrivateAVFoundationCF.cpp: RetainPtr<CFArrayRef> avTypes = AVCFURLAssetCopyAudiovisualMIMETypes(); Normally when assigning a "Copy" into a RetainPtr<T> we should adopt. 1122457 1 joepeck 2015-08-31 21:13:41 -0700 Interesting, it seems like two function nearly right next to each other are nearly identical: static const HashSet<String>& avfMIMETypes() static const HashSet<String>& mimeTypeCache() Maybe they can be merged. 1122458 2 joepeck 2015-08-31 21:18:47 -0700 The only different seems to be, one has lowercase strings, and the other doesn't. However, MediaPlayerPrivateAVFoundationObjC only has one implementation, and it does the lowercase strings, so I'll combine to just that one. 1122460 3 260349 joepeck 2015-08-31 21:23:26 -0700 Created attachment 260349 [PATCH] Proposed Fix 1122462 4 commit-queue 2015-08-31 21:24:55 -0700 Attachment 260349 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1122463 5 260350 joepeck 2015-08-31 21:27:45 -0700 Created attachment 260350 [PATCH] Proposed Fix 1122546 6 260350 commit-queue 2015-09-01 08:49:56 -0700 Comment on attachment 260350 [PATCH] Proposed Fix Clearing flags on attachment: 260350 Committed r189209: <http://trac.webkit.org/changeset/189209> 1122547 7 commit-queue 2015-09-01 08:49:58 -0700 All reviewed patches have been landed. Closing bug. 260349 2015-08-31 21:23:26 -0700 2015-08-31 21:27:45 -0700 [PATCH] Proposed Fix leak-2.patch text/plain 4523 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzYTQ5MDRhLi41NWJhYzU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcg QEAKIDIwMTUtMDgtMzEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBQb3NzaWJsZSBDRkFycmF5IGxlYWsgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uQ0YuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDg2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjptaW1lVHlwZUNhY2hlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OmF2Zk1JTUVUeXBlcyk6CisgICAgICAgIEZpeCB0aGUgbGVhayBpbiBhdmZNSU1FVHlwZXMu IENvbnNvbGlkYXRlIG9uIHRoZSBzaW5nbGUgaW1wbGVtZW50YXRpb24uCisgICAgICAgIE5vdGUg dGhhdCBhdmZNSU1FVHlwZXMgbG93ZXJjYXNlZCB0aGUgaW5wdXRzIGFuZCBtaW1lVHlwZUNhY2hl IGRpZCBub3QsCisgICAgICAgIGJ1dCB3ZSBub3cgbWF0Y2ggTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQyB3aGljaCBoYXMgb25lIHZlcnNpb24KKyAgICAgICAgdGhhdCBsb3dlcmNh c2VkIGlucHV0cyBhcyB3ZWxsLgorCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25DRjo6Z2V0U3VwcG9ydGVkVHlwZXMpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OnN1cHBvcnRzVHlwZSk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6c3VwcG9ydHNLZXlT eXN0ZW0pOgorICAgICAgICBDb252ZXJ0IHRvIHRoIGVuZXcgdmVyaXNvbi4KKworMjAxNS0wOC0z MSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFJlbW92 ZSB1bnVzZWQgI2RlZmluZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ4NjY3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCmluZGV4IDI3ZjZiMzEuLjY4NzM1YjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGLmNwcApAQCAtODcyLDMzICs4NzIsNiBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNv bnN0IEZsbwogICAgIG1fdmlkZW9GcmFtZUhhc0RyYXduID0gdHJ1ZTsKIH0KIAotc3RhdGljIGNv bnN0IEhhc2hTZXQ8U3RyaW5nPiYgbWltZVR5cGVDYWNoZSgpCi17Ci0gICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nPj4gY2FjaGU7Ci0gICAgc3RhdGljIGJvb2wgdHlwZUxp c3RJbml0aWFsaXplZCA9IGZhbHNlOwotCi0gICAgaWYgKHR5cGVMaXN0SW5pdGlhbGl6ZWQpCi0g ICAgICAgIHJldHVybiBjYWNoZTsKLSAgICB0eXBlTGlzdEluaXRpYWxpemVkID0gdHJ1ZTsKLQot ICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBzdXBwb3J0ZWRUeXBlcyA9IGFkb3B0Q0YoQVZDRlVS TEFzc2V0Q29weUF1ZGlvdmlzdWFsTUlNRVR5cGVzKCkpOwotICAgIAotICAgIEFTU0VSVChzdXBw b3J0ZWRUeXBlcyk7Ci0gICAgaWYgKCFzdXBwb3J0ZWRUeXBlcykKLSAgICAgICAgcmV0dXJuIGNh Y2hlOwotCi0gICAgQ0ZJbmRleCB0eXBlQ291bnQgPSBDRkFycmF5R2V0Q291bnQoc3VwcG9ydGVk VHlwZXMuZ2V0KCkpOwotICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IHR5cGVDb3VudDsgaSsr KQotICAgICAgICBjYWNoZS5nZXQoKS5hZGQoc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQXJy YXlHZXRWYWx1ZUF0SW5kZXgoc3VwcG9ydGVkVHlwZXMuZ2V0KCksIGkpKSk7Ci0KLSAgICByZXR1 cm4gY2FjaGU7Ci19IAotCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpn ZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0PFN0cmluZz4mIHN1cHBvcnRlZFR5cGVzKQotewotICAg IHN1cHBvcnRlZFR5cGVzID0gbWltZVR5cGVDYWNoZSgpOwotfSAKLQogI2lmIEhBVkUoQVZGT1VO REFUSU9OX0xPQURFUl9ERUxFR0FURSkgJiYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQV9WMikKIHN0 YXRpYyBib29sIGtleVN5c3RlbUlzU3VwcG9ydGVkKGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKQog ewpAQCAtOTEyLDcgKzg4NSw3IEBAIHN0YXRpYyBjb25zdCBIYXNoU2V0PFN0cmluZz4mIGF2Zk1J TUVUeXBlcygpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nPj4g Y2FjaGUgPSBbXSgpIHsKICAgICAgICAgSGFzaFNldDxTdHJpbmc+IHR5cGVzOwotICAgICAgICBS ZXRhaW5QdHI8Q0ZBcnJheVJlZj4gYXZUeXBlcyA9IEFWQ0ZVUkxBc3NldENvcHlBdWRpb3Zpc3Vh bE1JTUVUeXBlcygpOworICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gYXZUeXBlcyA9IGFk b3B0Q0YoQVZDRlVSTEFzc2V0Q29weUF1ZGlvdmlzdWFsTUlNRVR5cGVzKCkpOwogCiAgICAgICAg IENGSW5kZXggdHlwZUNvdW50ID0gQ0ZBcnJheUdldENvdW50KGF2VHlwZXMuZ2V0KCkpOwogICAg ICAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCB0eXBlQ291bnQ7ICsraSkgewpAQCAtOTI2LDYg Kzg5OSwxMSBAQCBzdGF0aWMgY29uc3QgSGFzaFNldDxTdHJpbmc+JiBhdmZNSU1FVHlwZXMoKQog ICAgIHJldHVybiBjYWNoZTsKIH0KIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRjo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+JiBzdXBwb3J0ZWRUeXBlcykK K3sKKyAgICBzdXBwb3J0ZWRUeXBlcyA9IGF2Zk1JTUVUeXBlcygpOworfQorCiBNZWRpYVBsYXll cjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpzdXBwb3J0 c1R5cGUoY29uc3QgTWVkaWFFbmdpbmVTdXBwb3J0UGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsK ICAgICBpZiAoaXNVbnN1cHBvcnRlZE1JTUVUeXBlKHBhcmFtZXRlcnMudHlwZSkpCkBAIC05NDMs NyArOTIxLDcgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRjo6c3VwcG9ydHNUeXBlKGNvbnN0IE0KICAgICBTdHJpbmcgdHlwZVN0cmlu ZyA9IHBhcmFtZXRlcnMudHlwZSArICI7IGNvZGVjcz1cIiIgKyBwYXJhbWV0ZXJzLmNvZGVjcyAr ICJcIiI7CiAgICAgcmV0dXJuIEFWQ0ZVUkxBc3NldElzUGxheWFibGVFeHRlbmRlZE1JTUVUeXBl KHR5cGVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSkgPyBNZWRpYVBsYXllcjo6SXNTdXBw b3J0ZWQgOiBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0ZWQ7CiAjZWxzZQotICAgIGlmIChtaW1l VHlwZUNhY2hlKCkuY29udGFpbnMocGFyYW1ldGVycy50eXBlKSkKKyAgICBpZiAoYXZmTUlNRVR5 cGVzKCkuY29udGFpbnMocGFyYW1ldGVycy50eXBlKSkKICAgICAgICAgcmV0dXJuIHBhcmFtZXRl cnMuY29kZWNzLmlzRW1wdHkoKSA/IE1lZGlhUGxheWVyOjpNYXlCZVN1cHBvcnRlZCA6IE1lZGlh UGxheWVyOjpJc1N1cHBvcnRlZDsKICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9y dGVkOwogI2VuZGlmCkBAIC05NTgsNyArOTM2LDcgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRjo6c3VwcG9ydHNLZXlTeXN0ZW0oY29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0K ICAgICBpZiAoIWtleVN5c3RlbUlzU3VwcG9ydGVkKGtleVN5c3RlbSkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpICYmICFtaW1lVHlwZUNhY2hl KCkuY29udGFpbnMobWltZVR5cGUpKQorICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpICYmICFh dmZNSU1FVHlwZXMoKS5jb250YWlucyhtaW1lVHlwZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIHJldHVybiB0cnVlOwo= 260350 2015-08-31 21:27:45 -0700 2015-09-01 08:49:56 -0700 [PATCH] Proposed Fix leaks-3.patch text/plain 4490 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzYTQ5MDRhLi4zM2NkZjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTUtMDgtMzEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBQb3NzaWJsZSBDRkFycmF5IGxlYWsgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uQ0YuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDg2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25DRi5jcHA6CisgICAgICAgIChXZWJDb3JlOjptaW1lVHlwZUNhY2hlKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmF2Zk1JTUVUeXBlcyk6CisgICAgICAgIEZpeCB0 aGUgbGVhayBpbiBhdmZNSU1FVHlwZXMuIENvbnNvbGlkYXRlIG9uIHRoZSBzaW5nbGUgaW1wbGVt ZW50YXRpb24uCisgICAgICAgIE5vdGUgdGhhdCBhdmZNSU1FVHlwZXMgbG93ZXJjYXNlZCB0aGUg aW5wdXRzIGFuZCBtaW1lVHlwZUNhY2hlIGRpZCBub3QsCisgICAgICAgIGJ1dCB3ZSBub3cgbWF0 Y2ggTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQyB3aGljaCBoYXMgb25lIHZlcnNp b24KKyAgICAgICAgdGhhdCBsb3dlcmNhc2VkIGlucHV0cyBhcyB3ZWxsLgorCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6Z2V0U3VwcG9ydGVkVHlw ZXMpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6 OnN1cHBvcnRzVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25DRjo6c3VwcG9ydHNLZXlTeXN0ZW0pOgorICAgICAgICBDb252ZXJ0IHRvIHRoIGVu ZXcgdmVyaXNvbi4KKworMjAxNS0wOC0zMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgorCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgI2RlZmluZQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NjY3CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3Bw CmluZGV4IDI3ZjZiMzEuLjY4NzM1YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcApAQCAtODcyLDMzICs4 NzIsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpwYWludChHcmFw aGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsbwogICAgIG1fdmlkZW9GcmFtZUhhc0RyYXdu ID0gdHJ1ZTsKIH0KIAotc3RhdGljIGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYgbWltZVR5cGVDYWNo ZSgpCi17Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nPj4gY2FjaGU7 Ci0gICAgc3RhdGljIGJvb2wgdHlwZUxpc3RJbml0aWFsaXplZCA9IGZhbHNlOwotCi0gICAgaWYg KHR5cGVMaXN0SW5pdGlhbGl6ZWQpCi0gICAgICAgIHJldHVybiBjYWNoZTsKLSAgICB0eXBlTGlz dEluaXRpYWxpemVkID0gdHJ1ZTsKLQotICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBzdXBwb3J0 ZWRUeXBlcyA9IGFkb3B0Q0YoQVZDRlVSTEFzc2V0Q29weUF1ZGlvdmlzdWFsTUlNRVR5cGVzKCkp OwotICAgIAotICAgIEFTU0VSVChzdXBwb3J0ZWRUeXBlcyk7Ci0gICAgaWYgKCFzdXBwb3J0ZWRU eXBlcykKLSAgICAgICAgcmV0dXJuIGNhY2hlOwotCi0gICAgQ0ZJbmRleCB0eXBlQ291bnQgPSBD RkFycmF5R2V0Q291bnQoc3VwcG9ydGVkVHlwZXMuZ2V0KCkpOwotICAgIGZvciAoQ0ZJbmRleCBp ID0gMDsgaSA8IHR5cGVDb3VudDsgaSsrKQotICAgICAgICBjYWNoZS5nZXQoKS5hZGQoc3RhdGlj X2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoc3VwcG9ydGVkVHlwZXMu Z2V0KCksIGkpKSk7Ci0KLSAgICByZXR1cm4gY2FjaGU7Ci19IAotCi12b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbkNGOjpnZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0PFN0cmluZz4m IHN1cHBvcnRlZFR5cGVzKQotewotICAgIHN1cHBvcnRlZFR5cGVzID0gbWltZVR5cGVDYWNoZSgp OwotfSAKLQogI2lmIEhBVkUoQVZGT1VOREFUSU9OX0xPQURFUl9ERUxFR0FURSkgJiYgRU5BQkxF KEVOQ1JZUFRFRF9NRURJQV9WMikKIHN0YXRpYyBib29sIGtleVN5c3RlbUlzU3VwcG9ydGVkKGNv bnN0IFN0cmluZyYga2V5U3lzdGVtKQogewpAQCAtOTEyLDcgKzg4NSw3IEBAIHN0YXRpYyBjb25z dCBIYXNoU2V0PFN0cmluZz4mIGF2Zk1JTUVUeXBlcygpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPEhhc2hTZXQ8U3RyaW5nPj4gY2FjaGUgPSBbXSgpIHsKICAgICAgICAgSGFzaFNldDxT dHJpbmc+IHR5cGVzOwotICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gYXZUeXBlcyA9IEFW Q0ZVUkxBc3NldENvcHlBdWRpb3Zpc3VhbE1JTUVUeXBlcygpOworICAgICAgICBSZXRhaW5QdHI8 Q0ZBcnJheVJlZj4gYXZUeXBlcyA9IGFkb3B0Q0YoQVZDRlVSTEFzc2V0Q29weUF1ZGlvdmlzdWFs TUlNRVR5cGVzKCkpOwogCiAgICAgICAgIENGSW5kZXggdHlwZUNvdW50ID0gQ0ZBcnJheUdldENv dW50KGF2VHlwZXMuZ2V0KCkpOwogICAgICAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCB0eXBl Q291bnQ7ICsraSkgewpAQCAtOTI2LDYgKzg5OSwxMSBAQCBzdGF0aWMgY29uc3QgSGFzaFNldDxT dHJpbmc+JiBhdmZNSU1FVHlwZXMoKQogICAgIHJldHVybiBjYWNoZTsKIH0KIAordm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxT dHJpbmc+JiBzdXBwb3J0ZWRUeXBlcykKK3sKKyAgICBzdXBwb3J0ZWRUeXBlcyA9IGF2Zk1JTUVU eXBlcygpOworfQorCiBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGOjpzdXBwb3J0c1R5cGUoY29uc3QgTWVkaWFFbmdpbmVTdXBwb3J0UGFy YW1ldGVycyYgcGFyYW1ldGVycykKIHsKICAgICBpZiAoaXNVbnN1cHBvcnRlZE1JTUVUeXBlKHBh cmFtZXRlcnMudHlwZSkpCkBAIC05NDMsNyArOTIxLDcgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6c3VwcG9ydHNUeXBlKGNvbnN0 IE0KICAgICBTdHJpbmcgdHlwZVN0cmluZyA9IHBhcmFtZXRlcnMudHlwZSArICI7IGNvZGVjcz1c IiIgKyBwYXJhbWV0ZXJzLmNvZGVjcyArICJcIiI7CiAgICAgcmV0dXJuIEFWQ0ZVUkxBc3NldElz UGxheWFibGVFeHRlbmRlZE1JTUVUeXBlKHR5cGVTdHJpbmcuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQo KSkgPyBNZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQgOiBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0 ZWQ7CiAjZWxzZQotICAgIGlmIChtaW1lVHlwZUNhY2hlKCkuY29udGFpbnMocGFyYW1ldGVycy50 eXBlKSkKKyAgICBpZiAoYXZmTUlNRVR5cGVzKCkuY29udGFpbnMocGFyYW1ldGVycy50eXBlKSkK ICAgICAgICAgcmV0dXJuIHBhcmFtZXRlcnMuY29kZWNzLmlzRW1wdHkoKSA/IE1lZGlhUGxheWVy OjpNYXlCZVN1cHBvcnRlZCA6IE1lZGlhUGxheWVyOjpJc1N1cHBvcnRlZDsKICAgICByZXR1cm4g TWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogI2VuZGlmCkBAIC05NTgsNyArOTM2LDcgQEAg Ym9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6c3VwcG9ydHNLZXlTeXN0ZW0o Y29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0KICAgICBpZiAoIWtleVN5c3RlbUlzU3VwcG9ydGVkKGtl eVN5c3RlbSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghbWltZVR5cGUuaXNF bXB0eSgpICYmICFtaW1lVHlwZUNhY2hlKCkuY29udGFpbnMobWltZVR5cGUpKQorICAgIGlmICgh bWltZVR5cGUuaXNFbXB0eSgpICYmICFhdmZNSU1FVHlwZXMoKS5jb250YWlucyhtaW1lVHlwZSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0cnVlOwo=