126847 2014-01-12 11:02:31 -0800 Replace more uses of AtomicallyInitializedStatic with std::call_once 2014-01-12 11:40:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 966987 0 andersca 2014-01-12 11:02:31 -0800 Replace more uses of AtomicallyInitializedStatic with std::call_once 966988 1 220976 andersca 2014-01-12 11:03:35 -0800 Created attachment 220976 Patch 966991 2 commit-queue 2014-01-12 11:06:05 -0800 Attachment 220976 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Forward.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp', u'Source/WebCore/crypto/CryptoAlgorithmRegistry.h', u'Source/WebCore/inspector/WorkerDebuggerAgent.cpp', u'Source/WebCore/workers/WorkerThread.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp:49: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/workers/WorkerThread.cpp:58: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/inspector/WorkerDebuggerAgent.cpp:56: Missing space before { [whitespace/braces] [5] Total errors found: 3 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 967006 3 andersca 2014-01-12 11:40:52 -0800 Committed r161818: <http://trac.webkit.org/changeset/161818> 220976 2014-01-12 11:03:35 -0800 2014-01-12 11:13:41 -0800 Patch bug-126847-20140112110333.patch text/plain 11761 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGYyMjk3YjVlMGY5NmE4MDdjNjUzMDdi M2Q4ODBkZjVmZmNhODFlM2UuLjM5YzFiN2U5ZTM3YWFjNDI2NzM5YWU1YzRhMTQzZWNjMzVmMmYz OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDEtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXBsYWNlIG1vcmUgdXNlcyBvZiBBdG9taWNh bGx5SW5pdGlhbGl6ZWRTdGF0aWMgd2l0aCBzdGQ6OmNhbGxfb25jZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2ODQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvRm9yd2FyZC5oOgorICAgICAg ICBGb3J3YXJkIGRlY2xhcmUgTmV2ZXJEZXN0cm95ZWQuCisKIDIwMTQtMDEtMTEgIFphbiBEb2Jl cnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQg Zml4IGZvciBwb3J0cyB1c2luZyBHQ0MgYWZ0ZXIgcjE2MTc3MC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0Nzc4 MDc5N2UzNDljOGMzYzcxZjc0ZDkyOTEzMGI0NzliNzk4MzgxLi5hMzkwNTA1YTc0YzUxMjczNzVh OTYzM2I4ZGI5MmJlZDY1Yzg1NTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTQt MDEtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXBsYWNlIG1vcmUgdXNlcyBvZiBBdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWMgd2l0aCBzdGQ6 OmNhbGxfb25jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI2ODQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBjcnlwdG8vQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q3J5cHRvQWxnb3JpdGhtUmVnaXN0cnk6OnNoYXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpy ZWdpc3RyeU11dGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkNyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5 OjpnZXRJZGVudGlmaWVyRm9yTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdvcml0 aG1SZWdpc3RyeTo6bmFtZUZvcklkZW50aWZpZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q3J5cHRv QWxnb3JpdGhtUmVnaXN0cnk6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDcnlwdG9BbGdv cml0aG1SZWdpc3RyeTo6cmVnaXN0ZXJBbGdvcml0aG0pOgorICAgICAgICAqIGNyeXB0by9Dcnlw dG9BbGdvcml0aG1SZWdpc3RyeS5oOgorICAgICAgICAqIGluc3BlY3Rvci9Xb3JrZXJEZWJ1Z2dl ckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlckRlYnVnZ2VyQWdlbnQ6Oldvcmtl ckRlYnVnZ2VyQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyRGVidWdnZXJBZ2VudDo6 fldvcmtlckRlYnVnZ2VyQWdlbnQpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyRGVidWdnZXJB Z2VudDo6aW50ZXJydXB0QW5kRGlzcGF0Y2hJbnNwZWN0b3JDb21tYW5kcyk6CisgICAgICAgICog d29ya2Vycy9Xb3JrZXJUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dGhyZWFkU2V0TXV0 ZXgpOgorICAgICAgICAoV2ViQ29yZTo6d29ya2VyVGhyZWFkcyk6CisgICAgICAgIChXZWJDb3Jl OjpXb3JrZXJUaHJlYWQ6OndvcmtlclRocmVhZENvdW50KToKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlclRocmVhZDo6V29ya2VyVGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVh ZDo6fldvcmtlclRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJUaHJlYWQ6OnJlbGVh c2VGYXN0TWFsbG9jRnJlZU1lbW9yeUluQWxsVGhyZWFkcyk6CisKIDIwMTQtMDEtMTEgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW5zYWZl IHVzZXMgb2YgQXRvbWljYWxseUluaXRpYWxpemVkU3RhdGljCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9Gb3J3YXJkLmggYi9Tb3VyY2UvV1RGL3d0Zi9Gb3J3YXJkLmgKaW5kZXggMTY3Y2Fm YjIwMDg4NDFkMmQyMTA5MjUyMGIwM2E3NjcyMzg4YzRhNS4uMjE1MjQ3ZmE3OTQyNmZjNzc0M2Ex MTJlYzUxOGI0MDM4ZWU3NzRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvRm9yd2FyZC5o CisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZvcndhcmQuaApAQCAtMjYsNiArMjYsNyBAQAogbmFtZXNw YWNlIFdURiB7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIEZ1bmN0aW9uOwordGVtcGxh dGU8dHlwZW5hbWUgVD4gY2xhc3MgTmV2ZXJEZXN0cm95ZWQ7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBU PiBjbGFzcyBPd25QdHI7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBQYXNzT3duUHRyOwog dGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUGFzc1JlZjsKQEAgLTU5LDYgKzYwLDcgQEAgdXNp bmcgV1RGOjpEZWNvZGVyOwogdXNpbmcgV1RGOjpFbmNvZGVyOwogdXNpbmcgV1RGOjpGdW5jdGlv bjsKIHVzaW5nIFdURjo6RnVuY3Rpb25EaXNwYXRjaGVyOwordXNpbmcgV1RGOjpOZXZlckRlc3Ry b3llZDsKIHVzaW5nIFdURjo6T3duUHRyOwogdXNpbmcgV1RGOjpQYXNzT3duUHRyOwogdXNpbmcg V1RGOjpQYXNzUmVmOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL0NyeXB0b0Fs Z29yaXRobVJlZ2lzdHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NyeXB0by9DcnlwdG9BbGdvcml0 aG1SZWdpc3RyeS5jcHAKaW5kZXggZGVmN2M0NmU1Zjg2MzcxODc2YWNkMmUyMDU0MjExNTNjN2Qw N2VlYy4uOTg0MjMwNjczODkyMWYwNWQxYjA3MDJlMWY2YWVkMGM1NDk0MTNmZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL0NyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuY3BwCkBAIC0y OSwyMCArMjksMjggQEAKICNpZiBFTkFCTEUoU1VCVExFX0NSWVBUTykKIAogI2luY2x1ZGUgIkNy eXB0b0FsZ29yaXRobS5oIgotI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CisjaW5jbHVkZSA8 bXV0ZXg+CisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkmIENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5 OjpzaGFyZWQoKQogewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoQ3J5cHRvQWxnb3JpdGhtUmVn aXN0cnksIHJlZ2lzdHJ5LCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPENyeXB0b0Fs Z29yaXRobVJlZ2lzdHJ5PiByZWdpc3RyeTsKKwogICAgIHJldHVybiByZWdpc3RyeTsKIH0KIAot c3RhdGljIE11dGV4JiByZWdpc3RyeU11dGV4KCkKK3N0YXRpYyBzdGQ6Om11dGV4JiByZWdpc3Ry eU11dGV4KCkKIHsKLSAgICBBdG9taWNhbGx5SW5pdGlhbGl6ZWRTdGF0aWMoTXV0ZXgmLCBtdXRl eCA9ICpuZXcgTXV0ZXgpOwotICAgIHJldHVybiBtdXRleDsKKyAgICBzdGF0aWMgc3RkOjpvbmNl X2ZsYWcgb25jZUZsYWc7CisgICAgc3RhdGljIHN0ZDo6bXV0ZXgqIG11dGV4OworCisgICAgc3Rk OjpjYWxsX29uY2Uob25jZUZsYWcsIFtdeworICAgICAgICBtdXRleCA9IHN0ZDo6bWFrZV91bmlx dWU8c3RkOjptdXRleD4oKS5yZWxlYXNlKCk7CisgICAgfSk7CisKKyAgICByZXR1cm4gKm11dGV4 OwogfQogCiBDcnlwdG9BbGdvcml0aG1SZWdpc3RyeTo6Q3J5cHRvQWxnb3JpdGhtUmVnaXN0cnko KQpAQCAtNTUsNyArNjMsNyBAQCBib29sIENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5OjpnZXRJZGVu dGlmaWVyRm9yTmFtZShjb25zdCBTdHJpbmcmIG5hbWUsIENyeXB0b0FsZwogICAgIGlmIChuYW1l LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgTXV0ZXhMb2NrZXIgbG9j ayhyZWdpc3RyeU11dGV4KCkpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2Nr KHJlZ2lzdHJ5TXV0ZXgoKSk7CiAKICAgICBhdXRvIGl0ZXIgPSBtX25hbWVUb0lkZW50aWZpZXJN YXAuZmluZChuYW1lLmlzb2xhdGVkQ29weSgpKTsKICAgICBpZiAoaXRlciA9PSBtX25hbWVUb0lk ZW50aWZpZXJNYXAuZW5kKCkpCkBAIC02NywxNCArNzUsMTQgQEAgYm9vbCBDcnlwdG9BbGdvcml0 aG1SZWdpc3RyeTo6Z2V0SWRlbnRpZmllckZvck5hbWUoY29uc3QgU3RyaW5nJiBuYW1lLCBDcnlw dG9BbGcKIAogU3RyaW5nIENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5OjpuYW1lRm9ySWRlbnRpZmll cihDcnlwdG9BbGdvcml0aG1JZGVudGlmaWVyIGlkZW50aWZpZXIpCiB7Ci0gICAgTXV0ZXhMb2Nr ZXIgbG9jayhyZWdpc3RyeU11dGV4KCkpOworICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4 PiBsb2NrKHJlZ2lzdHJ5TXV0ZXgoKSk7CiAKICAgICByZXR1cm4gbV9pZGVudGlmaWVyVG9OYW1l TWFwLmdldChzdGF0aWNfY2FzdDx1bnNpZ25lZD4oaWRlbnRpZmllcikpLmlzb2xhdGVkQ29weSgp OwogfQogCiBzdGQ6OnVuaXF1ZV9wdHI8Q3J5cHRvQWxnb3JpdGhtPiBDcnlwdG9BbGdvcml0aG1S ZWdpc3RyeTo6Y3JlYXRlKENyeXB0b0FsZ29yaXRobUlkZW50aWZpZXIgaWRlbnRpZmllcikKIHsK LSAgICBNdXRleExvY2tlciBsb2NrKHJlZ2lzdHJ5TXV0ZXgoKSk7CisgICAgc3RkOjpsb2NrX2d1 YXJkPHN0ZDo6bXV0ZXg+IGxvY2socmVnaXN0cnlNdXRleCgpKTsKIAogICAgIGF1dG8gaXRlciA9 IG1faWRlbnRpZmllclRvQ29uc3RydWN0b3JNYXAuZmluZChzdGF0aWNfY2FzdDx1bnNpZ25lZD4o aWRlbnRpZmllcikpOwogICAgIGlmIChpdGVyID09IG1faWRlbnRpZmllclRvQ29uc3RydWN0b3JN YXAuZW5kKCkpCkBAIC04NSw3ICs5Myw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxDcnlwdG9BbGdvcml0 aG0+IENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5OjpjcmVhdGUoQ3J5cHRvQWxnb3JpdGhtCiAKIHZv aWQgQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnk6OnJlZ2lzdGVyQWxnb3JpdGhtKGNvbnN0IFN0cmlu ZyYgbmFtZSwgQ3J5cHRvQWxnb3JpdGhtSWRlbnRpZmllciBpZGVudGlmaWVyLCBDcnlwdG9BbGdv cml0aG1Db25zdHJ1Y3RvciBjb25zdHJ1Y3RvcikKIHsKLSAgICBNdXRleExvY2tlciBsb2NrKHJl Z2lzdHJ5TXV0ZXgoKSk7CisgICAgc3RkOjpsb2NrX2d1YXJkPHN0ZDo6bXV0ZXg+IGxvY2socmVn aXN0cnlNdXRleCgpKTsKIAogICAgIGJvb2wgYWRkZWQgPSBtX25hbWVUb0lkZW50aWZpZXJNYXAu YWRkKG5hbWUsIGlkZW50aWZpZXIpLmlzTmV3RW50cnk7CiAgICAgQVNTRVJUX1VOVVNFRChhZGRl ZCwgYWRkZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3J5cHRvL0NyeXB0b0FsZ29y aXRobVJlZ2lzdHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtUmVn aXN0cnkuaAppbmRleCA2MmVhYThjZWM2OWJmNTE3OGI5YzRhYWRhY2U5ZDg0OWEwYTM0OGJhLi5m MDk0ODE0MWY4MzVmOWZiOWE0OTYwMzA2NTExYWFmODBlYTZiNTNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jcnlwdG8vQ3J5cHRvQWxnb3JpdGhtUmVnaXN0cnkuaApAQCAtNDIsNiArNDIsNyBA QCBjbGFzcyBDcnlwdG9BbGdvcml0aG07CiAKIGNsYXNzIENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5 IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDcnlwdG9BbGdvcml0aG1SZWdpc3RyeSk7Cisg ICAgZnJpZW5kIGNsYXNzIE5ldmVyRGVzdHJveWVkPENyeXB0b0FsZ29yaXRobVJlZ2lzdHJ5PjsK IAogcHVibGljOgogICAgIHN0YXRpYyBDcnlwdG9BbGdvcml0aG1SZWdpc3RyeSYgc2hhcmVkKCk7 CkBAIC02Myw2ICs2NCw3IEBAIHByaXZhdGU6CiAgICAgfQogCiAgICAgdm9pZCByZWdpc3RlckFs Z29yaXRobShjb25zdCBTdHJpbmcmIG5hbWUsIENyeXB0b0FsZ29yaXRobUlkZW50aWZpZXIsIENy eXB0b0FsZ29yaXRobUNvbnN0cnVjdG9yKTsKKwogICAgIEhhc2hNYXA8U3RyaW5nLCBDcnlwdG9B bGdvcml0aG1JZGVudGlmaWVyLCBDYXNlRm9sZGluZ0hhc2g+IG1fbmFtZVRvSWRlbnRpZmllck1h cDsKICAgICBIYXNoTWFwPHVuc2lnbmVkLCBTdHJpbmc+IG1faWRlbnRpZmllclRvTmFtZU1hcDsK ICAgICBIYXNoTWFwPHVuc2lnbmVkLCBDcnlwdG9BbGdvcml0aG1Db25zdHJ1Y3Rvcj4gbV9pZGVu dGlmaWVyVG9Db25zdHJ1Y3Rvck1hcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Xb3JrZXJEZWJ1Z2dlckFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9X b3JrZXJEZWJ1Z2dlckFnZW50LmNwcAppbmRleCBhMGI0MTJiZDgwMjJmMzAzYjg0YTNhNzg2N2Ux OGY3YzA4YmY5ODUxLi42Njc5NzcwNWM3ZTQ4NWFiMDJkYjBjNWZjYjc1ZWUwMTRkZThiYWVmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvV29ya2VyRGVidWdnZXJBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1dvcmtlckRlYnVnZ2VyQWdlbnQuY3Bw CkBAIC0zOCw3ICszOCw5IEBACiAjaW5jbHVkZSAiV29ya2VyVGhyZWFkLmgiCiAjaW5jbHVkZSA8 aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Lmg+CiAjaW5jbHVkZSA8aW5zcGVjdG9yL0luamVjdGVk U2NyaXB0TWFuYWdlci5oPgorI2luY2x1ZGUgPG11dGV4PgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdl UXVldWUuaD4KKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogdXNpbmcgbmFtZXNw YWNlIEluc3BlY3RvcjsKIApAQCAtNDYsMjEgKzQ4LDI3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogbmFtZXNwYWNlIHsKIAotTXV0ZXgmIHdvcmtlckRlYnVnZ2VyQWdlbnRzTXV0ZXgoKQorc3Rk OjptdXRleCYgd29ya2VyRGVidWdnZXJBZ2VudHNNdXRleCgpCiB7Ci0gICAgQXRvbWljYWxseUlu aXRpYWxpemVkU3RhdGljKE11dGV4JiwgbXV0ZXggPSAqbmV3IE11dGV4KTsKLSAgICByZXR1cm4g bXV0ZXg7CisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgIHN0YXRpYyBz dGQ6Om11dGV4KiBtdXRleDsKKworICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXXsKKyAg ICAgICAgbXV0ZXggPSBzdGQ6Om1ha2VfdW5pcXVlPHN0ZDo6bXV0ZXg+KCkucmVsZWFzZSgpOwor ICAgIH0pOworCisgICAgcmV0dXJuICptdXRleDsKIH0KIAogdHlwZWRlZiBIYXNoTWFwPFdvcmtl clRocmVhZCosIFdvcmtlckRlYnVnZ2VyQWdlbnQqPiBXb3JrZXJEZWJ1Z2dlckFnZW50czsKIAog V29ya2VyRGVidWdnZXJBZ2VudHMmIHdvcmtlckRlYnVnZ2VyQWdlbnRzKCkKIHsKLSAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKFdvcmtlckRlYnVnZ2VyQWdlbnRzLCBhZ2VudHMsICgpKTsKKyAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQ8V29ya2VyRGVidWdnZXJBZ2VudHM+IGFnZW50czsKKwogICAg IHJldHVybiBhZ2VudHM7CiB9CiAKLQogY2xhc3MgUnVuSW5zcGVjdG9yQ29tbWFuZHNUYXNrIDog cHVibGljIFNjcmlwdERlYnVnU2VydmVyOjpUYXNrIHsKIHB1YmxpYzoKICAgICBSdW5JbnNwZWN0 b3JDb21tYW5kc1Rhc2soV29ya2VyVGhyZWFkKiB0aHJlYWQsIFdvcmtlckdsb2JhbFNjb3BlKiB3 b3JrZXJHbG9iYWxTY29wZSkKQEAgLTg5LDIyICs5NywyMyBAQCBXb3JrZXJEZWJ1Z2dlckFnZW50 OjpXb3JrZXJEZWJ1Z2dlckFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudAogICAgICwgbV9zY3JpcHREZWJ1Z1NlcnZlcihpbnNwZWN0ZWRXb3JrZXJHbG9iYWxTY29w ZSwgV29ya2VyRGVidWdnZXJBZ2VudDo6ZGVidWdnZXJUYXNrTW9kZSkKICAgICAsIG1faW5zcGVj dGVkV29ya2VyR2xvYmFsU2NvcGUoaW5zcGVjdGVkV29ya2VyR2xvYmFsU2NvcGUpCiB7Ci0gICAg TXV0ZXhMb2NrZXIgbG9jayh3b3JrZXJEZWJ1Z2dlckFnZW50c011dGV4KCkpOworICAgIHN0ZDo6 bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKHdvcmtlckRlYnVnZ2VyQWdlbnRzTXV0ZXgoKSk7 CiAgICAgd29ya2VyRGVidWdnZXJBZ2VudHMoKS5zZXQoaW5zcGVjdGVkV29ya2VyR2xvYmFsU2Nv cGUtPnRocmVhZCgpLCB0aGlzKTsKIH0KIAogV29ya2VyRGVidWdnZXJBZ2VudDo6fldvcmtlckRl YnVnZ2VyQWdlbnQoKQogewotICAgIE11dGV4TG9ja2VyIGxvY2sod29ya2VyRGVidWdnZXJBZ2Vu dHNNdXRleCgpKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayh3b3JrZXJE ZWJ1Z2dlckFnZW50c011dGV4KCkpOworCiAgICAgQVNTRVJUKHdvcmtlckRlYnVnZ2VyQWdlbnRz KCkuY29udGFpbnMobV9pbnNwZWN0ZWRXb3JrZXJHbG9iYWxTY29wZS0+dGhyZWFkKCkpKTsKICAg ICB3b3JrZXJEZWJ1Z2dlckFnZW50cygpLnJlbW92ZShtX2luc3BlY3RlZFdvcmtlckdsb2JhbFNj b3BlLT50aHJlYWQoKSk7CiB9CiAKIHZvaWQgV29ya2VyRGVidWdnZXJBZ2VudDo6aW50ZXJydXB0 QW5kRGlzcGF0Y2hJbnNwZWN0b3JDb21tYW5kcyhXb3JrZXJUaHJlYWQqIHRocmVhZCkKIHsKLSAg ICBNdXRleExvY2tlciBsb2NrKHdvcmtlckRlYnVnZ2VyQWdlbnRzTXV0ZXgoKSk7Ci0gICAgV29y a2VyRGVidWdnZXJBZ2VudCogYWdlbnQgPSB3b3JrZXJEZWJ1Z2dlckFnZW50cygpLmdldCh0aHJl YWQpOwotICAgIGlmIChhZ2VudCkKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9j ayh3b3JrZXJEZWJ1Z2dlckFnZW50c011dGV4KCkpOworCisgICAgaWYgKFdvcmtlckRlYnVnZ2Vy QWdlbnQqIGFnZW50ID0gd29ya2VyRGVidWdnZXJBZ2VudHMoKS5nZXQodGhyZWFkKSkKICAgICAg ICAgYWdlbnQtPm1fc2NyaXB0RGVidWdTZXJ2ZXIuaW50ZXJydXB0QW5kUnVuVGFzayhhZG9wdFB0 cihuZXcgUnVuSW5zcGVjdG9yQ29tbWFuZHNUYXNrKHRocmVhZCwgYWdlbnQtPm1faW5zcGVjdGVk V29ya2VyR2xvYmFsU2NvcGUpKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvV29ya2VyVGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyVGhy ZWFkLmNwcAppbmRleCA5YjZhZGU0ZjVjYTM3NTk2MTk0ZTZhZTY4Njk4OGRiOWUzMzNiZjFlLi44 MDRiZTE1ZjRmODE0N2UzZWJhMmE2MDAzNjkzZDY1ZjdhODA4OGFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv d29ya2Vycy9Xb3JrZXJUaHJlYWQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiVGhy ZWFkR2xvYmFsRGF0YS5oIgogI2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgPHV0aWxpdHk+Cisj aW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxl Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTQ5LDIxICs1MCwyOSBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBNdXRleCYgdGhyZWFkU2V0TXV0ZXgo KQorc3RhdGljIHN0ZDo6bXV0ZXgmIHRocmVhZFNldE11dGV4KCkKIHsKLSAgICBBdG9taWNhbGx5 SW5pdGlhbGl6ZWRTdGF0aWMoTXV0ZXgmLCBtdXRleCA9ICpuZXcgTXV0ZXgpOwotICAgIHJldHVy biBtdXRleDsKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25jZUZsYWc7CisgICAgc3RhdGlj IHN0ZDo6bXV0ZXgqIG11dGV4OworCisgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdewor ICAgICAgICBtdXRleCA9IHN0ZDo6bWFrZV91bmlxdWU8c3RkOjptdXRleD4oKS5yZWxlYXNlKCk7 CisgICAgfSk7CisKKyAgICByZXR1cm4gKm11dGV4OwogfQogCiBzdGF0aWMgSGFzaFNldDxXb3Jr ZXJUaHJlYWQqPiYgd29ya2VyVGhyZWFkcygpCiB7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChI YXNoU2V0PFdvcmtlclRocmVhZCo+LCB0aHJlYWRzLCAoKSk7Ci0gICAgcmV0dXJuIHRocmVhZHM7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8V29ya2VyVGhyZWFkKj4+IHdvcmtl clRocmVhZHM7CisKKyAgICByZXR1cm4gd29ya2VyVGhyZWFkczsKIH0KIAogdW5zaWduZWQgV29y a2VyVGhyZWFkOjp3b3JrZXJUaHJlYWRDb3VudCgpCiB7Ci0gICAgTXV0ZXhMb2NrZXIgbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKwogICAgIHJldHVybiB3b3JrZXJUaHJlYWRzKCkuc2l6ZSgpOwog fQogCkBAIC0xMTQsMTMgKzEyMywxNSBAQCBXb3JrZXJUaHJlYWQ6OldvcmtlclRocmVhZChjb25z dCBVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIGNvbnN0CiAgICAgLCBt X25vdGlmaWNhdGlvbkNsaWVudCgwKQogI2VuZGlmCiB7Ci0gICAgTXV0ZXhMb2NrZXIgbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKwogICAgIHdvcmtlclRocmVhZHMoKS5hZGQodGhpcyk7CiB9CiAK IFdvcmtlclRocmVhZDo6fldvcmtlclRocmVhZCgpCiB7Ci0gICAgTXV0ZXhMb2NrZXIgbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9jayh0 aHJlYWRTZXRNdXRleCgpKTsKKwogICAgIEFTU0VSVCh3b3JrZXJUaHJlYWRzKCkuY29udGFpbnMo dGhpcykpOwogICAgIHdvcmtlclRocmVhZHMoKS5yZW1vdmUodGhpcyk7CiB9CkBAIC0yNzksMTEg KzI5MCwxMCBAQCBjbGFzcyBSZWxlYXNlRmFzdE1hbGxvY0ZyZWVNZW1vcnlUYXNrIDogcHVibGlj IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2sgewogCiB2b2lkIFdvcmtlclRocmVhZDo6cmVs ZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5SW5BbGxUaHJlYWRzKCkKIHsKLSAgICBNdXRleExvY2tl ciBsb2NrKHRocmVhZFNldE11dGV4KCkpOwotICAgIEhhc2hTZXQ8V29ya2VyVGhyZWFkKj4mIHRo cmVhZHMgPSB3b3JrZXJUaHJlYWRzKCk7Ci0gICAgSGFzaFNldDxXb3JrZXJUaHJlYWQqPjo6aXRl cmF0b3IgZW5kID0gdGhyZWFkcy5lbmQoKTsKLSAgICBmb3IgKEhhc2hTZXQ8V29ya2VyVGhyZWFk Kj46Oml0ZXJhdG9yIGl0ID0gdGhyZWFkcy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAg ICAgICgqaXQpLT5ydW5Mb29wKCkucG9zdFRhc2soYWRvcHRQdHIobmV3IFJlbGVhc2VGYXN0TWFs bG9jRnJlZU1lbW9yeVRhc2spKTsKKyAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9j ayh0aHJlYWRTZXRNdXRleCgpKTsKKworICAgIGZvciAoYXV0byogd29ya2VyVGhyZWFkIDogd29y a2VyVGhyZWFkcygpKQorICAgICAgICB3b3JrZXJUaHJlYWQtPnJ1bkxvb3AoKS5wb3N0VGFzayhh ZG9wdFB0cihuZXcgUmVsZWFzZUZhc3RNYWxsb2NGcmVlTWVtb3J5VGFzaykpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg==