127275 2014-01-20 02:20:17 -0800 Move HistoryItem to std::unique_ptr 2014-01-24 01:28:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan andersca oldest_to_newest 969776 0 zan 2014-01-20 02:20:17 -0800 Move HistoryItem to std::unique_ptr 969777 1 221638 zan 2014-01-20 02:23:16 -0800 Created attachment 221638 Patch 970171 2 221720 zan 2014-01-20 22:30:09 -0800 Created attachment 221720 Patch 970358 3 221720 bfulgham 2014-01-21 12:02:02 -0800 Comment on attachment 221720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221720&action=review Looks good, but is missing necessary changes in Mac and Windows code. r- for these build failures. > Source/WebCore/history/HistoryItem.cpp:225 > + m_redirectURLs = nullptr; You need to make a similar change in history/mac/HistoryItemMac.mm. > Source/WebCore/history/HistoryItem.h:183 > + void setRedirectURLs(std::unique_ptr<Vector<String>>); Some Windows code (WebKit/win/WebHistoryItem.cpp) still thinks this argument is a PassOwnPtr. 971204 4 221994 zan 2014-01-23 09:51:37 -0800 Created attachment 221994 Patch 971236 5 222003 zan 2014-01-23 11:01:37 -0800 Created attachment 222003 Patch Removed the HistoryItem::setRedirectURLs symbol that's listing PassOwnPtr<Vector> as the parameter, will likely have to replace it with an updated one. 971310 6 222021 zan 2014-01-23 13:16:58 -0800 Created attachment 222021 Patch 971394 7 222021 darin 2014-01-23 16:38:58 -0800 Comment on attachment 222021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222021&action=review > Source/WebKit/mac/History/WebHistoryItem.mm:391 > + std::unique_ptr<Vector<String>> redirectURLsVector = std::make_unique<Vector<String>>(size); Seems like a good place to use auto: auto redirectURLsVector = std::make_unique<Vector<String>>(size); 971547 8 zan 2014-01-24 01:20:54 -0800 Committed r162696: <http://trac.webkit.org/changeset/162696> 971548 9 222021 zan 2014-01-24 01:28:16 -0800 Comment on attachment 222021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222021&action=review >> Source/WebKit/mac/History/WebHistoryItem.mm:391 >> + std::unique_ptr<Vector<String>> redirectURLsVector = std::make_unique<Vector<String>>(size); > > Seems like a good place to use auto: > > auto redirectURLsVector = std::make_unique<Vector<String>>(size); Addressed this before landing. 221638 2014-01-20 02:23:16 -0800 2014-01-20 22:30:04 -0800 Patch bug-127275-20140120022314.patch text/plain 4873 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZkZTgxZTZiNDQ5ZDcw NDIxYTc5NTA3YjVhZTgzYzc5MDA1ZTRiNy4uNTcxYWM1Y2MxMzE0YTQ3N2JiYzk0MzVmOTIxNmJm NGI5ZTdlMTM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTIwICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3ZlIEhpc3RvcnlJ dGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgdXNlcyBvZiBPd25QdHIgYW5kIFBhc3NPd25QdHIg aW4gdGhlIEhpc3RvcnlJdGVtIGNsYXNzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAg ICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRl bTo6SGlzdG9yeUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTCk6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkp OgorCiAyMDE0LTAxLTIwICBNb3J0ZW4gU3RlbnNob3JuZSAgPG1zdGVuc2hvQG9wZXJhLmNvbT4K IAogICAgICAgICBSZWdpb24gYmFzZWQgbXVsdGljb2w6IHRhbGwgbGluZSBjYXVzZXMgdGFsbGVy IG11bHRpY29sIGNvbnRhaW5lciB0aGFuIG5lY2Vzc2FyeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hp c3RvcnlJdGVtLmNwcAppbmRleCAwZTE3NzM5MTgyNmM5NzMxNzI5NjQyNDEwNmMwNGZjMDg1OThk NmM5Li44OTJmYzllNmJhMjIzNDM3ZWUyYzY0OTE5YzllYWUwYmQ0MTQ5YzcxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcApAQCAtMTkzLDcgKzE5Myw3IEBAIGlubGluZSBI aXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgSGlzdG9yeUl0ZW0mIGl0ZW0pCiAgICAgICAg IG1fY2hpbGRyZW4udW5jaGVja2VkQXBwZW5kKGl0ZW0ubV9jaGlsZHJlbltpXS0+Y29weSgpKTsK IAogICAgIGlmIChpdGVtLm1fcmVkaXJlY3RVUkxzKQotICAgICAgICBtX3JlZGlyZWN0VVJMcyA9 IGFkb3B0UHRyKG5ldyBWZWN0b3I8U3RyaW5nPigqaXRlbS5tX3JlZGlyZWN0VVJMcykpOworICAg ICAgICBtX3JlZGlyZWN0VVJMcyA9IHN0ZDo6bWFrZV91bmlxdWU8VmVjdG9yPFN0cmluZz4+KCpp dGVtLm1fcmVkaXJlY3RVUkxzKTsKIH0KIAogUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gSGlzdG9y eUl0ZW06OmNvcHkoKSBjb25zdApAQCAtMjIyLDcgKzIyMiw3IEBAIHZvaWQgSGlzdG9yeUl0ZW06 OnJlc2V0KCkKICAgICBtX2RhaWx5VmlzaXRDb3VudHMuY2xlYXIoKTsKICAgICBtX3dlZWtseVZp c2l0Q291bnRzLmNsZWFyKCk7CiAKLSAgICBtX3JlZGlyZWN0VVJMcy5jbGVhcigpOworICAgIG1f cmVkaXJlY3RVUkxzLnJlc2V0KCk7CiAKICAgICBtX2l0ZW1TZXF1ZW5jZU51bWJlciA9IGdlbmVy YXRlU2VxdWVuY2VOdW1iZXIoKTsKIApAQCAtNjg0LDcgKzY4NCw3IEBAIHZvaWQgSGlzdG9yeUl0 ZW06Om1lcmdlQXV0b0NvbXBsZXRlSGludHMoSGlzdG9yeUl0ZW0qIG90aGVySXRlbSkKIHZvaWQg SGlzdG9yeUl0ZW06OmFkZFJlZGlyZWN0VVJMKGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIGlm ICghbV9yZWRpcmVjdFVSTHMpCi0gICAgICAgIG1fcmVkaXJlY3RVUkxzID0gYWRvcHRQdHIobmV3 IFZlY3RvcjxTdHJpbmc+KTsKKyAgICAgICAgbV9yZWRpcmVjdFVSTHMgPSBzdGQ6Om1ha2VfdW5p cXVlPFZlY3RvcjxTdHJpbmc+PigpOwogCiAgICAgLy8gT3VyIEFQSSBhbGxvd3MgdXMgdG8gc3Rv cmUgYWxsIHRoZSBVUkxzIGluIHRoZSByZWRpcmVjdCBjaGFpbiwgYnV0IGZvcgogICAgIC8vIG5v dyB3ZSBvbmx5IGhhdmUgYSB1c2UgZm9yIHRoZSBmaW5hbCBVUkwuCkBAIC02OTcsOSArNjk3LDkg QEAgVmVjdG9yPFN0cmluZz4qIEhpc3RvcnlJdGVtOjpyZWRpcmVjdFVSTHMoKSBjb25zdAogICAg IHJldHVybiBtX3JlZGlyZWN0VVJMcy5nZXQoKTsKIH0KIAotdm9pZCBIaXN0b3J5SXRlbTo6c2V0 UmVkaXJlY3RVUkxzKFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4+IHJlZGlyZWN0VVJMcykKK3Zv aWQgSGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcyhzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPFN0 cmluZz4+IHJlZGlyZWN0VVJMcykKIHsKLSAgICBtX3JlZGlyZWN0VVJMcyA9IHJlZGlyZWN0VVJM czsKKyAgICBtX3JlZGlyZWN0VVJMcyA9IHN0ZDo6bW92ZShyZWRpcmVjdFVSTHMpOwogfQogCiB2 b2lkIEhpc3RvcnlJdGVtOjplbmNvZGVCYWNrRm9yd2FyZFRyZWUoRW5jb2RlciYgZW5jb2Rlcikg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaCBi L1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAppbmRleCA1MWZjMGQxZDIyNmRk ODg5NDZmNjgxMTU2YTEyMTYwM2M5NjZmNDIwLi5hNmRhNmJmZGU5Y2U2MGMwNmIxZGUwNDYxODI5 NzI2M2ZiNDBlYjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJ dGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCkBAIC0yOSw4 ICsyOSw3IEBACiAKICNpbmNsdWRlICJJbnRQb2ludC5oIgogI2luY2x1ZGUgIlNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZS5oIgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KLSNpbmNsdWRlIDx3dGYvUGFz c093blB0ci5oPgorI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC0xODEsNyArMTgwLDcgQEAg cHVibGljOgogCiAgICAgdm9pZCBhZGRSZWRpcmVjdFVSTChjb25zdCBTdHJpbmcmKTsKICAgICBW ZWN0b3I8U3RyaW5nPiogcmVkaXJlY3RVUkxzKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRSZWRpcmVj dFVSTHMoUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPj4pOworICAgIHZvaWQgc2V0UmVkaXJlY3RV UkxzKHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4pOwogCiAgICAgYm9vbCBpc0N1cnJl bnREb2N1bWVudChEb2N1bWVudCopIGNvbnN0OwogICAgIApAQCAtMjY0LDcgKzI2Myw3IEBAIHBy aXZhdGU6CiAgICAgVmVjdG9yPGludD4gbV9kYWlseVZpc2l0Q291bnRzOwogICAgIFZlY3Rvcjxp bnQ+IG1fd2Vla2x5VmlzaXRDb3VudHM7CiAKLSAgICBPd25QdHI8VmVjdG9yPFN0cmluZz4+IG1f cmVkaXJlY3RVUkxzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4gbV9yZWRp cmVjdFVSTHM7CiAKICAgICAvLyBJZiB0d28gSGlzdG9yeUl0ZW1zIGhhdmUgdGhlIHNhbWUgaXRl bSBzZXF1ZW5jZSBudW1iZXIsIHRoZW4gdGhleSBhcmUKICAgICAvLyBjbG9uZXMgb2Ygb25lIGFu b3RoZXIuICBUcmF2ZXJzaW5nIGhpc3RvcnkgZnJvbSBvbmUgc3VjaCBIaXN0b3J5SXRlbSB0bwpA QCAtMzAwLDcgKzI5OSw3IEBAIHByaXZhdGU6CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgUmV0 YWluUHRyPGlkPiBtX3ZpZXdTdGF0ZTsKLSAgICBPd25QdHI8SGFzaE1hcDxTdHJpbmcsIFJldGFp blB0cjxpZD4+PiBtX3RyYW5zaWVudFByb3BlcnRpZXM7CisgICAgc3RkOjp1bmlxdWVfcHRyPEhh c2hNYXA8U3RyaW5nLCBSZXRhaW5QdHI8aWQ+Pj4gbV90cmFuc2llbnRQcm9wZXJ0aWVzOwogI2Vu ZGlmCiB9OyAvL2NsYXNzIEhpc3RvcnlJdGVtCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2hpc3RvcnkvbWFjL0hpc3RvcnlJdGVtTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9t YWMvSGlzdG9yeUl0ZW1NYWMubW0KaW5kZXggYmE5M2ZiZDBlNTNhYjI2YmRmZjFjZGVjY2UzYjQ0 ZTFkODRlMjIzMy4uNTQ3YzhlZjQ2M2RhMTc4MGFhMDYyY2I5MmY5OTdkMmI3YmY2MmE4OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMubW0KQEAgLTU5LDcg KzU5LDcgQEAgdm9pZCBIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkoY29uc3QgU3Ry aW5nJiBrZXksIGlkIHZhbHVlKQogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYg KCFtX3RyYW5zaWVudFByb3BlcnRpZXMpCi0gICAgICAgICAgICBtX3RyYW5zaWVudFByb3BlcnRp ZXMgPSBhZG9wdFB0cihuZXcgSGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxpZD4+KTsKKyAgICAg ICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IHN0ZDo6bWFrZV91bmlxdWU8SGFzaE1hcDxT dHJpbmcsIFJldGFpblB0cjxpZD4+PigpOwogICAgICAgICBtX3RyYW5zaWVudFByb3BlcnRpZXMt PnNldChrZXksIHZhbHVlKTsKICAgICB9CiB9Cg== 221720 2014-01-20 22:30:09 -0800 2014-01-23 09:51:32 -0800 Patch bug-127275-20140120223008.patch text/plain 4828 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjdjNDc4N2MyYjA0Yzg0 OTEyM2I2YjFiNjdkYjkzYmQ3ZmM4NzJkZS4uMzRkZTMxYzc0MDQwZTVlODBhNDU3YzljYTdhM2Nk YzczYzg1NzIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTIwICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3ZlIEhpc3RvcnlJ dGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgdXNlcyBvZiBPd25QdHIgYW5kIFBhc3NPd25QdHIg aW4gdGhlIEhpc3RvcnlJdGVtIGNsYXNzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAg ICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRl bTo6SGlzdG9yeUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTCk6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkp OgorCiAyMDE0LTAxLTIwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIGFuIHVudXNlZCBQYWdlR3JvdXAgZnVuY3Rpb24KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKaW5kZXggMGUxNzczOTE4MjZjOTczMTcyOTY0MjQxMDZj MDRmYzA4NTk4ZDZjOS4uNWI0NzAwMjdjMmI1ZWE2Y2RjMGE5ZDhlZTg5NDU2ZjgyY2FhZDZjZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKQEAgLTE5Myw3ICsxOTMsNyBA QCBpbmxpbmUgSGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKGNvbnN0IEhpc3RvcnlJdGVtJiBpdGVt KQogICAgICAgICBtX2NoaWxkcmVuLnVuY2hlY2tlZEFwcGVuZChpdGVtLm1fY2hpbGRyZW5baV0t PmNvcHkoKSk7CiAKICAgICBpZiAoaXRlbS5tX3JlZGlyZWN0VVJMcykKLSAgICAgICAgbV9yZWRp cmVjdFVSTHMgPSBhZG9wdFB0cihuZXcgVmVjdG9yPFN0cmluZz4oKml0ZW0ubV9yZWRpcmVjdFVS THMpKTsKKyAgICAgICAgbV9yZWRpcmVjdFVSTHMgPSBzdGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxT dHJpbmc+PigqaXRlbS5tX3JlZGlyZWN0VVJMcyk7CiB9CiAKIFBhc3NSZWZQdHI8SGlzdG9yeUl0 ZW0+IEhpc3RvcnlJdGVtOjpjb3B5KCkgY29uc3QKQEAgLTIyMiw3ICsyMjIsNyBAQCB2b2lkIEhp c3RvcnlJdGVtOjpyZXNldCgpCiAgICAgbV9kYWlseVZpc2l0Q291bnRzLmNsZWFyKCk7CiAgICAg bV93ZWVrbHlWaXNpdENvdW50cy5jbGVhcigpOwogCi0gICAgbV9yZWRpcmVjdFVSTHMuY2xlYXIo KTsKKyAgICBtX3JlZGlyZWN0VVJMcyA9IG51bGxwdHI7CiAKICAgICBtX2l0ZW1TZXF1ZW5jZU51 bWJlciA9IGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKTsKIApAQCAtNjg0LDcgKzY4NCw3IEBAIHZv aWQgSGlzdG9yeUl0ZW06Om1lcmdlQXV0b0NvbXBsZXRlSGludHMoSGlzdG9yeUl0ZW0qIG90aGVy SXRlbSkKIHZvaWQgSGlzdG9yeUl0ZW06OmFkZFJlZGlyZWN0VVJMKGNvbnN0IFN0cmluZyYgdXJs KQogewogICAgIGlmICghbV9yZWRpcmVjdFVSTHMpCi0gICAgICAgIG1fcmVkaXJlY3RVUkxzID0g YWRvcHRQdHIobmV3IFZlY3RvcjxTdHJpbmc+KTsKKyAgICAgICAgbV9yZWRpcmVjdFVSTHMgPSBz dGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxTdHJpbmc+PigpOwogCiAgICAgLy8gT3VyIEFQSSBhbGxv d3MgdXMgdG8gc3RvcmUgYWxsIHRoZSBVUkxzIGluIHRoZSByZWRpcmVjdCBjaGFpbiwgYnV0IGZv cgogICAgIC8vIG5vdyB3ZSBvbmx5IGhhdmUgYSB1c2UgZm9yIHRoZSBmaW5hbCBVUkwuCkBAIC02 OTcsOSArNjk3LDkgQEAgVmVjdG9yPFN0cmluZz4qIEhpc3RvcnlJdGVtOjpyZWRpcmVjdFVSTHMo KSBjb25zdAogICAgIHJldHVybiBtX3JlZGlyZWN0VVJMcy5nZXQoKTsKIH0KIAotdm9pZCBIaXN0 b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4+IHJlZGly ZWN0VVJMcykKK3ZvaWQgSGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcyhzdGQ6OnVuaXF1ZV9w dHI8VmVjdG9yPFN0cmluZz4+IHJlZGlyZWN0VVJMcykKIHsKLSAgICBtX3JlZGlyZWN0VVJMcyA9 IHJlZGlyZWN0VVJMczsKKyAgICBtX3JlZGlyZWN0VVJMcyA9IHN0ZDo6bW92ZShyZWRpcmVjdFVS THMpOwogfQogCiB2b2lkIEhpc3RvcnlJdGVtOjplbmNvZGVCYWNrRm9yd2FyZFRyZWUoRW5jb2Rl ciYgZW5jb2RlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlz dG9yeUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAppbmRleCA1 MWZjMGQxZDIyNmRkODg5NDZmNjgxMTU2YTEyMTYwM2M5NjZmNDIwLi5hNmRhNmJmZGU5Y2U2MGMw NmIxZGUwNDYxODI5NzI2M2ZiNDBlYjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0 b3J5L0hpc3RvcnlJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRl bS5oCkBAIC0yOSw4ICsyOSw3IEBACiAKICNpbmNsdWRlICJJbnRQb2ludC5oIgogI2luY2x1ZGUg IlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KLSNpbmNs dWRlIDx3dGYvUGFzc093blB0ci5oPgorI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYv UmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC0xODEs NyArMTgwLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGRSZWRpcmVjdFVSTChjb25zdCBTdHJp bmcmKTsKICAgICBWZWN0b3I8U3RyaW5nPiogcmVkaXJlY3RVUkxzKCkgY29uc3Q7Ci0gICAgdm9p ZCBzZXRSZWRpcmVjdFVSTHMoUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPj4pOworICAgIHZvaWQg c2V0UmVkaXJlY3RVUkxzKHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4pOwogCiAgICAg Ym9vbCBpc0N1cnJlbnREb2N1bWVudChEb2N1bWVudCopIGNvbnN0OwogICAgIApAQCAtMjY0LDcg KzI2Myw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPGludD4gbV9kYWlseVZpc2l0Q291bnRzOwog ICAgIFZlY3RvcjxpbnQ+IG1fd2Vla2x5VmlzaXRDb3VudHM7CiAKLSAgICBPd25QdHI8VmVjdG9y PFN0cmluZz4+IG1fcmVkaXJlY3RVUkxzOworICAgIHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3Ry aW5nPj4gbV9yZWRpcmVjdFVSTHM7CiAKICAgICAvLyBJZiB0d28gSGlzdG9yeUl0ZW1zIGhhdmUg dGhlIHNhbWUgaXRlbSBzZXF1ZW5jZSBudW1iZXIsIHRoZW4gdGhleSBhcmUKICAgICAvLyBjbG9u ZXMgb2Ygb25lIGFub3RoZXIuICBUcmF2ZXJzaW5nIGhpc3RvcnkgZnJvbSBvbmUgc3VjaCBIaXN0 b3J5SXRlbSB0bwpAQCAtMzAwLDcgKzI5OSw3IEBAIHByaXZhdGU6CiAKICNpZiBQTEFURk9STShN QUMpCiAgICAgUmV0YWluUHRyPGlkPiBtX3ZpZXdTdGF0ZTsKLSAgICBPd25QdHI8SGFzaE1hcDxT dHJpbmcsIFJldGFpblB0cjxpZD4+PiBtX3RyYW5zaWVudFByb3BlcnRpZXM7CisgICAgc3RkOjp1 bmlxdWVfcHRyPEhhc2hNYXA8U3RyaW5nLCBSZXRhaW5QdHI8aWQ+Pj4gbV90cmFuc2llbnRQcm9w ZXJ0aWVzOwogI2VuZGlmCiB9OyAvL2NsYXNzIEhpc3RvcnlJdGVtCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3RvcnlJdGVtTWFjLm1tIGIvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMubW0KaW5kZXggYmE5M2ZiZDBlNTNhYjI2YmRm ZjFjZGVjY2UzYjQ0ZTFkODRlMjIzMy4uNTQ3YzhlZjQ2M2RhMTc4MGFhMDYyY2I5MmY5OTdkMmI3 YmY2MmE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9tYWMvSGlzdG9yeUl0 ZW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW0KQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVy dHkoY29uc3QgU3RyaW5nJiBrZXksIGlkIHZhbHVlKQogICAgICAgICB9CiAgICAgfSBlbHNlIHsK ICAgICAgICAgaWYgKCFtX3RyYW5zaWVudFByb3BlcnRpZXMpCi0gICAgICAgICAgICBtX3RyYW5z aWVudFByb3BlcnRpZXMgPSBhZG9wdFB0cihuZXcgSGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxp ZD4+KTsKKyAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IHN0ZDo6bWFrZV91bmlx dWU8SGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxpZD4+PigpOwogICAgICAgICBtX3RyYW5zaWVu dFByb3BlcnRpZXMtPnNldChrZXksIHZhbHVlKTsKICAgICB9CiB9Cg== 221994 2014-01-23 09:51:37 -0800 2014-01-23 11:01:31 -0800 Patch bug-127275-20140123095136.patch text/plain 9470 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNjZjM4OTQ0NTgxMTRi OTc0ZjkwMzg2ODUzMzU5ZjY3YmEzNzg2My4uNGJiZmM1MWY3MmRkNjEzNThiNTg1ZWE4MjA2YmUy YWRjYWM0OTFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3ZlIEhpc3RvcnlJ dGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgdXNlcyBvZiBPd25QdHIgYW5kIFBhc3NPd25QdHIg aW4gdGhlIEhpc3RvcnlJdGVtIGNsYXNzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAg ICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRl bTo6SGlzdG9yeUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTCk6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkp OgorCiAyMDE0LTAxLTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFN1cnJvdW5kIGZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0IGNvZGUgd2l0aCBVU0Uo VElMRURfQkFDS0lOR19TVE9SRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA3NGIxNTBmMGJiN2NkMWJm YjM2YTFjYjg2ZGRiN2Q5N2EwYTE4NzkyLi5lN2M3N2RjODllOWEwOTc4ZDFjZTY3MmU2ZmM1NTll NDliNDI3ZjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDEtMjMg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgSGlz dG9yeUl0ZW0gdG8gc3RkOjp1bmlxdWVfcHRyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIEhpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW06IFRoZSBWZWN0 b3Igb2JqZWN0IHRoYXQncyBwYXNzZWQgdG8gSGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcwor ICAgICAgICBzaG91bGQgbm93IGJlIGhhbmRsZWQgYnkgc3RkOjp1bmlxdWVfcHRyIGFuZCBwYXNz ZWQgb24gdGhyb3VnaCBtb3ZlIHNlbWFudGljcy4KKyAgICAgICAgKC1bV2ViSGlzdG9yeUl0ZW0g aW5pdEZyb21EaWN0aW9uYXJ5UmVwcmVzZW50YXRpb246XSk6CisKIDIwMTQtMDEtMjIgIE15bGVz IEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgQ1NT M19URVhUX0RFQ09SQVRJT04gZGVmaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggOTZlNDU5YWI0MmM3 OGExYTU4YThhMWI0OWJkYTc5ZGE2MmVhNzhmMS4uNzc5NDg4MTBkYjk3ZDk5N2Q4YWM3NzA3YThi MmQ5NmNhMWNmYzA0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTAx LTIzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3Zl IEhpc3RvcnlJdGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJIaXN0b3J5SXRlbS5jcHA6IFRoZSBWZWN0b3Ig b2JqZWN0IHRoYXQncyBwYXNzZWQgdG8gSGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcworICAg ICAgICBzaG91bGQgbm93IGJlIGhhbmRsZWQgYnkgc3RkOjp1bmlxdWVfcHRyIGFuZCBwYXNzZWQg b24gdGhyb3VnaCBtb3ZlIHNlbWFudGljcy4KKyAgICAgICAgKFdlYkhpc3RvcnlJdGVtOjppbml0 RnJvbURpY3Rpb25hcnlSZXByZXNlbnRhdGlvbik6CisKIDIwMTQtMDEtMjEgIHBlYXZvQG91dGxv b2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXVtDdXJsXSBE b3dubG9hZCByZXF1ZXN0IGhhcyBpbmNvcnJlY3QgdXNlciBhZ2VudCBzdHJpbmcuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCmluZGV4IDBlMTc3MzkxODI2Yzk3MzE3Mjk2NDI0 MTA2YzA0ZmMwODU5OGQ2YzkuLjViNDcwMDI3YzJiNWVhNmNkYzBhOWQ4ZWU4OTQ1NmY4MmNhYWQ2 Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCkBAIC0xOTMsNyArMTkz LDcgQEAgaW5saW5lIEhpc3RvcnlJdGVtOjpIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5SXRlbSYg aXRlbSkKICAgICAgICAgbV9jaGlsZHJlbi51bmNoZWNrZWRBcHBlbmQoaXRlbS5tX2NoaWxkcmVu W2ldLT5jb3B5KCkpOwogCiAgICAgaWYgKGl0ZW0ubV9yZWRpcmVjdFVSTHMpCi0gICAgICAgIG1f cmVkaXJlY3RVUkxzID0gYWRvcHRQdHIobmV3IFZlY3RvcjxTdHJpbmc+KCppdGVtLm1fcmVkaXJl Y3RVUkxzKSk7CisgICAgICAgIG1fcmVkaXJlY3RVUkxzID0gc3RkOjptYWtlX3VuaXF1ZTxWZWN0 b3I8U3RyaW5nPj4oKml0ZW0ubV9yZWRpcmVjdFVSTHMpOwogfQogCiBQYXNzUmVmUHRyPEhpc3Rv cnlJdGVtPiBIaXN0b3J5SXRlbTo6Y29weSgpIGNvbnN0CkBAIC0yMjIsNyArMjIyLDcgQEAgdm9p ZCBIaXN0b3J5SXRlbTo6cmVzZXQoKQogICAgIG1fZGFpbHlWaXNpdENvdW50cy5jbGVhcigpOwog ICAgIG1fd2Vla2x5VmlzaXRDb3VudHMuY2xlYXIoKTsKIAotICAgIG1fcmVkaXJlY3RVUkxzLmNs ZWFyKCk7CisgICAgbV9yZWRpcmVjdFVSTHMgPSBudWxscHRyOwogCiAgICAgbV9pdGVtU2VxdWVu Y2VOdW1iZXIgPSBnZW5lcmF0ZVNlcXVlbmNlTnVtYmVyKCk7CiAKQEAgLTY4NCw3ICs2ODQsNyBA QCB2b2lkIEhpc3RvcnlJdGVtOjptZXJnZUF1dG9Db21wbGV0ZUhpbnRzKEhpc3RvcnlJdGVtKiBv dGhlckl0ZW0pCiB2b2lkIEhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTChjb25zdCBTdHJpbmcm IHVybCkKIHsKICAgICBpZiAoIW1fcmVkaXJlY3RVUkxzKQotICAgICAgICBtX3JlZGlyZWN0VVJM cyA9IGFkb3B0UHRyKG5ldyBWZWN0b3I8U3RyaW5nPik7CisgICAgICAgIG1fcmVkaXJlY3RVUkxz ID0gc3RkOjptYWtlX3VuaXF1ZTxWZWN0b3I8U3RyaW5nPj4oKTsKIAogICAgIC8vIE91ciBBUEkg YWxsb3dzIHVzIHRvIHN0b3JlIGFsbCB0aGUgVVJMcyBpbiB0aGUgcmVkaXJlY3QgY2hhaW4sIGJ1 dCBmb3IKICAgICAvLyBub3cgd2Ugb25seSBoYXZlIGEgdXNlIGZvciB0aGUgZmluYWwgVVJMLgpA QCAtNjk3LDkgKzY5Nyw5IEBAIFZlY3RvcjxTdHJpbmc+KiBIaXN0b3J5SXRlbTo6cmVkaXJlY3RV UkxzKCkgY29uc3QKICAgICByZXR1cm4gbV9yZWRpcmVjdFVSTHMuZ2V0KCk7CiB9CiAKLXZvaWQg SGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcyhQYXNzT3duUHRyPFZlY3RvcjxTdHJpbmc+PiBy ZWRpcmVjdFVSTHMpCit2b2lkIEhpc3RvcnlJdGVtOjpzZXRSZWRpcmVjdFVSTHMoc3RkOjp1bmlx dWVfcHRyPFZlY3RvcjxTdHJpbmc+PiByZWRpcmVjdFVSTHMpCiB7Ci0gICAgbV9yZWRpcmVjdFVS THMgPSByZWRpcmVjdFVSTHM7CisgICAgbV9yZWRpcmVjdFVSTHMgPSBzdGQ6Om1vdmUocmVkaXJl Y3RVUkxzKTsKIH0KIAogdm9pZCBIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRUcmVlKEVu Y29kZXImIGVuY29kZXIpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5 L0hpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKaW5k ZXggNTFmYzBkMWQyMjZkZDg4OTQ2ZjY4MTE1NmExMjE2MDNjOTY2ZjQyMC4uYTZkYTZiZmRlOWNl NjBjMDZiMWRlMDQ2MTgyOTcyNjNmYjQwZWI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9IaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9y eUl0ZW0uaApAQCAtMjksOCArMjksNyBAQAogCiAjaW5jbHVkZSAiSW50UG9pbnQuaCIKICNpbmNs dWRlICJTZXJpYWxpemVkU2NyaXB0VmFsdWUuaCIKLSNpbmNsdWRlIDx3dGYvT3duUHRyLmg+Ci0j aW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8 d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAt MTgxLDcgKzE4MCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkUmVkaXJlY3RVUkwoY29uc3Qg U3RyaW5nJik7CiAgICAgVmVjdG9yPFN0cmluZz4qIHJlZGlyZWN0VVJMcygpIGNvbnN0OwotICAg IHZvaWQgc2V0UmVkaXJlY3RVUkxzKFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4+KTsKKyAgICB2 b2lkIHNldFJlZGlyZWN0VVJMcyhzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPFN0cmluZz4+KTsKIAog ICAgIGJvb2wgaXNDdXJyZW50RG9jdW1lbnQoRG9jdW1lbnQqKSBjb25zdDsKICAgICAKQEAgLTI2 NCw3ICsyNjMsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxpbnQ+IG1fZGFpbHlWaXNpdENvdW50 czsKICAgICBWZWN0b3I8aW50PiBtX3dlZWtseVZpc2l0Q291bnRzOwogCi0gICAgT3duUHRyPFZl Y3RvcjxTdHJpbmc+PiBtX3JlZGlyZWN0VVJMczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9y PFN0cmluZz4+IG1fcmVkaXJlY3RVUkxzOwogCiAgICAgLy8gSWYgdHdvIEhpc3RvcnlJdGVtcyBo YXZlIHRoZSBzYW1lIGl0ZW0gc2VxdWVuY2UgbnVtYmVyLCB0aGVuIHRoZXkgYXJlCiAgICAgLy8g Y2xvbmVzIG9mIG9uZSBhbm90aGVyLiAgVHJhdmVyc2luZyBoaXN0b3J5IGZyb20gb25lIHN1Y2gg SGlzdG9yeUl0ZW0gdG8KQEAgLTMwMCw3ICsyOTksNyBAQCBwcml2YXRlOgogCiAjaWYgUExBVEZP Uk0oTUFDKQogICAgIFJldGFpblB0cjxpZD4gbV92aWV3U3RhdGU7Ci0gICAgT3duUHRyPEhhc2hN YXA8U3RyaW5nLCBSZXRhaW5QdHI8aWQ+Pj4gbV90cmFuc2llbnRQcm9wZXJ0aWVzOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxIYXNoTWFwPFN0cmluZywgUmV0YWluUHRyPGlkPj4+IG1fdHJhbnNpZW50 UHJvcGVydGllczsKICNlbmRpZgogfTsgLy9jbGFzcyBIaXN0b3J5SXRlbQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L21hYy9IaXN0b3J5SXRlbU1hYy5tbSBiL1NvdXJjZS9X ZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3RvcnlJdGVtTWFjLm1tCmluZGV4IGJhOTNmYmQwZTUzYWIy NmJkZmYxY2RlY2NlM2I0NGUxZDg0ZTIyMzMuLjc3ZGU1ZTZjNDNlY2RhZjRkNjU0YTViNTdmODk5 ZjkzYzE3ZWE4YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3Rv cnlJdGVtTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3RvcnlJdGVt TWFjLm1tCkBAIC01NSwxMSArNTUsMTEgQEAgdm9pZCBIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50 UHJvcGVydHkoY29uc3QgU3RyaW5nJiBrZXksIGlkIHZhbHVlKQogICAgICAgICBpZiAobV90cmFu c2llbnRQcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICBtX3RyYW5zaWVudFByb3BlcnRpZXMtPnJl bW92ZShrZXkpOwogICAgICAgICAgICAgaWYgKG1fdHJhbnNpZW50UHJvcGVydGllcy0+aXNFbXB0 eSgpKQotICAgICAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcy5jbGVhcigpOworICAg ICAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IG51bGxwdHI7CiAgICAgICAgIH0K ICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIW1fdHJhbnNpZW50UHJvcGVydGllcykKLSAgICAg ICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IGFkb3B0UHRyKG5ldyBIYXNoTWFwPFN0cmlu ZywgUmV0YWluUHRyPGlkPj4pOworICAgICAgICAgICAgbV90cmFuc2llbnRQcm9wZXJ0aWVzID0g c3RkOjptYWtlX3VuaXF1ZTxIYXNoTWFwPFN0cmluZywgUmV0YWluUHRyPGlkPj4+KCk7CiAgICAg ICAgIG1fdHJhbnNpZW50UHJvcGVydGllcy0+c2V0KGtleSwgdmFsdWUpOwogICAgIH0KIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1tCmluZGV4IGNmNDg4MDcy Nzc0OWM5MTE4YTM5YTVlMjliNjRmMGNlMGFjNGQyMTQuLjU4ZGU5ZWNjMzhjMjFhOWU4MmMyODI5 M2E1MDE3MjA0NGJlNGRlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rvcnkv V2ViSGlzdG9yeUl0ZW0ubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0 b3J5SXRlbS5tbQpAQCAtMzg4LDEwICszODgsMTAgQEAgV2ViSGlzdG9yeUl0ZW0gKmtpdChIaXN0 b3J5SXRlbSogaXRlbSkKIAogICAgIGlmIChOU0FycmF5ICpyZWRpcmVjdFVSTHMgPSBbZGljdCBf d2Via2l0X2FycmF5Rm9yS2V5OnJlZGlyZWN0VVJMc0tleV0pIHsKICAgICAgICAgTlNVSW50ZWdl ciBzaXplID0gW3JlZGlyZWN0VVJMcyBjb3VudF07Ci0gICAgICAgIE93blB0cjxWZWN0b3I8U3Ry aW5nPj4gcmVkaXJlY3RVUkxzVmVjdG9yID0gYWRvcHRQdHIobmV3IFZlY3RvcjxTdHJpbmc+KHNp emUpKTsKKyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFZlY3RvcjxTdHJpbmc+PiByZWRpcmVjdFVS THNWZWN0b3IgPSBzdGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxTdHJpbmc+PihzaXplKTsKICAgICAg ICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgc2l6ZTsgKytpKQogICAgICAgICAgICAgKCpy ZWRpcmVjdFVSTHNWZWN0b3IpW2ldID0gU3RyaW5nKFtyZWRpcmVjdFVSTHMgX3dlYmtpdF9zdHJp bmdBdEluZGV4OmldKTsKLSAgICAgICAgY29yZShfcHJpdmF0ZSktPnNldFJlZGlyZWN0VVJMcyhy ZWRpcmVjdFVSTHNWZWN0b3IucmVsZWFzZSgpKTsKKyAgICAgICAgY29yZShfcHJpdmF0ZSktPnNl dFJlZGlyZWN0VVJMcyhzdGQ6Om1vdmUocmVkaXJlY3RVUkxzVmVjdG9yKSk7CiAgICAgfQogCiAg ICAgTlNBcnJheSAqZGFpbHlDb3VudHMgPSBbZGljdCBfd2Via2l0X2FycmF5Rm9yS2V5OmRhaWx5 VmlzaXRDb3VudEtleV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5 SXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5SXRlbS5jcHAKaW5kZXggNDUw OGNlNDI2NGVlMmUzYTIxZDEyYmJiZWNiMWRkMjU3NzE3YzcxZC4uN2YxMTUwNmQxNjZjZjZkMDU2 Nzk3NTUzZjc2ZjM2OTZlMTA1NTk4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2Vi SGlzdG9yeUl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnlJdGVtLmNw cApAQCAtMTQwLDEwICsxNDAsMTAgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0 b3J5SXRlbTo6aW5pdEZyb21EaWN0aW9uYXJ5UmVwcmVzZW50YXRpb24odm9pZCoKICAgICAgICAg cmV0dXJuIEVfRkFJTDsKICAgICBib29sIGxhc3RWaXNpdFdhc0hUVFBOb25HZXQgPSBsYXN0Vmlz aXRXYXNIVFRQTm9uR2V0UmVmICYmIENGQm9vbGVhbkdldFZhbHVlKGxhc3RWaXNpdFdhc0hUVFBO b25HZXRSZWYpOwogCi0gICAgT3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gcmVkaXJlY3RVUkxzVmVj dG9yOworICAgIHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4gcmVkaXJlY3RVUkxzVmVj dG9yOwogICAgIGlmIChDRkFycmF5UmVmIHJlZGlyZWN0VVJMc1JlZiA9IHN0YXRpY19jYXN0PENG QXJyYXlSZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKGRpY3Rpb25hcnlSZWYsIHJlZGlyZWN0VVJM c0tleSkpKSB7CiAgICAgICAgIENGSW5kZXggc2l6ZSA9IENGQXJyYXlHZXRDb3VudChyZWRpcmVj dFVSTHNSZWYpOwotICAgICAgICByZWRpcmVjdFVSTHNWZWN0b3IgPSBhZG9wdFB0cihuZXcgVmVj dG9yPFN0cmluZz4oc2l6ZSkpOworICAgICAgICByZWRpcmVjdFVSTHNWZWN0b3IgPSBzdGQ6Om1h a2VfdW5pcXVlPFZlY3RvcjxTdHJpbmc+PihzaXplKTsKICAgICAgICAgZm9yIChDRkluZGV4IGkg PSAwOyBpIDwgc2l6ZTsgKytpKQogICAgICAgICAgICAgKCpyZWRpcmVjdFVSTHNWZWN0b3IpW2ld ID0gU3RyaW5nKHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4 KHJlZGlyZWN0VVJMc1JlZiwgaSkpKTsKICAgICB9CkBAIC0xOTAsOCArMTkwLDggQEAgSFJFU1VM VCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0b3J5SXRlbTo6aW5pdEZyb21EaWN0aW9uYXJ5UmVw cmVzZW50YXRpb24odm9pZCoKICAgICBpZiAobGFzdFZpc2l0V2FzSFRUUE5vbkdldCAmJiAocHJv dG9jb2xJcyhtX2hpc3RvcnlJdGVtLT51cmxTdHJpbmcoKSwgImh0dHAiKSB8fCBwcm90b2NvbElz KG1faGlzdG9yeUl0ZW0tPnVybFN0cmluZygpLCAiaHR0cHMiKSkpCiAgICAgICAgIG1faGlzdG9y eUl0ZW0tPnNldExhc3RWaXNpdFdhc0hUVFBOb25HZXQodHJ1ZSk7CiAKLSAgICBpZiAocmVkaXJl Y3RVUkxzVmVjdG9yKQotICAgICAgICBtX2hpc3RvcnlJdGVtLT5zZXRSZWRpcmVjdFVSTHMocmVk aXJlY3RVUkxzVmVjdG9yLnJlbGVhc2UoKSk7CisgICAgaWYgKHJlZGlyZWN0VVJMc1ZlY3Rvci5n ZXQoKSkKKyAgICAgICAgbV9oaXN0b3J5SXRlbS0+c2V0UmVkaXJlY3RVUkxzKHN0ZDo6bW92ZShy ZWRpcmVjdFVSTHNWZWN0b3IpKTsKIAogICAgIGlmIChkYWlseVZlY3Rvci5nZXQoKSkKICAgICAg ICAgbV9oaXN0b3J5SXRlbS0+YWRvcHRWaXNpdENvdW50cygqZGFpbHlWZWN0b3IsICp3ZWVrbHlW ZWN0b3IpOwo= 222003 2014-01-23 11:01:37 -0800 2014-01-23 13:16:52 -0800 Patch bug-127275-20140123110137.patch text/plain 10365 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNjZjM4OTQ0NTgxMTRi OTc0ZjkwMzg2ODUzMzU5ZjY3YmEzNzg2My4uYzRmODljNmU3ZGQ3NTllMGViYzg5YmNkNjA2ZTMx YzA4OTA5ODhjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAxLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3ZlIEhpc3RvcnlJ dGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgdXNlcyBvZiBPd25QdHIgYW5kIFBhc3NPd25QdHIg aW4gdGhlIEhpc3RvcnlJdGVtIGNsYXNzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAg ICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRl bTo6SGlzdG9yeUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTCk6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkp OgorICAgICAgICBXZWJDb3JlLmV4cC5pbjogUmVtb3ZlIHRoZSBvdXRkYXRlZCBzeW1ib2wuCisK IDIwMTQtMDEtMjIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgU3Vycm91bmQgZml4ZWRWaXNpYmxlQ29udGVudFJlY3QgY29kZSB3aXRoIFVTRShUSUxF RF9CQUNLSU5HX1NUT1JFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDc0YjE1MGYwYmI3Y2QxYmZiMzZh MWNiODZkZGI3ZDk3YTBhMTg3OTIuLmU3Yzc3ZGM4OWU5YTA5NzhkMWNlNjcyZTZmYzU1OWU0OWI0 MjdmMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0wMS0yMyAgWmFu IERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBIaXN0b3J5 SXRlbSB0byBzdGQ6OnVuaXF1ZV9wdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyNzI3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbTogVGhlIFZlY3RvciBv YmplY3QgdGhhdCdzIHBhc3NlZCB0byBIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzCisgICAg ICAgIHNob3VsZCBub3cgYmUgaGFuZGxlZCBieSBzdGQ6OnVuaXF1ZV9wdHIgYW5kIHBhc3NlZCBv biB0aHJvdWdoIG1vdmUgc2VtYW50aWNzLgorICAgICAgICAoLVtXZWJIaXN0b3J5SXRlbSBpbml0 RnJvbURpY3Rpb25hcnlSZXByZXNlbnRhdGlvbjpdKToKKwogMjAxNC0wMS0yMiAgTXlsZXMgQy4g TWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBDU1MzX1RF WFRfREVDT1JBVElPTiBkZWZpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCA5NmU0NTlhYjQyYzc4YTFh NThhOGExYjQ5YmRhNzlkYTYyZWE3OGYxLi43Nzk0ODgxMGRiOTdkOTk3ZDhhYzc3MDdhOGIyZDk2 Y2ExY2ZjMDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDEtMjMg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgSGlz dG9yeUl0ZW0gdG8gc3RkOjp1bmlxdWVfcHRyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYkhpc3RvcnlJdGVtLmNwcDogVGhlIFZlY3RvciBvYmpl Y3QgdGhhdCdzIHBhc3NlZCB0byBIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzCisgICAgICAg IHNob3VsZCBub3cgYmUgaGFuZGxlZCBieSBzdGQ6OnVuaXF1ZV9wdHIgYW5kIHBhc3NlZCBvbiB0 aHJvdWdoIG1vdmUgc2VtYW50aWNzLgorICAgICAgICAoV2ViSGlzdG9yeUl0ZW06OmluaXRGcm9t RGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKToKKwogMjAxNC0wMS0yMSAgcGVhdm9Ab3V0bG9vay5j b20gIDxwZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dW0N1cmxdIERvd25s b2FkIHJlcXVlc3QgaGFzIGluY29ycmVjdCB1c2VyIGFnZW50IHN0cmluZy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KaW5kZXggODg0ZmQyZjNiOGVjYTE5ZmJiNmZiOGY3YTc0MDdhZWFmN2E0NDY3MS4uMzlh MGIxY2Q1YWZhMTRkOGFjYWVkNjdkYTE1NDgyZDlkZTliYTc4YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KQEAgLTE1MCw3ICsxNTAsNiBAQCBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTNzZXRWaXNp dENvdW50RWkKIF9fWk43V2ViQ29yZTExSGlzdG9yeUl0ZW0xNGFkZFJlZGlyZWN0VVJMRVJLTjNX VEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbTE0c2V0U2Nyb2xsUG9pbnRFUktO U184SW50UG9pbnRFCiBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTVzZXRJc1RhcmdldEl0ZW1F YgotX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbTE1c2V0UmVkaXJlY3RVUkxzRU4zV1RGMTBQYXNz T3duUHRySU5TMV82VmVjdG9ySU5TMV82U3RyaW5nRUxtMEVOUzFfMTVDcmFzaE9uT3ZlcmZsb3dF RUVFRQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbTE2YWRvcHRWaXNpdENvdW50c0VSTjNXVEY2 VmVjdG9ySWlMbTBFTlMxXzE1Q3Jhc2hPbk92ZXJmbG93RUVFUzVfCiBfX1pON1dlYkNvcmUxMUhp c3RvcnlJdGVtMTZzZXREb2N1bWVudFN0YXRlRVJLTjNXVEY2VmVjdG9ySU5TMV82U3RyaW5nRUxt MEVOUzFfMTVDcmFzaE9uT3ZlcmZsb3dFRUUKIF9fWk43V2ViQ29yZTExSGlzdG9yeUl0ZW0xN3Nl dEFsdGVybmF0ZVRpdGxlRVJLTjNXVEY2U3RyaW5nRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3Rv cnlJdGVtLmNwcAppbmRleCAwZTE3NzM5MTgyNmM5NzMxNzI5NjQyNDEwNmMwNGZjMDg1OThkNmM5 Li41YjQ3MDAyN2MyYjVlYTZjZGMwYTlkOGVlODk0NTZmODJjYWFkNmNlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcApAQCAtMTkzLDcgKzE5Myw3IEBAIGlubGluZSBIaXN0 b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgSGlzdG9yeUl0ZW0mIGl0ZW0pCiAgICAgICAgIG1f Y2hpbGRyZW4udW5jaGVja2VkQXBwZW5kKGl0ZW0ubV9jaGlsZHJlbltpXS0+Y29weSgpKTsKIAog ICAgIGlmIChpdGVtLm1fcmVkaXJlY3RVUkxzKQotICAgICAgICBtX3JlZGlyZWN0VVJMcyA9IGFk b3B0UHRyKG5ldyBWZWN0b3I8U3RyaW5nPigqaXRlbS5tX3JlZGlyZWN0VVJMcykpOworICAgICAg ICBtX3JlZGlyZWN0VVJMcyA9IHN0ZDo6bWFrZV91bmlxdWU8VmVjdG9yPFN0cmluZz4+KCppdGVt Lm1fcmVkaXJlY3RVUkxzKTsKIH0KIAogUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gSGlzdG9yeUl0 ZW06OmNvcHkoKSBjb25zdApAQCAtMjIyLDcgKzIyMiw3IEBAIHZvaWQgSGlzdG9yeUl0ZW06OnJl c2V0KCkKICAgICBtX2RhaWx5VmlzaXRDb3VudHMuY2xlYXIoKTsKICAgICBtX3dlZWtseVZpc2l0 Q291bnRzLmNsZWFyKCk7CiAKLSAgICBtX3JlZGlyZWN0VVJMcy5jbGVhcigpOworICAgIG1fcmVk aXJlY3RVUkxzID0gbnVsbHB0cjsKIAogICAgIG1faXRlbVNlcXVlbmNlTnVtYmVyID0gZ2VuZXJh dGVTZXF1ZW5jZU51bWJlcigpOwogCkBAIC02ODQsNyArNjg0LDcgQEAgdm9pZCBIaXN0b3J5SXRl bTo6bWVyZ2VBdXRvQ29tcGxldGVIaW50cyhIaXN0b3J5SXRlbSogb3RoZXJJdGVtKQogdm9pZCBI aXN0b3J5SXRlbTo6YWRkUmVkaXJlY3RVUkwoY29uc3QgU3RyaW5nJiB1cmwpCiB7CiAgICAgaWYg KCFtX3JlZGlyZWN0VVJMcykKLSAgICAgICAgbV9yZWRpcmVjdFVSTHMgPSBhZG9wdFB0cihuZXcg VmVjdG9yPFN0cmluZz4pOworICAgICAgICBtX3JlZGlyZWN0VVJMcyA9IHN0ZDo6bWFrZV91bmlx dWU8VmVjdG9yPFN0cmluZz4+KCk7CiAKICAgICAvLyBPdXIgQVBJIGFsbG93cyB1cyB0byBzdG9y ZSBhbGwgdGhlIFVSTHMgaW4gdGhlIHJlZGlyZWN0IGNoYWluLCBidXQgZm9yCiAgICAgLy8gbm93 IHdlIG9ubHkgaGF2ZSBhIHVzZSBmb3IgdGhlIGZpbmFsIFVSTC4KQEAgLTY5Nyw5ICs2OTcsOSBA QCBWZWN0b3I8U3RyaW5nPiogSGlzdG9yeUl0ZW06OnJlZGlyZWN0VVJMcygpIGNvbnN0CiAgICAg cmV0dXJuIG1fcmVkaXJlY3RVUkxzLmdldCgpOwogfQogCi12b2lkIEhpc3RvcnlJdGVtOjpzZXRS ZWRpcmVjdFVSTHMoUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPj4gcmVkaXJlY3RVUkxzKQordm9p ZCBIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3Ry aW5nPj4gcmVkaXJlY3RVUkxzKQogewotICAgIG1fcmVkaXJlY3RVUkxzID0gcmVkaXJlY3RVUkxz OworICAgIG1fcmVkaXJlY3RVUkxzID0gc3RkOjptb3ZlKHJlZGlyZWN0VVJMcyk7CiB9CiAKIHZv aWQgSGlzdG9yeUl0ZW06OmVuY29kZUJhY2tGb3J3YXJkVHJlZShFbmNvZGVyJiBlbmNvZGVyKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oIGIv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCmluZGV4IDUxZmMwZDFkMjI2ZGQ4 ODk0NmY2ODExNTZhMTIxNjAzYzk2NmY0MjAuLmE2ZGE2YmZkZTljZTYwYzA2YjFkZTA0NjE4Mjk3 MjYzZmI0MGViNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0 ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKQEAgLTI5LDgg KzI5LDcgQEAKIAogI2luY2x1ZGUgIkludFBvaW50LmgiCiAjaW5jbHVkZSAiU2VyaWFsaXplZFNj cmlwdFZhbHVlLmgiCi0jaW5jbHVkZSA8d3RmL093blB0ci5oPgotI2luY2x1ZGUgPHd0Zi9QYXNz T3duUHRyLmg+CisjaW5jbHVkZSA8bWVtb3J5PgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTE4MSw3ICsxODAsNyBAQCBw dWJsaWM6CiAKICAgICB2b2lkIGFkZFJlZGlyZWN0VVJMKGNvbnN0IFN0cmluZyYpOwogICAgIFZl Y3RvcjxTdHJpbmc+KiByZWRpcmVjdFVSTHMoKSBjb25zdDsKLSAgICB2b2lkIHNldFJlZGlyZWN0 VVJMcyhQYXNzT3duUHRyPFZlY3RvcjxTdHJpbmc+Pik7CisgICAgdm9pZCBzZXRSZWRpcmVjdFVS THMoc3RkOjp1bmlxdWVfcHRyPFZlY3RvcjxTdHJpbmc+Pik7CiAKICAgICBib29sIGlzQ3VycmVu dERvY3VtZW50KERvY3VtZW50KikgY29uc3Q7CiAgICAgCkBAIC0yNjQsNyArMjYzLDcgQEAgcHJp dmF0ZToKICAgICBWZWN0b3I8aW50PiBtX2RhaWx5VmlzaXRDb3VudHM7CiAgICAgVmVjdG9yPGlu dD4gbV93ZWVrbHlWaXNpdENvdW50czsKIAotICAgIE93blB0cjxWZWN0b3I8U3RyaW5nPj4gbV9y ZWRpcmVjdFVSTHM7CisgICAgc3RkOjp1bmlxdWVfcHRyPFZlY3RvcjxTdHJpbmc+PiBtX3JlZGly ZWN0VVJMczsKIAogICAgIC8vIElmIHR3byBIaXN0b3J5SXRlbXMgaGF2ZSB0aGUgc2FtZSBpdGVt IHNlcXVlbmNlIG51bWJlciwgdGhlbiB0aGV5IGFyZQogICAgIC8vIGNsb25lcyBvZiBvbmUgYW5v dGhlci4gIFRyYXZlcnNpbmcgaGlzdG9yeSBmcm9tIG9uZSBzdWNoIEhpc3RvcnlJdGVtIHRvCkBA IC0zMDAsNyArMjk5LDcgQEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBSZXRh aW5QdHI8aWQ+IG1fdmlld1N0YXRlOwotICAgIE93blB0cjxIYXNoTWFwPFN0cmluZywgUmV0YWlu UHRyPGlkPj4+IG1fdHJhbnNpZW50UHJvcGVydGllczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8SGFz aE1hcDxTdHJpbmcsIFJldGFpblB0cjxpZD4+PiBtX3RyYW5zaWVudFByb3BlcnRpZXM7CiAjZW5k aWYKIH07IC8vY2xhc3MgSGlzdG9yeUl0ZW0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L21h Yy9IaXN0b3J5SXRlbU1hYy5tbQppbmRleCBiYTkzZmJkMGU1M2FiMjZiZGZmMWNkZWNjZTNiNDRl MWQ4NGUyMjMzLi43N2RlNWU2YzQzZWNkYWY0ZDY1NGE1YjU3Zjg5OWY5M2MxN2VhOGIyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L21hYy9IaXN0b3J5SXRlbU1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L21hYy9IaXN0b3J5SXRlbU1hYy5tbQpAQCAtNTUsMTEg KzU1LDExIEBAIHZvaWQgSGlzdG9yeUl0ZW06OnNldFRyYW5zaWVudFByb3BlcnR5KGNvbnN0IFN0 cmluZyYga2V5LCBpZCB2YWx1ZSkKICAgICAgICAgaWYgKG1fdHJhbnNpZW50UHJvcGVydGllcykg ewogICAgICAgICAgICAgbV90cmFuc2llbnRQcm9wZXJ0aWVzLT5yZW1vdmUoa2V5KTsKICAgICAg ICAgICAgIGlmIChtX3RyYW5zaWVudFByb3BlcnRpZXMtPmlzRW1wdHkoKSkKLSAgICAgICAgICAg ICAgICBtX3RyYW5zaWVudFByb3BlcnRpZXMuY2xlYXIoKTsKKyAgICAgICAgICAgICAgICBtX3Ry YW5zaWVudFByb3BlcnRpZXMgPSBudWxscHRyOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAg ICAgICAgaWYgKCFtX3RyYW5zaWVudFByb3BlcnRpZXMpCi0gICAgICAgICAgICBtX3RyYW5zaWVu dFByb3BlcnRpZXMgPSBhZG9wdFB0cihuZXcgSGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxpZD4+ KTsKKyAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IHN0ZDo6bWFrZV91bmlxdWU8 SGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxpZD4+PigpOwogICAgICAgICBtX3RyYW5zaWVudFBy b3BlcnRpZXMtPnNldChrZXksIHZhbHVlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1tIGIvU291cmNlL1dlYktpdC9tYWMv SGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQppbmRleCBjZjQ4ODA3Mjc3NDljOTExOGEzOWE1ZTI5 YjY0ZjBjZTBhYzRkMjE0Li41OGRlOWVjYzM4YzIxYTllODJjMjgyOTNhNTAxNzIwNDRiZTRkZTI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0KQEAgLTM4 OCwxMCArMzg4LDEwIEBAIFdlYkhpc3RvcnlJdGVtICpraXQoSGlzdG9yeUl0ZW0qIGl0ZW0pCiAK ICAgICBpZiAoTlNBcnJheSAqcmVkaXJlY3RVUkxzID0gW2RpY3QgX3dlYmtpdF9hcnJheUZvcktl eTpyZWRpcmVjdFVSTHNLZXldKSB7CiAgICAgICAgIE5TVUludGVnZXIgc2l6ZSA9IFtyZWRpcmVj dFVSTHMgY291bnRdOwotICAgICAgICBPd25QdHI8VmVjdG9yPFN0cmluZz4+IHJlZGlyZWN0VVJM c1ZlY3RvciA9IGFkb3B0UHRyKG5ldyBWZWN0b3I8U3RyaW5nPihzaXplKSk7CisgICAgICAgIHN0 ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4gcmVkaXJlY3RVUkxzVmVjdG9yID0gc3RkOjpt YWtlX3VuaXF1ZTxWZWN0b3I8U3RyaW5nPj4oc2l6ZSk7CiAgICAgICAgIGZvciAoTlNVSW50ZWdl ciBpID0gMDsgaSA8IHNpemU7ICsraSkKICAgICAgICAgICAgICgqcmVkaXJlY3RVUkxzVmVjdG9y KVtpXSA9IFN0cmluZyhbcmVkaXJlY3RVUkxzIF93ZWJraXRfc3RyaW5nQXRJbmRleDppXSk7Ci0g ICAgICAgIGNvcmUoX3ByaXZhdGUpLT5zZXRSZWRpcmVjdFVSTHMocmVkaXJlY3RVUkxzVmVjdG9y LnJlbGVhc2UoKSk7CisgICAgICAgIGNvcmUoX3ByaXZhdGUpLT5zZXRSZWRpcmVjdFVSTHMoc3Rk Ojptb3ZlKHJlZGlyZWN0VVJMc1ZlY3RvcikpOwogICAgIH0KIAogICAgIE5TQXJyYXkgKmRhaWx5 Q291bnRzID0gW2RpY3QgX3dlYmtpdF9hcnJheUZvcktleTpkYWlseVZpc2l0Q291bnRLZXldOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNl L1dlYktpdC93aW4vV2ViSGlzdG9yeUl0ZW0uY3BwCmluZGV4IDQ1MDhjZTQyNjRlZTJlM2EyMWQx MmJiYmVjYjFkZDI1NzcxN2M3MWQuLjdmMTE1MDZkMTY2Y2Y2ZDA1Njc5NzU1M2Y3NmYzNjk2ZTEw NTU5ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnlJdGVtLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5SXRlbS5jcHAKQEAgLTE0MCwxMCArMTQw LDEwIEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViSGlzdG9yeUl0ZW06OmluaXRGcm9t RGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKHZvaWQqCiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAg ICAgYm9vbCBsYXN0VmlzaXRXYXNIVFRQTm9uR2V0ID0gbGFzdFZpc2l0V2FzSFRUUE5vbkdldFJl ZiAmJiBDRkJvb2xlYW5HZXRWYWx1ZShsYXN0VmlzaXRXYXNIVFRQTm9uR2V0UmVmKTsKIAotICAg IE93blB0cjxWZWN0b3I8U3RyaW5nPiA+IHJlZGlyZWN0VVJMc1ZlY3RvcjsKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8VmVjdG9yPFN0cmluZz4+IHJlZGlyZWN0VVJMc1ZlY3RvcjsKICAgICBpZiAoQ0ZB cnJheVJlZiByZWRpcmVjdFVSTHNSZWYgPSBzdGF0aWNfY2FzdDxDRkFycmF5UmVmPihDRkRpY3Rp b25hcnlHZXRWYWx1ZShkaWN0aW9uYXJ5UmVmLCByZWRpcmVjdFVSTHNLZXkpKSkgewogICAgICAg ICBDRkluZGV4IHNpemUgPSBDRkFycmF5R2V0Q291bnQocmVkaXJlY3RVUkxzUmVmKTsKLSAgICAg ICAgcmVkaXJlY3RVUkxzVmVjdG9yID0gYWRvcHRQdHIobmV3IFZlY3RvcjxTdHJpbmc+KHNpemUp KTsKKyAgICAgICAgcmVkaXJlY3RVUkxzVmVjdG9yID0gc3RkOjptYWtlX3VuaXF1ZTxWZWN0b3I8 U3RyaW5nPj4oc2l6ZSk7CiAgICAgICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IHNpemU7ICsr aSkKICAgICAgICAgICAgICgqcmVkaXJlY3RVUkxzVmVjdG9yKVtpXSA9IFN0cmluZyhzdGF0aWNf Y2FzdDxDRlN0cmluZ1JlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChyZWRpcmVjdFVSTHNSZWYs IGkpKSk7CiAgICAgfQpAQCAtMTkwLDggKzE5MCw4IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgV2ViSGlzdG9yeUl0ZW06OmluaXRGcm9tRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uKHZvaWQq CiAgICAgaWYgKGxhc3RWaXNpdFdhc0hUVFBOb25HZXQgJiYgKHByb3RvY29sSXMobV9oaXN0b3J5 SXRlbS0+dXJsU3RyaW5nKCksICJodHRwIikgfHwgcHJvdG9jb2xJcyhtX2hpc3RvcnlJdGVtLT51 cmxTdHJpbmcoKSwgImh0dHBzIikpKQogICAgICAgICBtX2hpc3RvcnlJdGVtLT5zZXRMYXN0Vmlz aXRXYXNIVFRQTm9uR2V0KHRydWUpOwogCi0gICAgaWYgKHJlZGlyZWN0VVJMc1ZlY3RvcikKLSAg ICAgICAgbV9oaXN0b3J5SXRlbS0+c2V0UmVkaXJlY3RVUkxzKHJlZGlyZWN0VVJMc1ZlY3Rvci5y ZWxlYXNlKCkpOworICAgIGlmIChyZWRpcmVjdFVSTHNWZWN0b3IuZ2V0KCkpCisgICAgICAgIG1f aGlzdG9yeUl0ZW0tPnNldFJlZGlyZWN0VVJMcyhzdGQ6Om1vdmUocmVkaXJlY3RVUkxzVmVjdG9y KSk7CiAKICAgICBpZiAoZGFpbHlWZWN0b3IuZ2V0KCkpCiAgICAgICAgIG1faGlzdG9yeUl0ZW0t PmFkb3B0VmlzaXRDb3VudHMoKmRhaWx5VmVjdG9yLCAqd2Vla2x5VmVjdG9yKTsK 222021 2014-01-23 13:16:58 -0800 2014-01-24 01:28:16 -0800 Patch bug-127275-20140123131658.patch text/plain 10502 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNjZjM4OTQ0NTgxMTRi OTc0ZjkwMzg2ODUzMzU5ZjY3YmEzNzg2My4uYjYxMDdlM2Q5ZDYwYjg4NWFlN2U1ODIzMjU0MGM4 NWRlMTBmZTAzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAxLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBNb3ZlIEhpc3RvcnlJ dGVtIHRvIHN0ZDo6dW5pcXVlX3B0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgdXNlcyBvZiBPd25QdHIgYW5kIFBhc3NPd25QdHIg aW4gdGhlIEhpc3RvcnlJdGVtIGNsYXNzIHdpdGggc3RkOjp1bmlxdWVfcHRyLgorCisgICAgICAg ICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRl bTo6SGlzdG9yeUl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTCk6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzKToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgICogaGlzdG9yeS9tYWMvSGlzdG9yeUl0ZW1NYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0VHJhbnNpZW50UHJvcGVydHkp OgorICAgICAgICBXZWJDb3JlLmV4cC5pbjogVXBkYXRlIHRoZSBzeW1ib2wuCisKIDIwMTQtMDEt MjIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3Vy cm91bmQgZml4ZWRWaXNpYmxlQ29udGVudFJlY3QgY29kZSB3aXRoIFVTRShUSUxFRF9CQUNLSU5H X1NUT1JFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDc0YjE1MGYwYmI3Y2QxYmZiMzZhMWNiODZkZGI3 ZDk3YTBhMTg3OTIuLmU3Yzc3ZGM4OWU5YTA5NzhkMWNlNjcyZTZmYzU1OWU0OWI0MjdmMzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNC0wMS0yMyAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgTW92ZSBIaXN0b3J5SXRlbSB0byBz dGQ6OnVuaXF1ZV9wdHIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNzI3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbTogVGhlIFZlY3RvciBvYmplY3QgdGhh dCdzIHBhc3NlZCB0byBIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzCisgICAgICAgIHNob3Vs ZCBub3cgYmUgaGFuZGxlZCBieSBzdGQ6OnVuaXF1ZV9wdHIgYW5kIHBhc3NlZCBvbiB0aHJvdWdo IG1vdmUgc2VtYW50aWNzLgorICAgICAgICAoLVtXZWJIaXN0b3J5SXRlbSBpbml0RnJvbURpY3Rp b25hcnlSZXByZXNlbnRhdGlvbjpdKToKKwogMjAxNC0wMS0yMiAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBDU1MzX1RFWFRfREVDT1JB VElPTiBkZWZpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCA5NmU0NTlhYjQyYzc4YTFhNThhOGExYjQ5 YmRhNzlkYTYyZWE3OGYxLi43Nzk0ODgxMGRiOTdkOTk3ZDhhYzc3MDdhOGIyZDk2Y2ExY2ZjMDRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDEtMjMgIFphbiBEb2Jl cnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgSGlzdG9yeUl0ZW0g dG8gc3RkOjp1bmlxdWVfcHRyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjcyNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYkhpc3RvcnlJdGVtLmNwcDogVGhlIFZlY3RvciBvYmplY3QgdGhhdCdz IHBhc3NlZCB0byBIaXN0b3J5SXRlbTo6c2V0UmVkaXJlY3RVUkxzCisgICAgICAgIHNob3VsZCBu b3cgYmUgaGFuZGxlZCBieSBzdGQ6OnVuaXF1ZV9wdHIgYW5kIHBhc3NlZCBvbiB0aHJvdWdoIG1v dmUgc2VtYW50aWNzLgorICAgICAgICAoV2ViSGlzdG9yeUl0ZW06OmluaXRGcm9tRGljdGlvbmFy eVJlcHJlc2VudGF0aW9uKToKKwogMjAxNC0wMS0yMSAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2 b0BvdXRsb29rLmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dW0N1cmxdIERvd25sb2FkIHJlcXVl c3QgaGFzIGluY29ycmVjdCB1c2VyIGFnZW50IHN0cmluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5k ZXggODg0ZmQyZjNiOGVjYTE5ZmJiNmZiOGY3YTc0MDdhZWFmN2E0NDY3MS4uZDMzNDhjYTU0MDJl MWYzN2QxZDhjM2VjZTQ2MTc1MDc0Njk3YTBjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE1 MCw3ICsxNTAsNyBAQCBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTNzZXRWaXNpdENvdW50RWkK IF9fWk43V2ViQ29yZTExSGlzdG9yeUl0ZW0xNGFkZFJlZGlyZWN0VVJMRVJLTjNXVEY2U3RyaW5n RQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbTE0c2V0U2Nyb2xsUG9pbnRFUktOU184SW50UG9p bnRFCiBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTVzZXRJc1RhcmdldEl0ZW1FYgotX19aTjdX ZWJDb3JlMTFIaXN0b3J5SXRlbTE1c2V0UmVkaXJlY3RVUkxzRU4zV1RGMTBQYXNzT3duUHRySU5T MV82VmVjdG9ySU5TMV82U3RyaW5nRUxtMEVOUzFfMTVDcmFzaE9uT3ZlcmZsb3dFRUVFRQorX19a TjdXZWJDb3JlMTFIaXN0b3J5SXRlbTE1c2V0UmVkaXJlY3RVUkxzRU5TdDNfXzExMHVuaXF1ZV9w dHJJTjNXVEY2VmVjdG9ySU5TM182U3RyaW5nRUxtMEVOUzNfMTVDcmFzaE9uT3ZlcmZsb3dFRUVO UzFfMTRkZWZhdWx0X2RlbGV0ZUlTN19FRUVFCiBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTZh ZG9wdFZpc2l0Q291bnRzRVJOM1dURjZWZWN0b3JJaUxtMEVOUzFfMTVDcmFzaE9uT3ZlcmZsb3dF RUVTNV8KIF9fWk43V2ViQ29yZTExSGlzdG9yeUl0ZW0xNnNldERvY3VtZW50U3RhdGVFUktOM1dU RjZWZWN0b3JJTlMxXzZTdHJpbmdFTG0wRU5TMV8xNUNyYXNoT25PdmVyZmxvd0VFRQogX19aTjdX ZWJDb3JlMTFIaXN0b3J5SXRlbTE3c2V0QWx0ZXJuYXRlVGl0bGVFUktOM1dURjZTdHJpbmdFCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCmluZGV4IDBlMTc3MzkxODI2Yzk3MzE3 Mjk2NDI0MTA2YzA0ZmMwODU5OGQ2YzkuLjViNDcwMDI3YzJiNWVhNmNkYzBhOWQ4ZWU4OTQ1NmY4 MmNhYWQ2Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCkBAIC0xOTMs NyArMTkzLDcgQEAgaW5saW5lIEhpc3RvcnlJdGVtOjpIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5 SXRlbSYgaXRlbSkKICAgICAgICAgbV9jaGlsZHJlbi51bmNoZWNrZWRBcHBlbmQoaXRlbS5tX2No aWxkcmVuW2ldLT5jb3B5KCkpOwogCiAgICAgaWYgKGl0ZW0ubV9yZWRpcmVjdFVSTHMpCi0gICAg ICAgIG1fcmVkaXJlY3RVUkxzID0gYWRvcHRQdHIobmV3IFZlY3RvcjxTdHJpbmc+KCppdGVtLm1f cmVkaXJlY3RVUkxzKSk7CisgICAgICAgIG1fcmVkaXJlY3RVUkxzID0gc3RkOjptYWtlX3VuaXF1 ZTxWZWN0b3I8U3RyaW5nPj4oKml0ZW0ubV9yZWRpcmVjdFVSTHMpOwogfQogCiBQYXNzUmVmUHRy PEhpc3RvcnlJdGVtPiBIaXN0b3J5SXRlbTo6Y29weSgpIGNvbnN0CkBAIC0yMjIsNyArMjIyLDcg QEAgdm9pZCBIaXN0b3J5SXRlbTo6cmVzZXQoKQogICAgIG1fZGFpbHlWaXNpdENvdW50cy5jbGVh cigpOwogICAgIG1fd2Vla2x5VmlzaXRDb3VudHMuY2xlYXIoKTsKIAotICAgIG1fcmVkaXJlY3RV UkxzLmNsZWFyKCk7CisgICAgbV9yZWRpcmVjdFVSTHMgPSBudWxscHRyOwogCiAgICAgbV9pdGVt U2VxdWVuY2VOdW1iZXIgPSBnZW5lcmF0ZVNlcXVlbmNlTnVtYmVyKCk7CiAKQEAgLTY4NCw3ICs2 ODQsNyBAQCB2b2lkIEhpc3RvcnlJdGVtOjptZXJnZUF1dG9Db21wbGV0ZUhpbnRzKEhpc3RvcnlJ dGVtKiBvdGhlckl0ZW0pCiB2b2lkIEhpc3RvcnlJdGVtOjphZGRSZWRpcmVjdFVSTChjb25zdCBT dHJpbmcmIHVybCkKIHsKICAgICBpZiAoIW1fcmVkaXJlY3RVUkxzKQotICAgICAgICBtX3JlZGly ZWN0VVJMcyA9IGFkb3B0UHRyKG5ldyBWZWN0b3I8U3RyaW5nPik7CisgICAgICAgIG1fcmVkaXJl Y3RVUkxzID0gc3RkOjptYWtlX3VuaXF1ZTxWZWN0b3I8U3RyaW5nPj4oKTsKIAogICAgIC8vIE91 ciBBUEkgYWxsb3dzIHVzIHRvIHN0b3JlIGFsbCB0aGUgVVJMcyBpbiB0aGUgcmVkaXJlY3QgY2hh aW4sIGJ1dCBmb3IKICAgICAvLyBub3cgd2Ugb25seSBoYXZlIGEgdXNlIGZvciB0aGUgZmluYWwg VVJMLgpAQCAtNjk3LDkgKzY5Nyw5IEBAIFZlY3RvcjxTdHJpbmc+KiBIaXN0b3J5SXRlbTo6cmVk aXJlY3RVUkxzKCkgY29uc3QKICAgICByZXR1cm4gbV9yZWRpcmVjdFVSTHMuZ2V0KCk7CiB9CiAK LXZvaWQgSGlzdG9yeUl0ZW06OnNldFJlZGlyZWN0VVJMcyhQYXNzT3duUHRyPFZlY3RvcjxTdHJp bmc+PiByZWRpcmVjdFVSTHMpCit2b2lkIEhpc3RvcnlJdGVtOjpzZXRSZWRpcmVjdFVSTHMoc3Rk Ojp1bmlxdWVfcHRyPFZlY3RvcjxTdHJpbmc+PiByZWRpcmVjdFVSTHMpCiB7Ci0gICAgbV9yZWRp cmVjdFVSTHMgPSByZWRpcmVjdFVSTHM7CisgICAgbV9yZWRpcmVjdFVSTHMgPSBzdGQ6Om1vdmUo cmVkaXJlY3RVUkxzKTsKIH0KIAogdm9pZCBIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRU cmVlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0hpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVt LmgKaW5kZXggNTFmYzBkMWQyMjZkZDg4OTQ2ZjY4MTE1NmExMjE2MDNjOTY2ZjQyMC4uYTZkYTZi ZmRlOWNlNjBjMDZiMWRlMDQ2MTgyOTcyNjNmYjQwZWI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv SGlzdG9yeUl0ZW0uaApAQCAtMjksOCArMjksNyBAQAogCiAjaW5jbHVkZSAiSW50UG9pbnQuaCIK ICNpbmNsdWRlICJTZXJpYWxpemVkU2NyaXB0VmFsdWUuaCIKLSNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+Ci0jaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDxtZW1vcnk+CiAjaW5j bHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IApAQCAtMTgxLDcgKzE4MCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgYWRkUmVkaXJlY3RVUkwo Y29uc3QgU3RyaW5nJik7CiAgICAgVmVjdG9yPFN0cmluZz4qIHJlZGlyZWN0VVJMcygpIGNvbnN0 OwotICAgIHZvaWQgc2V0UmVkaXJlY3RVUkxzKFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4+KTsK KyAgICB2b2lkIHNldFJlZGlyZWN0VVJMcyhzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPFN0cmluZz4+ KTsKIAogICAgIGJvb2wgaXNDdXJyZW50RG9jdW1lbnQoRG9jdW1lbnQqKSBjb25zdDsKICAgICAK QEAgLTI2NCw3ICsyNjMsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxpbnQ+IG1fZGFpbHlWaXNp dENvdW50czsKICAgICBWZWN0b3I8aW50PiBtX3dlZWtseVZpc2l0Q291bnRzOwogCi0gICAgT3du UHRyPFZlY3RvcjxTdHJpbmc+PiBtX3JlZGlyZWN0VVJMczsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 VmVjdG9yPFN0cmluZz4+IG1fcmVkaXJlY3RVUkxzOwogCiAgICAgLy8gSWYgdHdvIEhpc3RvcnlJ dGVtcyBoYXZlIHRoZSBzYW1lIGl0ZW0gc2VxdWVuY2UgbnVtYmVyLCB0aGVuIHRoZXkgYXJlCiAg ICAgLy8gY2xvbmVzIG9mIG9uZSBhbm90aGVyLiAgVHJhdmVyc2luZyBoaXN0b3J5IGZyb20gb25l IHN1Y2ggSGlzdG9yeUl0ZW0gdG8KQEAgLTMwMCw3ICsyOTksNyBAQCBwcml2YXRlOgogCiAjaWYg UExBVEZPUk0oTUFDKQogICAgIFJldGFpblB0cjxpZD4gbV92aWV3U3RhdGU7Ci0gICAgT3duUHRy PEhhc2hNYXA8U3RyaW5nLCBSZXRhaW5QdHI8aWQ+Pj4gbV90cmFuc2llbnRQcm9wZXJ0aWVzOwor ICAgIHN0ZDo6dW5pcXVlX3B0cjxIYXNoTWFwPFN0cmluZywgUmV0YWluUHRyPGlkPj4+IG1fdHJh bnNpZW50UHJvcGVydGllczsKICNlbmRpZgogfTsgLy9jbGFzcyBIaXN0b3J5SXRlbQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L21hYy9IaXN0b3J5SXRlbU1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3RvcnlJdGVtTWFjLm1tCmluZGV4IGJhOTNmYmQw ZTUzYWIyNmJkZmYxY2RlY2NlM2I0NGUxZDg0ZTIyMzMuLjc3ZGU1ZTZjNDNlY2RhZjRkNjU0YTVi NTdmODk5ZjkzYzE3ZWE4YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFj L0hpc3RvcnlJdGVtTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvbWFjL0hpc3Rv cnlJdGVtTWFjLm1tCkBAIC01NSwxMSArNTUsMTEgQEAgdm9pZCBIaXN0b3J5SXRlbTo6c2V0VHJh bnNpZW50UHJvcGVydHkoY29uc3QgU3RyaW5nJiBrZXksIGlkIHZhbHVlKQogICAgICAgICBpZiAo bV90cmFuc2llbnRQcm9wZXJ0aWVzKSB7CiAgICAgICAgICAgICBtX3RyYW5zaWVudFByb3BlcnRp ZXMtPnJlbW92ZShrZXkpOwogICAgICAgICAgICAgaWYgKG1fdHJhbnNpZW50UHJvcGVydGllcy0+ aXNFbXB0eSgpKQotICAgICAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcy5jbGVhcigp OworICAgICAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IG51bGxwdHI7CiAgICAg ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIW1fdHJhbnNpZW50UHJvcGVydGllcykK LSAgICAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcyA9IGFkb3B0UHRyKG5ldyBIYXNoTWFw PFN0cmluZywgUmV0YWluUHRyPGlkPj4pOworICAgICAgICAgICAgbV90cmFuc2llbnRQcm9wZXJ0 aWVzID0gc3RkOjptYWtlX3VuaXF1ZTxIYXNoTWFwPFN0cmluZywgUmV0YWluUHRyPGlkPj4+KCk7 CiAgICAgICAgIG1fdHJhbnNpZW50UHJvcGVydGllcy0+c2V0KGtleSwgdmFsdWUpOwogICAgIH0K IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0u bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1tCmluZGV4IGNm NDg4MDcyNzc0OWM5MTE4YTM5YTVlMjliNjRmMGNlMGFjNGQyMTQuLjU4ZGU5ZWNjMzhjMjFhOWU4 MmMyODI5M2E1MDE3MjA0NGJlNGRlMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hp c3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9X ZWJIaXN0b3J5SXRlbS5tbQpAQCAtMzg4LDEwICszODgsMTAgQEAgV2ViSGlzdG9yeUl0ZW0gKmtp dChIaXN0b3J5SXRlbSogaXRlbSkKIAogICAgIGlmIChOU0FycmF5ICpyZWRpcmVjdFVSTHMgPSBb ZGljdCBfd2Via2l0X2FycmF5Rm9yS2V5OnJlZGlyZWN0VVJMc0tleV0pIHsKICAgICAgICAgTlNV SW50ZWdlciBzaXplID0gW3JlZGlyZWN0VVJMcyBjb3VudF07Ci0gICAgICAgIE93blB0cjxWZWN0 b3I8U3RyaW5nPj4gcmVkaXJlY3RVUkxzVmVjdG9yID0gYWRvcHRQdHIobmV3IFZlY3RvcjxTdHJp bmc+KHNpemUpKTsKKyAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFZlY3RvcjxTdHJpbmc+PiByZWRp cmVjdFVSTHNWZWN0b3IgPSBzdGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxTdHJpbmc+PihzaXplKTsK ICAgICAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgc2l6ZTsgKytpKQogICAgICAgICAg ICAgKCpyZWRpcmVjdFVSTHNWZWN0b3IpW2ldID0gU3RyaW5nKFtyZWRpcmVjdFVSTHMgX3dlYmtp dF9zdHJpbmdBdEluZGV4OmldKTsKLSAgICAgICAgY29yZShfcHJpdmF0ZSktPnNldFJlZGlyZWN0 VVJMcyhyZWRpcmVjdFVSTHNWZWN0b3IucmVsZWFzZSgpKTsKKyAgICAgICAgY29yZShfcHJpdmF0 ZSktPnNldFJlZGlyZWN0VVJMcyhzdGQ6Om1vdmUocmVkaXJlY3RVUkxzVmVjdG9yKSk7CiAgICAg fQogCiAgICAgTlNBcnJheSAqZGFpbHlDb3VudHMgPSBbZGljdCBfd2Via2l0X2FycmF5Rm9yS2V5 OmRhaWx5VmlzaXRDb3VudEtleV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJI aXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJIaXN0b3J5SXRlbS5jcHAKaW5k ZXggNDUwOGNlNDI2NGVlMmUzYTIxZDEyYmJiZWNiMWRkMjU3NzE3YzcxZC4uN2YxMTUwNmQxNjZj ZjZkMDU2Nzk3NTUzZjc2ZjM2OTZlMTA1NTk4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93 aW4vV2ViSGlzdG9yeUl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnlJ dGVtLmNwcApAQCAtMTQwLDEwICsxNDAsMTAgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBX ZWJIaXN0b3J5SXRlbTo6aW5pdEZyb21EaWN0aW9uYXJ5UmVwcmVzZW50YXRpb24odm9pZCoKICAg ICAgICAgcmV0dXJuIEVfRkFJTDsKICAgICBib29sIGxhc3RWaXNpdFdhc0hUVFBOb25HZXQgPSBs YXN0VmlzaXRXYXNIVFRQTm9uR2V0UmVmICYmIENGQm9vbGVhbkdldFZhbHVlKGxhc3RWaXNpdFdh c0hUVFBOb25HZXRSZWYpOwogCi0gICAgT3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gcmVkaXJlY3RV UkxzVmVjdG9yOworICAgIHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4gcmVkaXJlY3RV UkxzVmVjdG9yOwogICAgIGlmIChDRkFycmF5UmVmIHJlZGlyZWN0VVJMc1JlZiA9IHN0YXRpY19j YXN0PENGQXJyYXlSZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKGRpY3Rpb25hcnlSZWYsIHJlZGly ZWN0VVJMc0tleSkpKSB7CiAgICAgICAgIENGSW5kZXggc2l6ZSA9IENGQXJyYXlHZXRDb3VudChy ZWRpcmVjdFVSTHNSZWYpOwotICAgICAgICByZWRpcmVjdFVSTHNWZWN0b3IgPSBhZG9wdFB0cihu ZXcgVmVjdG9yPFN0cmluZz4oc2l6ZSkpOworICAgICAgICByZWRpcmVjdFVSTHNWZWN0b3IgPSBz dGQ6Om1ha2VfdW5pcXVlPFZlY3RvcjxTdHJpbmc+PihzaXplKTsKICAgICAgICAgZm9yIChDRklu ZGV4IGkgPSAwOyBpIDwgc2l6ZTsgKytpKQogICAgICAgICAgICAgKCpyZWRpcmVjdFVSTHNWZWN0 b3IpW2ldID0gU3RyaW5nKHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihDRkFycmF5R2V0VmFsdWVB dEluZGV4KHJlZGlyZWN0VVJMc1JlZiwgaSkpKTsKICAgICB9CkBAIC0xOTAsOCArMTkwLDggQEAg SFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0b3J5SXRlbTo6aW5pdEZyb21EaWN0aW9u YXJ5UmVwcmVzZW50YXRpb24odm9pZCoKICAgICBpZiAobGFzdFZpc2l0V2FzSFRUUE5vbkdldCAm JiAocHJvdG9jb2xJcyhtX2hpc3RvcnlJdGVtLT51cmxTdHJpbmcoKSwgImh0dHAiKSB8fCBwcm90 b2NvbElzKG1faGlzdG9yeUl0ZW0tPnVybFN0cmluZygpLCAiaHR0cHMiKSkpCiAgICAgICAgIG1f aGlzdG9yeUl0ZW0tPnNldExhc3RWaXNpdFdhc0hUVFBOb25HZXQodHJ1ZSk7CiAKLSAgICBpZiAo cmVkaXJlY3RVUkxzVmVjdG9yKQotICAgICAgICBtX2hpc3RvcnlJdGVtLT5zZXRSZWRpcmVjdFVS THMocmVkaXJlY3RVUkxzVmVjdG9yLnJlbGVhc2UoKSk7CisgICAgaWYgKHJlZGlyZWN0VVJMc1Zl Y3Rvci5nZXQoKSkKKyAgICAgICAgbV9oaXN0b3J5SXRlbS0+c2V0UmVkaXJlY3RVUkxzKHN0ZDo6 bW92ZShyZWRpcmVjdFVSTHNWZWN0b3IpKTsKIAogICAgIGlmIChkYWlseVZlY3Rvci5nZXQoKSkK ICAgICAgICAgbV9oaXN0b3J5SXRlbS0+YWRvcHRWaXNpdENvdW50cygqZGFpbHlWZWN0b3IsICp3 ZWVrbHlWZWN0b3IpOwo=