148714 2015-09-02 10:29:43 -0700 CodeBlock should have a more explicit "strongly referenced" state 2015-09-02 12:52:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren fpizlo mhahnenb saam oldest_to_newest 1122847 0 ggaren 2015-09-02 10:29:43 -0700 CodeBlock should have a more explicit "strongly referenced" state 1122863 1 260425 ggaren 2015-09-02 10:48:59 -0700 Created attachment 260425 Patch 1122873 2 ggaren 2015-09-02 12:52:06 -0700 Committed r189257: <http://trac.webkit.org/changeset/189257> 260425 2015-09-02 10:48:59 -0700 2015-09-02 10:58:22 -0700 Patch bug-148714-20150902104840.patch text/plain 15245 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg5MjUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDcxIEBA CisyMDE1LTA5LTAyICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQ29kZUJsb2NrIHNob3VsZCBoYXZlIGEgbW9yZSBleHBsaWNpdCAic3Ryb25nbHkgcmVmZXJl bmNlZCIgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0ODcxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFByZXZpb3VzbHksIENvZGVCbG9jayBoYWQgYSAibWF5IGJlIGV4ZWN1dGluZyIgYml0LCB3 aGljaCB3YXMgdXNlZCBieQorICAgICAgICBib3RoIHRoZSBzdGFjayB2aXNpdG9yIGFuZCB0aGUg Y29tcGlsZXIgdG8gaW5kaWNhdGUgInRoaXMgQ29kZUJsb2NrIG11c3QKKyAgICAgICAgbm90IGpl dHRpc29uIGl0c2VsZiIuCisKKyAgICAgICAgTm93LCBDb2RlQmxvY2sgaGFzIGFuIGV4cGxpY2l0 ICJpcyBzdHJvbmdseSByZWZlcmVuY2VkIiBiaXQgdG8gZG8gdGhlCisgICAgICAgIHNhbWUuCisK KyAgICAgICAgRm9yIG5vdywgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLiBJbiBmdXR1cmUs IEkgd2lsbCB1c2UgdGhlICJpcworICAgICAgICBzdHJvbmdseSByZWZlcmVuY2VkIiBiaXQgdG8g aW5kaWNhdGUgdGhlIHNldCBvZiBhbGwgcmVmZXJlbmNlcyB0aGF0CisgICAgICAgIGNhdXNlIGEg Q29kZUJsb2NrIG5vdCB0byBqZXR0aXNvbiBpdHNlbGYuIFN0cm9uZyByZWZlcmVuY2VzIGFuZCBz dGFjaworICAgICAgICByZWZlcmVuY2VzIHdpbGwgYmUgZGlmZmVyZW50IGJlY2F1c2U6CisKKyAg ICAgICAgICAgICgxKSBBIHN0YWNrIHJlZmVyZW5jZSByZXF1aXJlcyBhIHdyaXRlIGJhcnJpZXIg YXQgdGhlIGVuZCBvZiBHQworICAgICAgICAgICAgKHNpbmNlIENvZGVCbG9ja3Mgb25seSBiYXJy aWVyIHRoZW1zZWx2ZXMgb24gZnVuY3Rpb24gZW50cnksCisgICAgICAgICAgICBhbmQgR0Mgd2ls bCBjbGVhciB0aGF0IGJhcnJpZXIpOyBidXQgYSBzdHJvbmcgcmVmZXJlbmNlIGRvZXMgbm90Cisg ICAgICAgICAgICBuZWVkIG9yIHdhbnQgYSB3cml0ZSBiYXJyaWVyIGF0IHRoZSBlbmQgb2YgR0Mu CisKKyAgICAgICAgICAgICgyKSBWaXNpdGluZyBtb3JlIGhlYXAgb2JqZWN0cyBtaWdodCByZXZl YWwgbW9yZSBzdHJvbmcgcmVmZXJlbmNlcworICAgICAgICAgICAgYnV0LCBieSBkZWZpbml0aW9u LCBpdCBjYW5ub3QgcmV2ZWFsIG1vcmUgc3RhY2sgcmVmZXJlbmNlcy4KKworICAgICAgICBBbHNv LCB0aGlzIHBhdGNoIGFkZHMgYW4gZXhwbGljaXQgbWFyayBjbGVhcmluZyBwaGFzZSBmb3IgY29t cGlsZXIKKyAgICAgICAgQ29kZUJsb2Nrcywgd2hpY2ggZG9lcyB0aGUgd29yayB0aGF0IHdvdWxk IG5vcm1hbGx5IGJlIGRvbmUgYnkgYSB3cml0ZQorICAgICAgICBiYXJyaWVyLiBBIGNvbXBpbGVy IENvZGVCbG9jayBjYW4ndCByZWx5IG9uIGEgbm9ybWFsIHdyaXRlIGJhcnJpZXIgCisgICAgICAg IGJlY2F1c2UgdGhlIGNvbXBpbGVyIHdyaXRlcyB0byBDb2RlQmxvY2tzIHdpdGhvdXQgaW52b2tp bmcgYSB3cml0ZQorICAgICAgICBiYXJyaWVyLCBhbmQgYmVjYXVzZSB0aGUgQ29kZUJsb2NrIHdy aXRlIGJhcnJpZXIgb3BlcmF0ZXMgb24gYW4KKyAgICAgICAgZXhlY3V0YWJsZSwgYnV0IGFuIGlu LWZsaWdodCBjb21waWxhdGlvbiBpcyBub3QgcG9pbnRlZCB0byBieSBhbnkKKyAgICAgICAgZXhl Y3V0YWJsZS4gVGhpcyBidWcgZG9lcyBub3QgYXBwZWFyIHRvIGJlIG5vdGljZWFibGUgaW4gdGhl IGN1cnJlbnQKKyAgICAgICAgc3lzdGVtLCBidXQgSSB3aWxsIHByb2JhYmx5IG1ha2UgaXQgbm90 aWNlYWJsZS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChK U0M6OkNvZGVCbG9jazo6Q29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpzaG91 bGRJbW1lZGlhdGVseUFzc3VtZUxpdmVuZXNzRHVyaW5nU2Nhbik6CisgICAgICAgIChKU0M6OkNv ZGVCbG9jazo6aXNLbm93blRvQmVMaXZlRHVyaW5nR0MpOgorICAgICAgICAqIGJ5dGVjb2RlL0Nv ZGVCbG9jay5oOgorICAgICAgICAoSlNDOjpFeGVjU3RhdGU6OnVuY2hlY2tlZFIpOgorICAgICAg ICAoSlNDOjpDb2RlQmxvY2tTZXQ6OmNsZWFyTWFya3MpOgorICAgICAgICAoSlNDOjpDb2RlQmxv Y2tTZXQ6Om1hcmspOgorICAgICAgICAqIGRmZy9ERkdQbGFuLmNwcDoKKyAgICAgICAgKEpTQzo6 REZHOjpQbGFuOjprZXkpOgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OmNsZWFyQ29kZUJsb2Nr TWFya3MpOgorICAgICAgICAoSlNDOjpERkc6OlBsYW46OmNoZWNrTGl2ZW5lc3NBbmRWaXNpdENo aWxkcmVuKToKKyAgICAgICAgKiBkZmcvREZHUGxhbi5oOgorICAgICAgICAqIGRmZy9ERkdXb3Jr bGlzdC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6V29ya2xpc3Q6OmNvbXBsZXRlQWxsUGxhbnNG b3JWTSk6CisgICAgICAgIChKU0M6OkRGRzo6V29ya2xpc3Q6OmNsZWFyQ29kZUJsb2NrTWFya3Mp OgorICAgICAgICAoSlNDOjpERkc6OldvcmtsaXN0OjpzdXNwZW5kQWxsVGhyZWFkcyk6CisgICAg ICAgIChKU0M6OkRGRzo6V29ya2xpc3Q6OnZpc2l0V2Vha1JlZmVyZW5jZXMpOgorICAgICAgICAo SlNDOjpERkc6OmNvbXBsZXRlQWxsUGxhbnNGb3JWTSk6CisgICAgICAgIChKU0M6OkRGRzo6Y2xl YXJDb2RlQmxvY2tNYXJrcyk6CisgICAgICAgICogZGZnL0RGR1dvcmtsaXN0Lmg6CisgICAgICAg IChKU0M6OkRGRzo6d29ya2xpc3RGb3JJbmRleE9yTnVsbCk6CisgICAgICAgICogaGVhcC9Db2Rl QmxvY2tTZXQuY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2tTZXQ6OmNsZWFyTWFya3NGb3JG dWxsQ29sbGVjdGlvbik6CisgICAgICAgIChKU0M6OkNvZGVCbG9ja1NldDo6Y2xlYXJNYXJrc0Zv ckVkZW5Db2xsZWN0aW9uKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrU2V0OjpkZWxldGVVbm1h cmtlZEFuZFVucmVmZXJlbmNlZCk6CisgICAgICAgIChKU0M6OkNvZGVCbG9ja1NldDo6dHJhY2VN YXJrZWQpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2tTZXQ6OnJlbWVtYmVyQ3VycmVudGx5RXhl Y3V0aW5nQ29kZUJsb2Nrcyk6CisgICAgICAgICogaGVhcC9Db2RlQmxvY2tTZXQuaDoKKyAgICAg ICAgKiBoZWFwL0hlYXAuY3BwOgorICAgICAgICAoSlNDOjpIZWFwOjptYXJrUm9vdHMpOgorCiAy MDE1LTA5LTAxICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IHByb3RvY29sIGdlbmVyYXRvciBzaG91bGQgbm90IGFsbG93IG5vbi1ib29sZWFu IHZhbHVlcyBmb3IgIm9wdGlvbmFsIiBrZXkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9Db2RlQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCShyZXZpc2lvbiAxODkyMzEpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY3 Niw2ICsxNjc2LDcgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2soQ29weVBhcnNlZEJsb2NrVGFnLAog ICAgICwgbV9pc1N0cmljdE1vZGUob3RoZXIubV9pc1N0cmljdE1vZGUpCiAgICAgLCBtX25lZWRz QWN0aXZhdGlvbihvdGhlci5tX25lZWRzQWN0aXZhdGlvbikKICAgICAsIG1fbWF5QmVFeGVjdXRp bmcoZmFsc2UpCisgICAgLCBtX2lzU3Ryb25nbHlSZWZlcmVuY2VkKGZhbHNlKQogICAgICwgbV9z b3VyY2Uob3RoZXIubV9zb3VyY2UpCiAgICAgLCBtX3NvdXJjZU9mZnNldChvdGhlci5tX3NvdXJj ZU9mZnNldCkKICAgICAsIG1fZmlyc3RMaW5lQ29sdW1uT2Zmc2V0KG90aGVyLm1fZmlyc3RMaW5l Q29sdW1uT2Zmc2V0KQpAQCAtMTczNSw2ICsxNzM2LDcgQEAgQ29kZUJsb2NrOjpDb2RlQmxvY2so U2NyaXB0RXhlY3V0YWJsZSogbwogICAgICwgbV9pc1N0cmljdE1vZGUodW5saW5rZWRDb2RlQmxv Y2stPmlzU3RyaWN0TW9kZSgpKQogICAgICwgbV9uZWVkc0FjdGl2YXRpb24odW5saW5rZWRDb2Rl QmxvY2stPmhhc0FjdGl2YXRpb25SZWdpc3RlcigpICYmIHVubGlua2VkQ29kZUJsb2NrLT5jb2Rl VHlwZSgpID09IEZ1bmN0aW9uQ29kZSkKICAgICAsIG1fbWF5QmVFeGVjdXRpbmcoZmFsc2UpCisg ICAgLCBtX2lzU3Ryb25nbHlSZWZlcmVuY2VkKGZhbHNlKQogICAgICwgbV9zb3VyY2Uoc291cmNl UHJvdmlkZXIpCiAgICAgLCBtX3NvdXJjZU9mZnNldChzb3VyY2VPZmZzZXQpCiAgICAgLCBtX2Zp cnN0TGluZUNvbHVtbk9mZnNldChmaXJzdExpbmVDb2x1bW5PZmZzZXQpCkBAIC0yMTg1LDYgKzIx ODcsNyBAQCBDb2RlQmxvY2s6OkNvZGVCbG9jayhXZWJBc3NlbWJseUV4ZWN1dGFiCiAgICAgLCBt X2lzU3RyaWN0TW9kZShmYWxzZSkKICAgICAsIG1fbmVlZHNBY3RpdmF0aW9uKGZhbHNlKQogICAg ICwgbV9tYXlCZUV4ZWN1dGluZyhmYWxzZSkKKyAgICAsIG1faXNTdHJvbmdseVJlZmVyZW5jZWQo ZmFsc2UpCiAgICAgLCBtX2NvZGVUeXBlKEZ1bmN0aW9uQ29kZSkKICAgICAsIG1fb3NyRXhpdENv dW50ZXIoMCkKICAgICAsIG1fb3B0aW1pemF0aW9uRGVsYXlDb3VudGVyKDApCkBAIC0yMzM2LDEw ICsyMzM5LDcgQEAgYm9vbCBDb2RlQmxvY2s6OnNob3VsZEltbWVkaWF0ZWx5QXNzdW1lTAogICAg IGlmICghSklUQ29kZTo6aXNPcHRpbWl6aW5nSklUKGppdFR5cGUoKSkpCiAgICAgICAgIHJldHVy biB0cnVlOwogCi0gICAgLy8gRm9yIHNpbXBsaWNpdHksIHdlIGRvbid0IGF0dGVtcHQgdG8gamV0 dGlzb24gY29kZSBibG9ja3MgZHVyaW5nIEdDIGlmCi0gICAgLy8gdGhleSBhcmUgZXhlY3V0aW5n LiBJbnN0ZWFkIHdlIHN0cm9uZ2x5IG1hcmsgdGhlaXIgd2VhayByZWZlcmVuY2VzIHRvCi0gICAg Ly8gYWxsb3cgdGhlbSB0byBjb250aW51ZSB0byBleGVjdXRlIHNvdW5kbHkuCi0gICAgaWYgKG1f bWF5QmVFeGVjdXRpbmcpCisgICAgaWYgKG1faXNTdHJvbmdseVJlZmVyZW5jZWQpCiAgICAgICAg IHJldHVybiB0cnVlOwogCiAgICAgaWYgKE9wdGlvbnM6OmZvcmNlREZHQ29kZUJsb2NrTGl2ZW5l c3MoKSkKQEAgLTIzNTksOCArMjM1OSw4IEBAIGJvb2wgQ29kZUJsb2NrOjppc0tub3duVG9CZUxp dmVEdXJpbmdHQygKICAgICAvLyAgIGFyZSBsaXZlLgogICAgIC8vIC0gQ29kZSBibG9ja3MgdGhh dCB3ZXJlIHJ1bm5pbmcgb24gdGhlIHN0YWNrLgogICAgIC8vIC0gQ29kZSBibG9ja3MgdGhhdCBz dXJ2aXZlZCB0aGUgbGFzdCBHQyBpZiB0aGUgY3VycmVudCBHQyBpcyBhbiBFZGVuIEdDLiBUaGlz IGlzCi0gICAgLy8gICBiZWNhdXNlIGVpdGhlciBsaXZlbmVzc0hhc0JlZW5Qcm92ZWQgd291bGQg aGF2ZSBzdXJ2aXZlZCBhcyB0cnVlIG9yIG1fbWF5QmVFeGVjdXRpbmcKLSAgICAvLyAgIHdvdWxk IHN1cnZpdmUgYXMgdHJ1ZS4KKyAgICAvLyAgIGJlY2F1c2UgZWl0aGVyIGxpdmVuZXNzSGFzQmVl blByb3ZlZCB3b3VsZCBoYXZlIHN1cnZpdmVkIGFzIHRydWUgb3IKKyAgICAvLyAgIG1faXNTdHJv bmdseVJlZmVyZW5jZWQgd291bGQgc3Vydml2ZSBhcyB0cnVlLgogICAgIC8vIC0gQ29kZSBibG9j a3MgdGhhdCBkb24ndCBoYXZlIGFueSBkZWFkIHdlYWsgcmVmZXJlbmNlcy4KICAgICAKICAgICBy ZXR1cm4gc2hvdWxkSW1tZWRpYXRlbHlBc3N1bWVMaXZlbmVzc0R1cmluZ1NjYW4oKQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24gMTg5 MjMxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDA1LDcgKzEwMDUsOSBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2lz U3RyaWN0TW9kZTsKICAgICBib29sIG1fbmVlZHNBY3RpdmF0aW9uOworCiAgICAgYm9vbCBtX21h eUJlRXhlY3V0aW5nOworICAgIGJvb2wgbV9pc1N0cm9uZ2x5UmVmZXJlbmNlZDsKICAgICBBdG9t aWM8Ym9vbD4gbV92aXNpdEFnZ3JlZ2F0ZUhhc0JlZW5DYWxsZWQ7CiAKICAgICBSZWZQdHI8U291 cmNlUHJvdmlkZXI+IG1fc291cmNlOwpAQCAtMTIxMCw2ICsxMjEyLDE2IEBAIGlubGluZSBSZWdp c3RlciYgRXhlY1N0YXRlOjp1bmNoZWNrZWRSKFYKICAgICByZXR1cm4gdW5jaGVja2VkUihyZWcu b2Zmc2V0KCkpOwogfQogCitpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6OmNsZWFyTWFya3MoQ29k ZUJsb2NrKiBjb2RlQmxvY2spCit7CisgICAgaWYgKCFjb2RlQmxvY2spCisgICAgICAgIHJldHVy bjsKKworICAgIGNvZGVCbG9jay0+bV9tYXlCZUV4ZWN1dGluZyA9IGZhbHNlOworICAgIGNvZGVC bG9jay0+bV9pc1N0cm9uZ2x5UmVmZXJlbmNlZCA9IGZhbHNlOworICAgIGNvZGVCbG9jay0+bV92 aXNpdEFnZ3JlZ2F0ZUhhc0JlZW5DYWxsZWQuc3RvcmUoZmFsc2UsIHN0ZDo6bWVtb3J5X29yZGVy X3JlbGF4ZWQpOworfQorCiBpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsodm9pZCogY2Fu ZGlkYXRlQ29kZUJsb2NrKQogewogICAgIC8vIFdlIGhhdmUgdG8gY2hlY2sgZm9yIDAgYW5kIC0x IGJlY2F1c2UgdGhvc2UgYXJlIHVzZWQgYnkgdGhlIEhhc2hNYXAgYXMgbWFya2Vycy4KQEAgLTEy MzcsOCArMTI0OSwxNSBAQCBpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsoQ29kZUJsb2Nr CiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBjb2RlQmxvY2stPm1fbWF5QmVFeGVjdXRpbmcg PSB0cnVlOworCiAgICAgLy8gV2UgbWlnaHQgbm90IGhhdmUgY2xlYXJlZCB0aGUgbWFya3MgZm9y IHRoaXMgQ29kZUJsb2NrLCBidXQgd2UgbmVlZCB0byB2aXNpdCBpdC4KICAgICBjb2RlQmxvY2st Pm1fdmlzaXRBZ2dyZWdhdGVIYXNCZWVuQ2FsbGVkLnN0b3JlKGZhbHNlLCBzdGQ6Om1lbW9yeV9v cmRlcl9yZWxheGVkKTsKKworICAgIC8vIEZvciBzaW1wbGljaXR5LCB3ZSBkb24ndCBhdHRlbXB0 IHRvIGpldHRpc29uIGNvZGUgYmxvY2tzIGR1cmluZyBHQyBpZgorICAgIC8vIHRoZXkgYXJlIGV4 ZWN1dGluZy4gSW5zdGVhZCB3ZSBzdHJvbmdseSBtYXJrIHRoZWlyIHdlYWsgcmVmZXJlbmNlcyB0 bworICAgIC8vIGFsbG93IHRoZW0gdG8gY29udGludWUgdG8gZXhlY3V0ZSBzb3VuZGx5LgorICAg IGNvZGVCbG9jay0+bV9pc1N0cm9uZ2x5UmVmZXJlbmNlZCA9IHRydWU7CisKICNpZiBFTkFCTEUo R0dDKQogICAgIG1fY3VycmVudGx5RXhlY3V0aW5nLmFwcGVuZChjb2RlQmxvY2spOwogI2VuZGlm CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1BsYW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHJldmlzaW9uIDE4OTIz MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTU5NSw2ICs1OTUsMTMgQEAgQ29tcGlsYXRpb25LZXkgUGxhbjo6a2V5KCkKICAgICBy ZXR1cm4gQ29tcGlsYXRpb25LZXkoY29kZUJsb2NrLT5hbHRlcm5hdGl2ZSgpLCBtb2RlKTsKIH0K IAordm9pZCBQbGFuOjpjbGVhckNvZGVCbG9ja01hcmtzKENvZGVCbG9ja1NldCYgY29kZUJsb2Nr cykKK3sKKyAgICBjb2RlQmxvY2tzLmNsZWFyTWFya3MoY29kZUJsb2NrLmdldCgpKTsKKyAgICBj b2RlQmxvY2tzLmNsZWFyTWFya3MoY29kZUJsb2NrLT5hbHRlcm5hdGl2ZSgpKTsKKyAgICBjb2Rl QmxvY2tzLmNsZWFyTWFya3MocHJvZmlsZWRERkdDb2RlQmxvY2suZ2V0KCkpOworfQorCiB2b2lk IFBsYW46OmNoZWNrTGl2ZW5lc3NBbmRWaXNpdENoaWxkcmVuKFNsb3RWaXNpdG9yJiB2aXNpdG9y LCBDb2RlQmxvY2tTZXQmIGNvZGVCbG9ja3MpCiB7CiAgICAgaWYgKCFpc0tub3duVG9CZUxpdmVE dXJpbmdHQygpKQpAQCAtNjAzLDggKzYxMCw4IEBAIHZvaWQgUGxhbjo6Y2hlY2tMaXZlbmVzc0Fu ZFZpc2l0Q2hpbGRyZW4KICAgICBmb3IgKHVuc2lnbmVkIGkgPSBtdXN0SGFuZGxlVmFsdWVzLnNp emUoKTsgaS0tOykKICAgICAgICAgdmlzaXRvci5hcHBlbmRVbmJhcnJpZXJlZFZhbHVlKCZtdXN0 SGFuZGxlVmFsdWVzW2ldKTsKICAgICAKLSAgICBjb2RlQmxvY2tzLm1hcmsoY29kZUJsb2NrLT5h bHRlcm5hdGl2ZSgpKTsKICAgICBjb2RlQmxvY2tzLm1hcmsoY29kZUJsb2NrLmdldCgpKTsKKyAg ICBjb2RlQmxvY2tzLm1hcmsoY29kZUJsb2NrLT5hbHRlcm5hdGl2ZSgpKTsKICAgICBjb2RlQmxv Y2tzLm1hcmsocHJvZmlsZWRERkdDb2RlQmxvY2suZ2V0KCkpOwogICAgIAogICAgIHdlYWtSZWZl cmVuY2VzLnZpc2l0Q2hpbGRyZW4odmlzaXRvcik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1BsYW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1BsYW4uaAkocmV2aXNpb24gMTg5MjMxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdQbGFuLmgJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDcgQEAgc3RydWN0IFBsYW4g OiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZQogICAgIAogICAgIENvbXBpbGF0aW9uS2V5IGtl eSgpOwogICAgIAorICAgIHZvaWQgY2xlYXJDb2RlQmxvY2tNYXJrcyhDb2RlQmxvY2tTZXQmKTsK ICAgICB2b2lkIGNoZWNrTGl2ZW5lc3NBbmRWaXNpdENoaWxkcmVuKFNsb3RWaXNpdG9yJiwgQ29k ZUJsb2NrU2V0Jik7CiAgICAgYm9vbCBpc0tub3duVG9CZUxpdmVEdXJpbmdHQygpOwogICAgIHZv aWQgY2FuY2VsKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0 LmNwcAkocmV2aXNpb24gMTg5MjMxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdX b3JrbGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNyw2ICsyMDcsMTcgQEAgdm9pZCBXb3Jr bGlzdDo6Y29tcGxldGVBbGxQbGFuc0ZvclZNKFZNJgogICAgIGNvbXBsZXRlQWxsUmVhZHlQbGFu c0ZvclZNKHZtKTsKIH0KIAordm9pZCBXb3JrbGlzdDo6Y2xlYXJDb2RlQmxvY2tNYXJrcyhWTSYg dm0sIENvZGVCbG9ja1NldCYgY29kZUJsb2NrcykKK3sKKyAgICBMb2NrSG9sZGVyIGxvY2tlciht X2xvY2spOworICAgIGZvciAoUGxhbk1hcDo6aXRlcmF0b3IgaXRlciA9IG1fcGxhbnMuYmVnaW4o KTsgaXRlciAhPSBtX3BsYW5zLmVuZCgpOyArK2l0ZXIpIHsKKyAgICAgICAgUGxhbiogcGxhbiA9 IGl0ZXItPnZhbHVlLmdldCgpOworICAgICAgICBpZiAoJnBsYW4tPnZtICE9ICZ2bSkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICBwbGFuLT5jbGVhckNvZGVCbG9ja01hcmtzKGNvZGVC bG9ja3MpOworICAgIH0KK30KKwogdm9pZCBXb3JrbGlzdDo6c3VzcGVuZEFsbFRocmVhZHMoKQog ewogICAgIG1fc3VzcGVuc2lvbkxvY2subG9jaygpOwpAQCAtMjMwLDcgKzI0MSw3IEBAIHZvaWQg V29ya2xpc3Q6OnZpc2l0V2Vha1JlZmVyZW5jZXMoU2xvdFYKICAgICAgICAgICAgIFBsYW4qIHBs YW4gPSBpdGVyLT52YWx1ZS5nZXQoKTsKICAgICAgICAgICAgIGlmICgmcGxhbi0+dm0gIT0gdm0p CiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBpdGVyLT52YWx1ZS0+Y2hl Y2tMaXZlbmVzc0FuZFZpc2l0Q2hpbGRyZW4odmlzaXRvciwgY29kZUJsb2Nrcyk7CisgICAgICAg ICAgICBwbGFuLT5jaGVja0xpdmVuZXNzQW5kVmlzaXRDaGlsZHJlbih2aXNpdG9yLCBjb2RlQmxv Y2tzKTsKICAgICAgICAgfQogICAgIH0KICAgICAvLyBUaGlzIGxvb3AgZG9lc24ndCBuZWVkIGxv Y2tpbmcgYmVjYXVzZToKQEAgLTQ1Niw2ICs0NjcsMTQgQEAgdm9pZCBjb21wbGV0ZUFsbFBsYW5z Rm9yVk0oVk0mIHZtKQogICAgIH0KIH0KIAordm9pZCBjbGVhckNvZGVCbG9ja01hcmtzKFZNJiB2 bSwgQ29kZUJsb2NrU2V0JiBjb2RlQmxvY2tTZXQpCit7CisgICAgZm9yICh1bnNpZ25lZCBpID0g REZHOjpudW1iZXJPZldvcmtsaXN0cygpOyBpLS07KSB7CisgICAgICAgIGlmIChERkc6Oldvcmts aXN0KiB3b3JrbGlzdCA9IERGRzo6d29ya2xpc3RGb3JJbmRleE9yTnVsbChpKSkKKyAgICAgICAg ICAgIHdvcmtsaXN0LT5jbGVhckNvZGVCbG9ja01hcmtzKHZtLCBjb2RlQmxvY2tTZXQpOworICAg IH0KK30KKwogfSB9IC8vIG5hbWVzcGFjZSBKU0M6OkRGRwogCiAjZW5kaWYgLy8gRU5BQkxFKERG R19KSVQpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdXb3JrbGlzdC5oCShyZXZp c2lvbiAxODkyMzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1dvcmtsaXN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDkgQEAgcHVibGljOgogICAgIC8vIHdvcmtsaXN0 LT53YWl0VW50aWxBbGxQbGFuc0ZvclZNQXJlUmVhZHkodm0pOwogICAgIC8vIHdvcmtsaXN0LT5j b21wbGV0ZUFsbFJlYWR5UGxhbnNGb3JWTSh2bSk7CiAgICAgdm9pZCBjb21wbGV0ZUFsbFBsYW5z Rm9yVk0oVk0mKTsKLSAgICAKKworICAgIHZvaWQgY2xlYXJDb2RlQmxvY2tNYXJrcyhWTSYsIENv ZGVCbG9ja1NldCYpOworCiAgICAgdm9pZCB3YWl0VW50aWxBbGxQbGFuc0ZvclZNQXJlUmVhZHko Vk0mKTsKICAgICBTdGF0ZSBjb21wbGV0ZUFsbFJlYWR5UGxhbnNGb3JWTShWTSYsIENvbXBpbGF0 aW9uS2V5ID0gQ29tcGlsYXRpb25LZXkoKSk7CiAgICAgdm9pZCByZW1vdmVBbGxSZWFkeVBsYW5z Rm9yVk0oVk0mKTsKQEAgLTE0MCw2ICsxNDIsNyBAQCBpbmxpbmUgV29ya2xpc3QqIHdvcmtsaXN0 Rm9ySW5kZXhPck51bGwoCiB9CiAKIHZvaWQgY29tcGxldGVBbGxQbGFuc0ZvclZNKFZNJik7Cit2 b2lkIGNsZWFyQ29kZUJsb2NrTWFya3MoVk0mLCBDb2RlQmxvY2tTZXQmKTsKIAogfSB9IC8vIG5h bWVzcGFjZSBKU0M6OkRGRwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db2Rl QmxvY2tTZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0Nv ZGVCbG9ja1NldC5jcHAJKHJldmlzaW9uIDE4OTIzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9oZWFwL0NvZGVCbG9ja1NldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYzLDEwICs2Myw4IEBA IHZvaWQgQ29kZUJsb2NrU2V0Ojpwcm9tb3RlWW91bmdDb2RlQmxvY2sKIAogdm9pZCBDb2RlQmxv Y2tTZXQ6OmNsZWFyTWFya3NGb3JGdWxsQ29sbGVjdGlvbigpCiB7Ci0gICAgZm9yIChDb2RlQmxv Y2sqIGNvZGVCbG9jayA6IG1fb2xkQ29kZUJsb2NrcykgewotICAgICAgICBjb2RlQmxvY2stPm1f bWF5QmVFeGVjdXRpbmcgPSBmYWxzZTsKLSAgICAgICAgY29kZUJsb2NrLT5tX3Zpc2l0QWdncmVn YXRlSGFzQmVlbkNhbGxlZC5zdG9yZShmYWxzZSwgc3RkOjptZW1vcnlfb3JkZXJfcmVsYXhlZCk7 Ci0gICAgfQorICAgIGZvciAoQ29kZUJsb2NrKiBjb2RlQmxvY2sgOiBtX29sZENvZGVCbG9ja3Mp CisgICAgICAgIGNsZWFyTWFya3MoY29kZUJsb2NrKTsKIAogICAgIC8vIFdlIHByb21vdGUgYWZ0 ZXIgd2UgY2xlYXIgbWFya3Mgb24gdGhlIG9sZCBnZW5lcmF0aW9uIENvZGVCbG9ja3MgYmVjYXVz ZQogICAgIC8vIG5vbmUgb2YgdGhlIHlvdW5nIGdlbmVyYXRpb25zIENvZGVCbG9ja3MgbmVlZCB0 byBiZSBjbGVhcmVkLgpAQCAtODAsOSArNzgsOCBAQCB2b2lkIENvZGVCbG9ja1NldDo6Y2xlYXJN YXJrc0ZvckVkZW5Db2xsCiAgICAgICAgIFNjcmlwdEV4ZWN1dGFibGUqIGV4ZWN1dGFibGUgPSBj b25zdF9jYXN0PFNjcmlwdEV4ZWN1dGFibGUqPihqc0R5bmFtaWNDYXN0PGNvbnN0IFNjcmlwdEV4 ZWN1dGFibGUqPihjZWxsKSk7CiAgICAgICAgIGlmICghZXhlY3V0YWJsZSkKICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICBleGVjdXRhYmxlLT5mb3JFYWNoQ29kZUJsb2NrKFtdKENvZGVC bG9jayogY29kZUJsb2NrKSB7Ci0gICAgICAgICAgICBjb2RlQmxvY2stPm1fbWF5QmVFeGVjdXRp bmcgPSBmYWxzZTsKLSAgICAgICAgICAgIGNvZGVCbG9jay0+bV92aXNpdEFnZ3JlZ2F0ZUhhc0Jl ZW5DYWxsZWQuc3RvcmUoZmFsc2UsIHN0ZDo6bWVtb3J5X29yZGVyX3JlbGF4ZWQpOworICAgICAg ICBleGVjdXRhYmxlLT5mb3JFYWNoQ29kZUJsb2NrKFt0aGlzXShDb2RlQmxvY2sqIGNvZGVCbG9j aykgeworICAgICAgICAgICAgY2xlYXJNYXJrcyhjb2RlQmxvY2spOwogICAgICAgICB9KTsKICAg ICB9CiB9CkBAIC0xMDIsNyArOTksNyBAQCB2b2lkIENvZGVCbG9ja1NldDo6ZGVsZXRlVW5tYXJr ZWRBbmRVbnJlCiAgICAgICAgIGZvciAoQ29kZUJsb2NrKiBjb2RlQmxvY2sgOiBzZXQpIHsKICAg ICAgICAgICAgIGlmICghY29kZUJsb2NrLT5oYXNPbmVSZWYoKSkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgICAgIGlmIChjb2RlQmxvY2stPm1fbWF5QmVFeGVjdXRpbmcpCisg ICAgICAgICAgICBpZiAoY29kZUJsb2NrLT5tX2lzU3Ryb25nbHlSZWZlcmVuY2VkKQogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgY29kZUJsb2NrLT5kZXJlZigpOwogICAg ICAgICAgICAgdG9SZW1vdmUuYXBwZW5kKGNvZGVCbG9jayk7CkBAIC0xMzgsNiArMTM1LDcgQEAg dm9pZCBDb2RlQmxvY2tTZXQ6OnRyYWNlTWFya2VkKFNsb3RWaXNpdAogICAgICAgICBkYXRhTG9n KCJUcmFjaW5nICIsIG1fY3VycmVudGx5RXhlY3V0aW5nLnNpemUoKSwgIiBjb2RlIGJsb2Nrcy5c biIpOwogICAgIGZvciAoQ29kZUJsb2NrKiBjb2RlQmxvY2sgOiBtX2N1cnJlbnRseUV4ZWN1dGlu ZykgewogICAgICAgICBBU1NFUlQoY29kZUJsb2NrLT5tX21heUJlRXhlY3V0aW5nKTsKKyAgICAg ICAgQVNTRVJUKGNvZGVCbG9jay0+bV9pc1N0cm9uZ2x5UmVmZXJlbmNlZCk7CiAgICAgICAgIGNv ZGVCbG9jay0+dmlzaXRBZ2dyZWdhdGUodmlzaXRvcik7CiAgICAgfQogfQpAQCAtMTQ4LDggKzE0 Niw5IEBAIHZvaWQgQ29kZUJsb2NrU2V0OjpyZW1lbWJlckN1cnJlbnRseUV4ZWMKICAgICBpZiAo dmVyYm9zZSkKICAgICAgICAgZGF0YUxvZygiUmVtZW1iZXJpbmcgIiwgbV9jdXJyZW50bHlFeGVj dXRpbmcuc2l6ZSgpLCAiIGNvZGUgYmxvY2tzLlxuIik7CiAgICAgZm9yIChDb2RlQmxvY2sqIGNv ZGVCbG9jayA6IG1fY3VycmVudGx5RXhlY3V0aW5nKSB7Ci0gICAgICAgIGhlYXAtPmFkZFRvUmVt ZW1iZXJlZFNldChjb2RlQmxvY2stPm93bmVyRXhlY3V0YWJsZSgpKTsKICAgICAgICAgQVNTRVJU KGNvZGVCbG9jay0+bV9tYXlCZUV4ZWN1dGluZyk7CisgICAgICAgIEFTU0VSVChjb2RlQmxvY2st Pm1faXNTdHJvbmdseVJlZmVyZW5jZWQpOworICAgICAgICBoZWFwLT5hZGRUb1JlbWVtYmVyZWRT ZXQoY29kZUJsb2NrLT5vd25lckV4ZWN1dGFibGUoKSk7CiAgICAgfQogICAgIG1fY3VycmVudGx5 RXhlY3V0aW5nLmNsZWFyKCk7CiAjZWxzZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvQ29kZUJsb2NrU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvQ29kZUJsb2NrU2V0LmgJKHJldmlzaW9uIDE4OTIzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9oZWFwL0NvZGVCbG9ja1NldC5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw4IEBA IHB1YmxpYzoKICAgICAvLyBDbGVhciBhbGwgbWFyayBiaXRzIGZvciBhbGwgQ29kZUJsb2Nrcy4K ICAgICB2b2lkIGNsZWFyTWFya3NGb3JGdWxsQ29sbGVjdGlvbigpOwogCisgICAgdm9pZCBjbGVh ck1hcmtzKENvZGVCbG9jayopOworCiAgICAgLy8gTWFyayBhIHBvaW50ZXIgdGhhdCBtYXkgYmUg YSBDb2RlQmxvY2sgdGhhdCBiZWxvbmdzIHRvIHRoZSBzZXQgb2YgREZHCiAgICAgLy8gYmxvY2tz LiBUaGlzIGlzIGRlZmluZWQgaW4gQ29kZUJsb2NrLmguCiAgICAgdm9pZCBtYXJrKENvZGVCbG9j ayogY2FuZGlkYXRlQ29kZUJsb2NrKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFw L0hlYXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAu Y3BwCShyZXZpc2lvbiAxODkyMzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFw LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTM4LDYgKzUzOCw3IEBAIHZvaWQgSGVhcDo6bWFya1Jv b3RzKGRvdWJsZSBnY1N0YXJ0VGltZSwKICAgICBWZWN0b3I8Y29uc3QgSlNDZWxsKj4gcmVtZW1i ZXJlZFNldDsKICNlbmRpZgogCisgICAgREZHOjpjbGVhckNvZGVCbG9ja01hcmtzKCptX3ZtLCBt X2NvZGVCbG9ja3MpOwogICAgIGlmIChtX29wZXJhdGlvbkluUHJvZ3Jlc3MgPT0gRWRlbkNvbGxl Y3Rpb24pCiAgICAgICAgIG1fY29kZUJsb2Nrcy5jbGVhck1hcmtzRm9yRWRlbkNvbGxlY3Rpb24o cmVtZW1iZXJlZFNldCk7CiAgICAgZWxzZQo=