141069 2015-01-29 22:34:52 -0800 Optimize MemoryCache::getSessionMap() a bit 2015-01-30 17:39:32 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141091 1 cdumez cdumez ap benjamin commit-queue darin japhet kling koivisto mhock oldest_to_newest 1065498 0 cdumez 2015-01-29 22:34:52 -0800 Optimize MemoryCache::getSessionMap() a bit 1065499 1 245696 cdumez 2015-01-29 22:38:06 -0800 Created attachment 245696 Patch 1065566 2 245696 andersca 2015-01-30 07:19:11 -0800 Comment on attachment 245696 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245696&action=review > Source/WebCore/loader/cache/MemoryCache.cpp:80 > + std::unique_ptr<CachedResourceMap>& map = m_sessionResources.add(sessionID, nullptr).iterator->value; auto& map = > Source/WebCore/loader/cache/MemoryCache.h:187 > - CachedResourceMap& getSessionMap(SessionID); > + CachedResourceMap& sessionResources(SessionID = SessionID::defaultSessionID()); I think it's better to be explicit about which session we want here, otherwise it's easy to always use the default session. 1065575 3 cdumez 2015-01-30 09:43:41 -0800 Committed r179403: <http://trac.webkit.org/changeset/179403> 1065613 4 ap 2015-01-30 12:37:54 -0800 This caused a crash: https://build.webkit.org/results/Apple%20Mavericks%20Debug%20WK1%20(Tests)/r179403%20(10178)/fast/files/workers/worker-apply-blob-url-to-xhr-crash-log.txt 1065615 5 commit-queue 2015-01-30 12:42:06 -0800 Re-opened since this is blocked by bug 141091 1065642 6 cdumez 2015-01-30 14:02:08 -0800 Rolled out in <http://trac.webkit.org/changeset/179410>. I'll propose another fix. 1065658 7 245746 cdumez 2015-01-30 14:47:13 -0800 Created attachment 245746 Patch 1065659 8 cdumez 2015-01-30 14:47:55 -0800 New version of the patch will no longer causes any assertion hit in HashTable code. 1065697 9 245752 cdumez 2015-01-30 16:15:20 -0800 Created attachment 245752 Patch 1065720 10 245759 cdumez 2015-01-30 16:45:59 -0800 Created attachment 245759 Patch 1065740 11 245759 commit-queue 2015-01-30 17:39:27 -0800 Comment on attachment 245759 Patch Clearing flags on attachment: 245759 Committed r179431: <http://trac.webkit.org/changeset/179431> 1065741 12 commit-queue 2015-01-30 17:39:32 -0800 All reviewed patches have been landed. Closing bug. 245696 2015-01-29 22:38:06 -0800 2015-01-30 14:47:10 -0800 Patch bug-141069-20150129223812.patch text/plain 5347 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWE4MjIwOGFkODI5ZjMy MWQ4ZjllYmFjM2RjMzg5NGQ3MGRmOTVlZi4uMDIxNzQ5NWEwZmZkMjQzYTgxNjc5ZTkzMzM3MWFm MDY4ZTY1MjRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAxLTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2Fj aGU6OmdldFNlc3Npb25NYXAoKSBhIGJpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXAoKSBh IGJpdCBieSBkb2luZyAxIEhhc2hNYXAgbG9va3VwCisgICAgICAgIGluc3RlYWQgb2YgcHJldmlv dXNseSAzLiBBbHNvIHJlbmFtZSB0aGUgbWV0aG9kIHRvIHNlc3Npb25SZXNvdXJjZXMoKQorICAg ICAgICBhcyB3ZSB1c3VhbGx5IGRvbid0IHVzZSAiZ2V0IiBwcmVmaXggZm9yIGdldHRlcnMuCisK KyAgICAgICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVtb3J5Q2FjaGU6OnNlc3Npb25SZXNvdXJjZXMpOgorICAgICAgICAoV2ViQ29yZTo6TWVt b3J5Q2FjaGU6OmFkZCk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmV2YWxpZGF0 aW9uU3VjY2VlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZXNvdXJjZUZv clJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJlbW92ZUltYWdlRnJv bUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZW1vdmUpOgorICAgICAg ICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXApOiBEZWxldGVkLgorICAgICAg ICAqIGxvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5oOgorCiAyMDE1LTAxLTI5ICBEYXJpbiBBZGxl ciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgU1ZHVXNlRWxlbWVudC5pbnN0 YW5jZVJvb3QgYW5kIGFsbCB0ZXN0cyB0aGF0IGRlcGVuZCBvbiBpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKaW5kZXggNWZhMDMyMzk3N2E4ODFiMzI5MmI1 MGRkMWI3MzQxMGUyZGMyNDQ1MS4uNzBlOTUyYTNhZWUxN2JmNTJmNDY2ZDg2Y2FiNTNiMWMyOWQx ZmJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCkBA IC03NCwxNCArNzQsMTIgQEAgTWVtb3J5Q2FjaGU6Ok1lbW9yeUNhY2hlKCkKIHsKIH0KIAotTWVt b3J5Q2FjaGU6OkNhY2hlZFJlc291cmNlTWFwJiBNZW1vcnlDYWNoZTo6Z2V0U2Vzc2lvbk1hcChT ZXNzaW9uSUQgc2Vzc2lvbklEKQorTWVtb3J5Q2FjaGU6OkNhY2hlZFJlc291cmNlTWFwJiBNZW1v cnlDYWNoZTo6c2Vzc2lvblJlc291cmNlcyhTZXNzaW9uSUQgc2Vzc2lvbklEKQogewogICAgIEFT U0VSVChzZXNzaW9uSUQuaXNWYWxpZCgpKTsKLSAgICBDYWNoZWRSZXNvdXJjZU1hcCogbWFwID0g bV9zZXNzaW9uUmVzb3VyY2VzLmdldChzZXNzaW9uSUQpOwotICAgIGlmICghbWFwKSB7Ci0gICAg ICAgIG1fc2Vzc2lvblJlc291cmNlcy5zZXQoc2Vzc2lvbklELCBzdGQ6Om1ha2VfdW5pcXVlPENh Y2hlZFJlc291cmNlTWFwPigpKTsKLSAgICAgICAgbWFwID0gbV9zZXNzaW9uUmVzb3VyY2VzLmdl dChzZXNzaW9uSUQpOwotICAgIH0KKyAgICBzdGQ6OnVuaXF1ZV9wdHI8Q2FjaGVkUmVzb3VyY2VN YXA+JiBtYXAgPSBtX3Nlc3Npb25SZXNvdXJjZXMuYWRkKHNlc3Npb25JRCwgbnVsbHB0cikuaXRl cmF0b3ItPnZhbHVlOworICAgIGlmICghbWFwKQorICAgICAgICBtYXAgPSBzdGQ6Om1ha2VfdW5p cXVlPENhY2hlZFJlc291cmNlTWFwPigpOwogICAgIHJldHVybiAqbWFwOwogfQogCkBAIC0xMDYs NyArMTA0LDcgQEAgYm9vbCBNZW1vcnlDYWNoZTo6YWRkKENhY2hlZFJlc291cmNlKiByZXNvdXJj ZSkKIAogICAgIEFTU0VSVChXVEY6OmlzTWFpblRocmVhZCgpKTsKIAotICAgIENhY2hlZFJlc291 cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNzaW9uTWFwKHJlc291cmNlLT5zZXNzaW9uSUQoKSk7 CisgICAgQ2FjaGVkUmVzb3VyY2VNYXAmIHJlc291cmNlcyA9IHNlc3Npb25SZXNvdXJjZXMocmVz b3VyY2UtPnNlc3Npb25JRCgpKTsKICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQogICAg IENhY2hlZFJlc291cmNlSXRlbSogb3JpZ2luTWFwID0gcmVzb3VyY2VzLmdldChyZXNvdXJjZS0+ dXJsKCkpOwogICAgIGlmICghb3JpZ2luTWFwKSB7CkBAIC0xNDAsNyArMTM4LDcgQEAgdm9pZCBN ZW1vcnlDYWNoZTo6cmV2YWxpZGF0aW9uU3VjY2VlZGVkKENhY2hlZFJlc291cmNlKiByZXZhbGlk YXRpbmdSZXNvdXJjZSwgY28KIAogICAgIHJlbW92ZShyZXZhbGlkYXRpbmdSZXNvdXJjZSk7CiAK LSAgICBDYWNoZWRSZXNvdXJjZU1hcCYgcmVzb3VyY2VzID0gZ2V0U2Vzc2lvbk1hcChyZXNvdXJj ZS0+c2Vzc2lvbklEKCkpOworICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMgPSBzZXNz aW9uUmVzb3VyY2VzKHJlc291cmNlLT5zZXNzaW9uSUQoKSk7CiAjaWYgRU5BQkxFKENBQ0hFX1BB UlRJVElPTklORykKICAgICBBU1NFUlQoIXJlc291cmNlcy5nZXQocmVzb3VyY2UtPnVybCgpKSB8 fCAhcmVzb3VyY2VzLmdldChyZXNvdXJjZS0+dXJsKCkpLT5nZXQocmVzb3VyY2UtPmNhY2hlUGFy dGl0aW9uKCkpKTsKICAgICBDYWNoZWRSZXNvdXJjZUl0ZW0qIG9yaWdpbk1hcCA9IHJlc291cmNl cy5nZXQocmVzb3VyY2UtPnVybCgpKTsKQEAgLTE4Myw3ICsxODEsNyBAQCBDYWNoZWRSZXNvdXJj ZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yVVJMKGNvbnN0IFVSTCYgcmVzb3VyY2VVUkwsIFNl c3Npb25JRCBzZQogCiBDYWNoZWRSZXNvdXJjZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yUmVx dWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFNlc3Npb25JRCBzZXNzaW9uSUQp CiB7Ci0gICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdEltcGwocmVxdWVzdCwgZ2V0U2Vzc2lv bk1hcChzZXNzaW9uSUQpKTsKKyAgICByZXR1cm4gcmVzb3VyY2VGb3JSZXF1ZXN0SW1wbChyZXF1 ZXN0LCBzZXNzaW9uUmVzb3VyY2VzKHNlc3Npb25JRCkpOwogfQogCiBDYWNoZWRSZXNvdXJjZSog TWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yUmVxdWVzdEltcGwoY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBDYWNoZWRSZXNvdXJjZU1hcCYgcmVzb3VyY2VzKQpAQCAtMjUwLDcgKzI0OCw3 IEBAIGJvb2wgTWVtb3J5Q2FjaGU6OmFkZEltYWdlVG9DYWNoZShOYXRpdmVJbWFnZVB0ciBpbWFn ZSwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAKIHZvaWQgTWVtb3J5Q2FjaGU6OnJlbW92ZUlt YWdlRnJvbUNhY2hlKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIGRvbWFpbkZvckNhY2hl UGFydGl0aW9uKQogewotICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNz aW9uTWFwKFNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBDYWNoZWRSZXNvdXJj ZU1hcCYgcmVzb3VyY2VzID0gc2Vzc2lvblJlc291cmNlcygpOwogI2lmIEVOQUJMRShDQUNIRV9Q QVJUSVRJT05JTkcpCiAgICAgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlOwogICAgIGlmIChDYWNo ZWRSZXNvdXJjZUl0ZW0qIGl0ZW0gPSByZXNvdXJjZXMuZ2V0KHVybCkpCkBAIC00MjIsNyArNDIw LDcgQEAgdm9pZCBNZW1vcnlDYWNoZTo6cmVtb3ZlKENhY2hlZFJlc291cmNlKiByZXNvdXJjZSkK ICAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiRXZpY3RpbmcgcmVzb3VyY2UgJXAgZm9yICclcycg ZnJvbSBjYWNoZSIsIHJlc291cmNlLCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkubGF0aW4xKCku ZGF0YSgpKTsKICAgICAvLyBUaGUgcmVzb3VyY2UgbWF5IGhhdmUgYWxyZWFkeSBiZWVuIHJlbW92 ZWQgYnkgc29tZW9uZSBvdGhlciB0aGFuIG91ciBjYWxsZXIsCiAgICAgLy8gd2hvIG5lZWRlZCBh IGZyZXNoIGNvcHkgZm9yIGEgcmVsb2FkLiBTZWUgPGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNDc5I2M2Pi4KLSAgICBDYWNoZWRSZXNvdXJjZU1hcCYgcmVzb3VyY2Vz ID0gZ2V0U2Vzc2lvbk1hcChyZXNvdXJjZS0+c2Vzc2lvbklEKCkpOworICAgIENhY2hlZFJlc291 cmNlTWFwJiByZXNvdXJjZXMgPSBzZXNzaW9uUmVzb3VyY2VzKHJlc291cmNlLT5zZXNzaW9uSUQo KSk7CiAgICAgaWYgKHJlc291cmNlLT5pbkNhY2hlKCkpIHsKICAgICAgICAgLy8gUmVtb3ZlIGZy b20gdGhlIHJlc291cmNlIG1hcC4KICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaAppbmRleCA2NjE1N2M4M2FhNGI5 MmM5MDY3YjNlYzlhMDU0YTk0OTMxOGVkMzEyLi5mYTQ2MDNlODkwMDdhZjkxYTlmODBjZTRmNDBi MTAwYTg2ZDYzMDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVt b3J5Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUu aApAQCAtMTg0LDcgKzE4NCw3IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgZGVhZENhcGFjaXR5 KCkgY29uc3Q7CiAKICAgICBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2VGb3JSZXF1ZXN0SW1wbChj b25zdCBSZXNvdXJjZVJlcXVlc3QmLCBDYWNoZWRSZXNvdXJjZU1hcCYpOwotICAgIENhY2hlZFJl c291cmNlTWFwJiBnZXRTZXNzaW9uTWFwKFNlc3Npb25JRCk7CisgICAgQ2FjaGVkUmVzb3VyY2VN YXAmIHNlc3Npb25SZXNvdXJjZXMoU2Vzc2lvbklEID0gU2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lv bklEKCkpOwogCiAgICAgYm9vbCBtX2Rpc2FibGVkOyAgLy8gV2hldGhlciBvciBub3QgdGhlIGNh Y2hlIGlzIGVuYWJsZWQuCiAgICAgYm9vbCBtX2luUHJ1bmVSZXNvdXJjZXM7Cg== 245746 2015-01-30 14:47:13 -0800 2015-01-30 16:15:15 -0800 Patch bug-141069-20150130144720.patch text/plain 8081 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzOTYwOTVmYWZmZjU4 ZGY4MDU5ODJkNGE5ZDhlNzkwMTUwZjRlYy4uNjZiMzE3YzQ0MWI3OTgzNGU1OTI2ZTQ4ZmEwYWI5 ODZiYzcwNjM1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAxLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2Fj aGU6OmdldFNlc3Npb25NYXAoKSBhIGJpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXAoKSBh IGJpdCBieSBkb2luZyAxIEhhc2hNYXAgbG9va3VwCisgICAgICAgIGluc3RlYWQgb2YgcHJldmlv dXNseSAzLiBBbHNvIHJlbmFtZSB0aGUgbWV0aG9kIHRvCisgICAgICAgIGVuc3VyZVNlc3Npb25S ZXNvdXJjZU1hcCgpIGFzIHdlIHVzdWFsbHkgZG9uJ3QgdXNlICJnZXQiIHByZWZpeCBmb3IKKyAg ICAgICAgZ2V0dGVycyBhbmQgdGhlIGltcGxlbWVudGF0aW9uIHdpbGwgYWxzbyBjcmVhdGUgdGhl IEhhc2hNYXAgdmFsdWUgaWYKKyAgICAgICAgdGhlIGtleSBpcyBub3QgZm91bmQuCisKKyAgICAg ICAgQWxzbyBhZGQgYSBhbHRlcm5hdGl2ZSBzZXNzaW9uUmVzb3VyY2VNYXAoKSBtZXRob2Qgd2hp Y2ggcmV0dXJucworICAgICAgICB0aGUgSGFzaE1hcCB2YWx1ZSBpZiB0aGUga2V5IGV4aXN0cyBi dXQgZG9lc24ndCB0cnkgdG8gY3JlYXRlIGl0IGlmCisgICAgICAgIG1pc3NpbmcuIFRoaXMgaXMg YWN0dWFsbHkgd2hhdCB3ZSByZWFsbHkgd2FudCBmb3Igc29tZSBjYWxsIHNpdGVzLgorCisgICAg ICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l bW9yeUNhY2hlOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJldmFsaWRh dGlvblN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVzb3VyY2VG b3JSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZy b21DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVtb3ZlKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpnZXRTZXNzaW9uTWFwKTogRGVsZXRlZC4KKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaDoKKwogMjAxNS0wMS0zMCAgQ29tbWl0IFF1 ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjE3OTQwMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2Fj aGUuY3BwCmluZGV4IGE1MDgwNmIwNTg2YjljYzYwMzVkMWM3NmFlMmMyMGQ2OWI0YWUzODMuLjlh NmQ1MWE4YWEwNzJjY2MxMWVlNjEyZDIxNjYxNzZlN2FmNTVhNTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcApAQCAtNzQsMTQgKzc0LDE4IEBAIE1lbW9y eUNhY2hlOjpNZW1vcnlDYWNoZSgpCiB7CiB9CiAKLU1lbW9yeUNhY2hlOjpDYWNoZWRSZXNvdXJj ZU1hcCYgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXAoU2Vzc2lvbklEIHNlc3Npb25JRCkKK2F1 dG8gTWVtb3J5Q2FjaGU6OnNlc3Npb25SZXNvdXJjZU1hcChTZXNzaW9uSUQgc2Vzc2lvbklEKSBj b25zdCAtPiBDYWNoZWRSZXNvdXJjZU1hcCoKIHsKICAgICBBU1NFUlQoc2Vzc2lvbklELmlzVmFs aWQoKSk7Ci0gICAgQ2FjaGVkUmVzb3VyY2VNYXAqIG1hcCA9IG1fc2Vzc2lvblJlc291cmNlcy5n ZXQoc2Vzc2lvbklEKTsKLSAgICBpZiAoIW1hcCkgewotICAgICAgICBtX3Nlc3Npb25SZXNvdXJj ZXMuc2V0KHNlc3Npb25JRCwgc3RkOjptYWtlX3VuaXF1ZTxDYWNoZWRSZXNvdXJjZU1hcD4oKSk7 Ci0gICAgICAgIG1hcCA9IG1fc2Vzc2lvblJlc291cmNlcy5nZXQoc2Vzc2lvbklEKTsKLSAgICB9 CisgICAgcmV0dXJuIG1fc2Vzc2lvblJlc291cmNlcy5nZXQoc2Vzc2lvbklEKTsKK30KKworYXV0 byBNZW1vcnlDYWNoZTo6ZW5zdXJlU2Vzc2lvblJlc291cmNlTWFwKFNlc3Npb25JRCBzZXNzaW9u SUQpIC0+IENhY2hlZFJlc291cmNlTWFwJgoreworICAgIEFTU0VSVChzZXNzaW9uSUQuaXNWYWxp ZCgpKTsKKyAgICBhdXRvJiBtYXAgPSBtX3Nlc3Npb25SZXNvdXJjZXMuYWRkKHNlc3Npb25JRCwg bnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAgIGlmICghbWFwKQorICAgICAgICBtYXAgPSBz dGQ6Om1ha2VfdW5pcXVlPENhY2hlZFJlc291cmNlTWFwPigpOwogICAgIHJldHVybiAqbWFwOwog fQogCkBAIC0xMDYsNyArMTEwLDcgQEAgYm9vbCBNZW1vcnlDYWNoZTo6YWRkKENhY2hlZFJlc291 cmNlKiByZXNvdXJjZSkKIAogICAgIEFTU0VSVChXVEY6OmlzTWFpblRocmVhZCgpKTsKIAotICAg IENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNzaW9uTWFwKHJlc291cmNlLT5z ZXNzaW9uSUQoKSk7CisgICAgYXV0byYgcmVzb3VyY2VzID0gZW5zdXJlU2Vzc2lvblJlc291cmNl TWFwKHJlc291cmNlLT5zZXNzaW9uSUQoKSk7CiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklO RykKICAgICBDYWNoZWRSZXNvdXJjZUl0ZW0qIG9yaWdpbk1hcCA9IHJlc291cmNlcy5nZXQocmVz b3VyY2UtPnVybCgpKTsKICAgICBpZiAoIW9yaWdpbk1hcCkgewpAQCAtMTQwLDcgKzE0NCw3IEBA IHZvaWQgTWVtb3J5Q2FjaGU6OnJldmFsaWRhdGlvblN1Y2NlZWRlZChDYWNoZWRSZXNvdXJjZSog cmV2YWxpZGF0aW5nUmVzb3VyY2UsIGNvCiAKICAgICByZW1vdmUocmV2YWxpZGF0aW5nUmVzb3Vy Y2UpOwogCi0gICAgQ2FjaGVkUmVzb3VyY2VNYXAmIHJlc291cmNlcyA9IGdldFNlc3Npb25NYXAo cmVzb3VyY2UtPnNlc3Npb25JRCgpKTsKKyAgICBhdXRvJiByZXNvdXJjZXMgPSBlbnN1cmVTZXNz aW9uUmVzb3VyY2VNYXAocmVzb3VyY2UtPnNlc3Npb25JRCgpKTsKICNpZiBFTkFCTEUoQ0FDSEVf UEFSVElUSU9OSU5HKQogICAgIEFTU0VSVCghcmVzb3VyY2VzLmdldChyZXNvdXJjZS0+dXJsKCkp IHx8ICFyZXNvdXJjZXMuZ2V0KHJlc291cmNlLT51cmwoKSktPmdldChyZXNvdXJjZS0+Y2FjaGVQ YXJ0aXRpb24oKSkpOwogICAgIENhY2hlZFJlc291cmNlSXRlbSogb3JpZ2luTWFwID0gcmVzb3Vy Y2VzLmdldChyZXNvdXJjZS0+dXJsKCkpOwpAQCAtMTgzLDcgKzE4NywxMCBAQCBDYWNoZWRSZXNv dXJjZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yVVJMKGNvbnN0IFVSTCYgcmVzb3VyY2VVUkws IFNlc3Npb25JRCBzZQogCiBDYWNoZWRSZXNvdXJjZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9y UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFNlc3Npb25JRCBzZXNzaW9u SUQpCiB7Ci0gICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdEltcGwocmVxdWVzdCwgZ2V0U2Vz c2lvbk1hcChzZXNzaW9uSUQpKTsKKyAgICBhdXRvKiByZXNvdXJjZXMgPSBzZXNzaW9uUmVzb3Vy Y2VNYXAoc2Vzc2lvbklEKTsKKyAgICBpZiAoIXJlc291cmNlcykKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisgICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdEltcGwocmVxdWVzdCwgKnJlc291 cmNlcyk7CiB9CiAKIENhY2hlZFJlc291cmNlKiBNZW1vcnlDYWNoZTo6cmVzb3VyY2VGb3JSZXF1 ZXN0SW1wbChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIENhY2hlZFJlc291cmNlTWFw JiByZXNvdXJjZXMpCkBAIC0yNTAsMTYgKzI1NywxOSBAQCBib29sIE1lbW9yeUNhY2hlOjphZGRJ bWFnZVRvQ2FjaGUoTmF0aXZlSW1hZ2VQdHIgaW1hZ2UsIGNvbnN0IFVSTCYgdXJsLCBjb25zdCBT dAogCiB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21DYWNoZShjb25zdCBVUkwmIHVy bCwgY29uc3QgU3RyaW5nJiBkb21haW5Gb3JDYWNoZVBhcnRpdGlvbikKIHsKLSAgICBDYWNoZWRS ZXNvdXJjZU1hcCYgcmVzb3VyY2VzID0gZ2V0U2Vzc2lvbk1hcChTZXNzaW9uSUQ6OmRlZmF1bHRT ZXNzaW9uSUQoKSk7CisgICAgYXV0byogcmVzb3VyY2VzID0gc2Vzc2lvblJlc291cmNlTWFwKFNl c3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBpZiAoIXJlc291cmNlcykKKyAgICAg ICAgcmV0dXJuOworCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKICAgICBDYWNoZWRS ZXNvdXJjZSogcmVzb3VyY2U7Ci0gICAgaWYgKENhY2hlZFJlc291cmNlSXRlbSogaXRlbSA9IHJl c291cmNlcy5nZXQodXJsKSkKKyAgICBpZiAoQ2FjaGVkUmVzb3VyY2VJdGVtKiBpdGVtID0gcmVz b3VyY2VzLT5nZXQodXJsKSkKICAgICAgICAgcmVzb3VyY2UgPSBpdGVtLT5nZXQoUmVzb3VyY2VS ZXF1ZXN0OjpwYXJ0aXRpb25OYW1lKGRvbWFpbkZvckNhY2hlUGFydGl0aW9uKSk7CiAgICAgZWxz ZQogICAgICAgICByZXNvdXJjZSA9IG51bGxwdHI7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShk b21haW5Gb3JDYWNoZVBhcnRpdGlvbik7Ci0gICAgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlID0g cmVzb3VyY2VzLmdldCh1cmwpOworICAgIENhY2hlZFJlc291cmNlKiByZXNvdXJjZSA9IHJlc291 cmNlcy0+Z2V0KHVybCk7CiAjZW5kaWYKICAgICBpZiAoIXJlc291cmNlKQogICAgICAgICByZXR1 cm47CkBAIC00MTcsMzEgKzQyNywzMyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmUoQ2FjaGVk UmVzb3VyY2UqIHJlc291cmNlKQogICAgIExPRyhSZXNvdXJjZUxvYWRpbmcsICJFdmljdGluZyBy ZXNvdXJjZSAlcCBmb3IgJyVzJyBmcm9tIGNhY2hlIiwgcmVzb3VyY2UsIHJlc291cmNlLT51cmwo KS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwogICAgIC8vIFRoZSByZXNvdXJjZSBtYXkgaGF2 ZSBhbHJlYWR5IGJlZW4gcmVtb3ZlZCBieSBzb21lb25lIG90aGVyIHRoYW4gb3VyIGNhbGxlciwK ICAgICAvLyB3aG8gbmVlZGVkIGEgZnJlc2ggY29weSBmb3IgYSByZWxvYWQuIFNlZSA8aHR0cDov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NzkjYzY+LgotICAgIENhY2hlZFJl c291cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNzaW9uTWFwKHJlc291cmNlLT5zZXNzaW9uSUQo KSk7Ci0gICAgaWYgKHJlc291cmNlLT5pbkNhY2hlKCkpIHsKLSAgICAgICAgLy8gUmVtb3ZlIGZy b20gdGhlIHJlc291cmNlIG1hcC4KKyAgICBpZiAoYXV0byogcmVzb3VyY2VzID0gc2Vzc2lvblJl c291cmNlTWFwKHJlc291cmNlLT5zZXNzaW9uSUQoKSkpIHsKKyAgICAgICAgaWYgKHJlc291cmNl LT5pbkNhY2hlKCkpIHsKKyAgICAgICAgICAgIC8vIFJlbW92ZSBmcm9tIHRoZSByZXNvdXJjZSBt YXAuCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKLSAgICAgICAgQ2FjaGVkUmVzb3Vy Y2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLmdldChyZXNvdXJjZS0+dXJsKCkpOwotICAgICAgICBp ZiAoaXRlbSkgewotICAgICAgICAgICAgaXRlbS0+cmVtb3ZlKHJlc291cmNlLT5jYWNoZVBhcnRp dGlvbigpKTsKLSAgICAgICAgICAgIGlmICghaXRlbS0+c2l6ZSgpKQotICAgICAgICAgICAgICAg IHJlc291cmNlcy5yZW1vdmUocmVzb3VyY2UtPnVybCgpKTsKLSAgICAgICAgfQorICAgICAgICAg ICAgQ2FjaGVkUmVzb3VyY2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLT5nZXQocmVzb3VyY2UtPnVy bCgpKTsKKyAgICAgICAgICAgIGlmIChpdGVtKSB7CisgICAgICAgICAgICAgICAgaXRlbS0+cmVt b3ZlKHJlc291cmNlLT5jYWNoZVBhcnRpdGlvbigpKTsKKyAgICAgICAgICAgICAgICBpZiAoIWl0 ZW0tPnNpemUoKSkKKyAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2VzLT5yZW1vdmUocmVzb3Vy Y2UtPnVybCgpKTsKKyAgICAgICAgICAgIH0KICNlbHNlCi0gICAgICAgIHJlc291cmNlcy5yZW1v dmUocmVzb3VyY2UtPnVybCgpKTsKKyAgICAgICAgICAgIHJlc291cmNlcy0+cmVtb3ZlKHJlc291 cmNlLT51cmwoKSk7CiAjZW5kaWYKLSAgICAgICAgcmVzb3VyY2UtPnNldEluQ2FjaGUoZmFsc2Up OworICAgICAgICAgICAgcmVzb3VyY2UtPnNldEluQ2FjaGUoZmFsc2UpOwogCi0gICAgICAgIC8v IFJlbW92ZSBmcm9tIHRoZSBhcHByb3ByaWF0ZSBMUlUgbGlzdC4KLSAgICAgICAgcmVtb3ZlRnJv bUxSVUxpc3QocmVzb3VyY2UpOwotICAgICAgICByZW1vdmVGcm9tTGl2ZURlY29kZWRSZXNvdXJj ZXNMaXN0KHJlc291cmNlKTsKLSAgICAgICAgYWRqdXN0U2l6ZShyZXNvdXJjZS0+aGFzQ2xpZW50 cygpLCAtc3RhdGljX2Nhc3Q8aW50PihyZXNvdXJjZS0+c2l6ZSgpKSk7Ci0gICAgfSBlbHNlCisg ICAgICAgICAgICAvLyBSZW1vdmUgZnJvbSB0aGUgYXBwcm9wcmlhdGUgTFJVIGxpc3QuCisgICAg ICAgICAgICByZW1vdmVGcm9tTFJVTGlzdChyZXNvdXJjZSk7CisgICAgICAgICAgICByZW1vdmVG cm9tTGl2ZURlY29kZWRSZXNvdXJjZXNMaXN0KHJlc291cmNlKTsKKyAgICAgICAgICAgIGFkanVz dFNpemUocmVzb3VyY2UtPmhhc0NsaWVudHMoKSwgLXN0YXRpY19jYXN0PGludD4ocmVzb3VyY2Ut PnNpemUoKSkpOworICAgICAgICB9IGVsc2UgewogI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05J TkcpCi0gICAgICAgIEFTU0VSVCghcmVzb3VyY2VzLmdldChyZXNvdXJjZS0+dXJsKCkpIHx8IHJl c291cmNlcy5nZXQocmVzb3VyY2UtPnVybCgpKS0+Z2V0KHJlc291cmNlLT5jYWNoZVBhcnRpdGlv bigpKSAhPSByZXNvdXJjZSk7CisgICAgICAgICAgICBBU1NFUlQoIXJlc291cmNlcy0+Z2V0KHJl c291cmNlLT51cmwoKSkgfHwgcmVzb3VyY2VzLT5nZXQocmVzb3VyY2UtPnVybCgpKS0+Z2V0KHJl c291cmNlLT5jYWNoZVBhcnRpdGlvbigpKSAhPSByZXNvdXJjZSk7CiAjZWxzZQotICAgICAgICBB U1NFUlQocmVzb3VyY2VzLmdldChyZXNvdXJjZS0+dXJsKCkpICE9IHJlc291cmNlKTsKKyAgICAg ICAgICAgIEFTU0VSVChyZXNvdXJjZXMtPmdldChyZXNvdXJjZS0+dXJsKCkpICE9IHJlc291cmNl KTsKICNlbmRpZgorICAgICAgICB9CisgICAgfQogCiAgICAgcmVzb3VyY2UtPmRlbGV0ZUlmUG9z c2libGUoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1v cnlDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgKaW5k ZXggNTIzZWQ0YTU1OTAyZDc4MWNiMGE1NGUyZWFkMWJkNzI3ZDJhZjA1Ny4uYzU5YmY0Y2E4NTNl ODRhNWIyMDRkYjhiYWU0NGJiNGQ0NTAyZDg3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL01lbW9yeUNhY2hlLmgKQEAgLTE4Niw3ICsxODYsOSBAQCBwcml2YXRlOgogICAgIHVuc2ln bmVkIGRlYWRDYXBhY2l0eSgpIGNvbnN0OwogCiAgICAgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNl Rm9yUmVxdWVzdEltcGwoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgQ2FjaGVkUmVzb3VyY2VNYXAm KTsKLSAgICBDYWNoZWRSZXNvdXJjZU1hcCYgZ2V0U2Vzc2lvbk1hcChTZXNzaW9uSUQpOworCisg ICAgQ2FjaGVkUmVzb3VyY2VNYXAmIGVuc3VyZVNlc3Npb25SZXNvdXJjZU1hcChTZXNzaW9uSUQp OworICAgIENhY2hlZFJlc291cmNlTWFwKiBzZXNzaW9uUmVzb3VyY2VNYXAoU2Vzc2lvbklEKSBj b25zdDsKIAogICAgIGJvb2wgbV9kaXNhYmxlZDsgIC8vIFdoZXRoZXIgb3Igbm90IHRoZSBjYWNo ZSBpcyBlbmFibGVkLgogICAgIGJvb2wgbV9pblBydW5lUmVzb3VyY2VzOwo= 245752 2015-01-30 16:15:20 -0800 2015-01-30 16:45:54 -0800 Patch bug-141069-20150130161527.patch text/plain 8134 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNmMTUyNzRhZTc2ODc5 YjY0ZTYyZWIyZTkxNzc4NjNmOWQzNmY1Yy4uMjJlZGQwZjExNTg4ODQ2MWUwYzQ3MGI1NWMyMmNh YjM2ZGJkZTRmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1LTAxLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2Fj aGU6OmdldFNlc3Npb25NYXAoKSBhIGJpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXAoKSBh IGJpdCBieSBkb2luZyAxIEhhc2hNYXAgbG9va3VwCisgICAgICAgIGluc3RlYWQgb2YgcHJldmlv dXNseSAzLiBBbHNvIHJlbmFtZSB0aGUgbWV0aG9kIHRvCisgICAgICAgIGVuc3VyZVNlc3Npb25S ZXNvdXJjZU1hcCgpIGFzIHdlIHVzdWFsbHkgZG9uJ3QgdXNlICJnZXQiIHByZWZpeCBmb3IKKyAg ICAgICAgZ2V0dGVycyBhbmQgdGhlIGltcGxlbWVudGF0aW9uIHdpbGwgYWxzbyBjcmVhdGUgdGhl IEhhc2hNYXAgdmFsdWUgaWYKKyAgICAgICAgdGhlIGtleSBpcyBub3QgZm91bmQuCisKKyAgICAg ICAgQWxzbyBhZGQgYSBhbHRlcm5hdGl2ZSBzZXNzaW9uUmVzb3VyY2VNYXAoKSBtZXRob2Qgd2hp Y2ggcmV0dXJucworICAgICAgICB0aGUgSGFzaE1hcCB2YWx1ZSBpZiB0aGUga2V5IGV4aXN0cyBi dXQgZG9lc24ndCB0cnkgdG8gY3JlYXRlIGl0IGlmCisgICAgICAgIG1pc3NpbmcuIFRoaXMgaXMg YWN0dWFsbHkgd2hhdCB3ZSByZWFsbHkgd2FudCBmb3Igc29tZSBjYWxsIHNpdGVzLgorCisgICAg ICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l bW9yeUNhY2hlOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJldmFsaWRh dGlvblN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVzb3VyY2VG b3JSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZy b21DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVtb3ZlKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpnZXRTZXNzaW9uTWFwKTogRGVsZXRlZC4KKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaDoKKworMjAxNS0wMS0zMCAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIFVwZGF0ZSBNZW1vcnlDYWNoZSBjb2Rl IHRvIHVzZSBtb3JlIHJlZmVyZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDk5CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IGI1YjUwY2QyYzZhOTU1MGEz Yzg5YjhhNDEzYzZlNGU5N2I2ZWM1ZGUuLjNkYTcwODRlMzAyZTE5YTJkMzllYzA0N2IyZTQzYjMw MDBiYjQ1MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlD YWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNw cApAQCAtNzQsMTQgKzc0LDE4IEBAIE1lbW9yeUNhY2hlOjpNZW1vcnlDYWNoZSgpCiB7CiB9CiAK LU1lbW9yeUNhY2hlOjpDYWNoZWRSZXNvdXJjZU1hcCYgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25N YXAoU2Vzc2lvbklEIHNlc3Npb25JRCkKK2F1dG8gTWVtb3J5Q2FjaGU6OnNlc3Npb25SZXNvdXJj ZU1hcChTZXNzaW9uSUQgc2Vzc2lvbklEKSBjb25zdCAtPiBDYWNoZWRSZXNvdXJjZU1hcCoKIHsK ICAgICBBU1NFUlQoc2Vzc2lvbklELmlzVmFsaWQoKSk7Ci0gICAgQ2FjaGVkUmVzb3VyY2VNYXAq IG1hcCA9IG1fc2Vzc2lvblJlc291cmNlcy5nZXQoc2Vzc2lvbklEKTsKLSAgICBpZiAoIW1hcCkg ewotICAgICAgICBtX3Nlc3Npb25SZXNvdXJjZXMuc2V0KHNlc3Npb25JRCwgc3RkOjptYWtlX3Vu aXF1ZTxDYWNoZWRSZXNvdXJjZU1hcD4oKSk7Ci0gICAgICAgIG1hcCA9IG1fc2Vzc2lvblJlc291 cmNlcy5nZXQoc2Vzc2lvbklEKTsKLSAgICB9CisgICAgcmV0dXJuIG1fc2Vzc2lvblJlc291cmNl cy5nZXQoc2Vzc2lvbklEKTsKK30KKworYXV0byBNZW1vcnlDYWNoZTo6ZW5zdXJlU2Vzc2lvblJl c291cmNlTWFwKFNlc3Npb25JRCBzZXNzaW9uSUQpIC0+IENhY2hlZFJlc291cmNlTWFwJgorewor ICAgIEFTU0VSVChzZXNzaW9uSUQuaXNWYWxpZCgpKTsKKyAgICBhdXRvJiBtYXAgPSBtX3Nlc3Np b25SZXNvdXJjZXMuYWRkKHNlc3Npb25JRCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAg IGlmICghbWFwKQorICAgICAgICBtYXAgPSBzdGQ6Om1ha2VfdW5pcXVlPENhY2hlZFJlc291cmNl TWFwPigpOwogICAgIHJldHVybiAqbWFwOwogfQogCkBAIC0xMDYsNyArMTEwLDcgQEAgYm9vbCBN ZW1vcnlDYWNoZTo6YWRkKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkKIAogICAgIEFTU0VSVChX VEY6OmlzTWFpblRocmVhZCgpKTsKIAotICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMg PSBnZXRTZXNzaW9uTWFwKHJlc291cmNlLnNlc3Npb25JRCgpKTsKKyAgICBhdXRvJiByZXNvdXJj ZXMgPSBlbnN1cmVTZXNzaW9uUmVzb3VyY2VNYXAocmVzb3VyY2Uuc2Vzc2lvbklEKCkpOwogI2lm IEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiAgICAgQ2FjaGVkUmVzb3VyY2VJdGVtKiBvcmln aW5NYXAgPSByZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgpKTsKICAgICBpZiAoIW9yaWdpbk1h cCkgewpAQCAtMTQxLDcgKzE0NSw3IEBAIHZvaWQgTWVtb3J5Q2FjaGU6OnJldmFsaWRhdGlvblN1 Y2NlZWRlZChDYWNoZWRSZXNvdXJjZSYgcmV2YWxpZGF0aW5nUmVzb3VyY2UsIGNvCiAKICAgICBy ZW1vdmUocmV2YWxpZGF0aW5nUmVzb3VyY2UpOwogCi0gICAgQ2FjaGVkUmVzb3VyY2VNYXAmIHJl c291cmNlcyA9IGdldFNlc3Npb25NYXAocmVzb3VyY2Uuc2Vzc2lvbklEKCkpOworICAgIGF1dG8m IHJlc291cmNlcyA9IGVuc3VyZVNlc3Npb25SZXNvdXJjZU1hcChyZXNvdXJjZS5zZXNzaW9uSUQo KSk7CiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKICAgICBBU1NFUlQoIXJlc291cmNl cy5nZXQocmVzb3VyY2UudXJsKCkpIHx8ICFyZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgpKS0+ Z2V0KHJlc291cmNlLmNhY2hlUGFydGl0aW9uKCkpKTsKICAgICBDYWNoZWRSZXNvdXJjZUl0ZW0q IG9yaWdpbk1hcCA9IHJlc291cmNlcy5nZXQocmVzb3VyY2UudXJsKCkpOwpAQCAtMTg0LDcgKzE4 OCwxMCBAQCBDYWNoZWRSZXNvdXJjZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yVVJMKGNvbnN0 IFVSTCYgcmVzb3VyY2VVUkwsIFNlc3Npb25JRCBzZQogCiBDYWNoZWRSZXNvdXJjZSogTWVtb3J5 Q2FjaGU6OnJlc291cmNlRm9yUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IFNlc3Npb25JRCBzZXNzaW9uSUQpCiB7Ci0gICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdElt cGwocmVxdWVzdCwgZ2V0U2Vzc2lvbk1hcChzZXNzaW9uSUQpKTsKKyAgICBhdXRvKiByZXNvdXJj ZXMgPSBzZXNzaW9uUmVzb3VyY2VNYXAoc2Vzc2lvbklEKTsKKyAgICBpZiAoIXJlc291cmNlcykK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdElt cGwocmVxdWVzdCwgKnJlc291cmNlcyk7CiB9CiAKIENhY2hlZFJlc291cmNlKiBNZW1vcnlDYWNo ZTo6cmVzb3VyY2VGb3JSZXF1ZXN0SW1wbChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMpCkBAIC0yNTEsMTYgKzI1OCwxOSBAQCBib29s IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUoTmF0aXZlSW1hZ2VQdHIgaW1hZ2UsIGNvbnN0 IFVSTCYgdXJsLCBjb25zdCBTdAogCiB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21D YWNoZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBkb21haW5Gb3JDYWNoZVBhcnRpdGlv bikKIHsKLSAgICBDYWNoZWRSZXNvdXJjZU1hcCYgcmVzb3VyY2VzID0gZ2V0U2Vzc2lvbk1hcChT ZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSk7CisgICAgYXV0byogcmVzb3VyY2VzID0gc2Vz c2lvblJlc291cmNlTWFwKFNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBpZiAo IXJlc291cmNlcykKKyAgICAgICAgcmV0dXJuOworCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElP TklORykKICAgICBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2U7Ci0gICAgaWYgKENhY2hlZFJlc291 cmNlSXRlbSogaXRlbSA9IHJlc291cmNlcy5nZXQodXJsKSkKKyAgICBpZiAoQ2FjaGVkUmVzb3Vy Y2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLT5nZXQodXJsKSkKICAgICAgICAgcmVzb3VyY2UgPSBp dGVtLT5nZXQoUmVzb3VyY2VSZXF1ZXN0OjpwYXJ0aXRpb25OYW1lKGRvbWFpbkZvckNhY2hlUGFy dGl0aW9uKSk7CiAgICAgZWxzZQogICAgICAgICByZXNvdXJjZSA9IG51bGxwdHI7CiAjZWxzZQog ICAgIFVOVVNFRF9QQVJBTShkb21haW5Gb3JDYWNoZVBhcnRpdGlvbik7Ci0gICAgQ2FjaGVkUmVz b3VyY2UqIHJlc291cmNlID0gcmVzb3VyY2VzLmdldCh1cmwpOworICAgIENhY2hlZFJlc291cmNl KiByZXNvdXJjZSA9IHJlc291cmNlcy0+Z2V0KHVybCk7CiAjZW5kaWYKICAgICBpZiAoIXJlc291 cmNlKQogICAgICAgICByZXR1cm47CkBAIC00MTgsMzEgKzQyOCwzMyBAQCB2b2lkIE1lbW9yeUNh Y2hlOjpyZW1vdmUoQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKQogICAgIExPRyhSZXNvdXJjZUxv YWRpbmcsICJFdmljdGluZyByZXNvdXJjZSAlcCBmb3IgJyVzJyBmcm9tIGNhY2hlIiwgJnJlc291 cmNlLCByZXNvdXJjZS51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwogICAgIC8vIFRo ZSByZXNvdXJjZSBtYXkgaGF2ZSBhbHJlYWR5IGJlZW4gcmVtb3ZlZCBieSBzb21lb25lIG90aGVy IHRoYW4gb3VyIGNhbGxlciwKICAgICAvLyB3aG8gbmVlZGVkIGEgZnJlc2ggY29weSBmb3IgYSBy ZWxvYWQuIFNlZSA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0Nzkj YzY+LgotICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNzaW9uTWFwKHJl c291cmNlLnNlc3Npb25JRCgpKTsKLSAgICBpZiAocmVzb3VyY2UuaW5DYWNoZSgpKSB7Ci0gICAg ICAgIC8vIFJlbW92ZSBmcm9tIHRoZSByZXNvdXJjZSBtYXAuCisgICAgaWYgKGF1dG8qIHJlc291 cmNlcyA9IHNlc3Npb25SZXNvdXJjZU1hcChyZXNvdXJjZS5zZXNzaW9uSUQoKSkpIHsKKyAgICAg ICAgaWYgKHJlc291cmNlLT5pbkNhY2hlKCkpIHsKKyAgICAgICAgICAgIC8vIFJlbW92ZSBmcm9t IHRoZSByZXNvdXJjZSBtYXAuCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKLSAgICAg ICAgQ2FjaGVkUmVzb3VyY2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLmdldChyZXNvdXJjZS51cmwo KSk7Ci0gICAgICAgIGlmIChpdGVtKSB7Ci0gICAgICAgICAgICBpdGVtLT5yZW1vdmUocmVzb3Vy Y2UuY2FjaGVQYXJ0aXRpb24oKSk7Ci0gICAgICAgICAgICBpZiAoIWl0ZW0tPnNpemUoKSkKLSAg ICAgICAgICAgICAgICByZXNvdXJjZXMucmVtb3ZlKHJlc291cmNlLnVybCgpKTsKLSAgICAgICAg fQorICAgICAgICAgICAgQ2FjaGVkUmVzb3VyY2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLT5nZXQo cmVzb3VyY2UudXJsKCkpOworICAgICAgICAgICAgaWYgKGl0ZW0pIHsKKyAgICAgICAgICAgICAg ICBpdGVtLT5yZW1vdmUocmVzb3VyY2UuY2FjaGVQYXJ0aXRpb24oKSk7CisgICAgICAgICAgICAg ICAgaWYgKCFpdGVtLT5zaXplKCkpCisgICAgICAgICAgICAgICAgICAgIHJlc291cmNlcy0+cmVt b3ZlKHJlc291cmNlLnVybCgpKTsKKyAgICAgICAgICAgIH0KICNlbHNlCi0gICAgICAgIHJlc291 cmNlcy5yZW1vdmUocmVzb3VyY2UudXJsKCkpOworICAgICAgICAgICAgcmVzb3VyY2VzLT5yZW1v dmUocmVzb3VyY2UudXJsKCkpOwogI2VuZGlmCi0gICAgICAgIHJlc291cmNlLnNldEluQ2FjaGUo ZmFsc2UpOworICAgICAgICAgICAgcmVzb3VyY2Uuc2V0SW5DYWNoZShmYWxzZSk7CiAKLSAgICAg ICAgLy8gUmVtb3ZlIGZyb20gdGhlIGFwcHJvcHJpYXRlIExSVSBsaXN0LgotICAgICAgICByZW1v dmVGcm9tTFJVTGlzdChyZXNvdXJjZSk7Ci0gICAgICAgIHJlbW92ZUZyb21MaXZlRGVjb2RlZFJl c291cmNlc0xpc3QocmVzb3VyY2UpOwotICAgICAgICBhZGp1c3RTaXplKHJlc291cmNlLmhhc0Ns aWVudHMoKSwgLXN0YXRpY19jYXN0PGludD4ocmVzb3VyY2Uuc2l6ZSgpKSk7Ci0gICAgfSBlbHNl CisgICAgICAgICAgICAvLyBSZW1vdmUgZnJvbSB0aGUgYXBwcm9wcmlhdGUgTFJVIGxpc3QuCisg ICAgICAgICAgICByZW1vdmVGcm9tTFJVTGlzdChyZXNvdXJjZSk7CisgICAgICAgICAgICByZW1v dmVGcm9tTGl2ZURlY29kZWRSZXNvdXJjZXNMaXN0KHJlc291cmNlKTsKKyAgICAgICAgICAgIGFk anVzdFNpemUocmVzb3VyY2UuaGFzQ2xpZW50cygpLCAtc3RhdGljX2Nhc3Q8aW50PihyZXNvdXJj ZS5zaXplKCkpKTsKKyAgICAgICAgfSBlbHNlIHsKICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9O SU5HKQotICAgICAgICBBU1NFUlQoIXJlc291cmNlcy5nZXQocmVzb3VyY2UudXJsKCkpIHx8IHJl c291cmNlcy5nZXQocmVzb3VyY2UudXJsKCkpLT5nZXQocmVzb3VyY2UuY2FjaGVQYXJ0aXRpb24o KSkgIT0gJnJlc291cmNlKTsKKyAgICAgICAgICAgIEFTU0VSVCghcmVzb3VyY2VzLT5nZXQocmVz b3VyY2UudXJsKCkpIHx8IHJlc291cmNlcy0+Z2V0KHJlc291cmNlLnVybCgpKS0+Z2V0KHJlc291 cmNlLmNhY2hlUGFydGl0aW9uKCkpICE9ICZyZXNvdXJjZSk7CiAjZWxzZQotICAgICAgICBBU1NF UlQocmVzb3VyY2VzLmdldChyZXNvdXJjZS51cmwoKSkgIT0gJnJlc291cmNlKTsKKyAgICAgICAg ICAgIEFTU0VSVChyZXNvdXJjZXMtPmdldChyZXNvdXJjZS51cmwoKSkgIT0gJnJlc291cmNlKTsK ICNlbmRpZgorICAgICAgICB9CisgICAgfQogCiAgICAgcmVzb3VyY2UuZGVsZXRlSWZQb3NzaWJs ZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNh Y2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaAppbmRleCA5 MWNmN2QzMDkwMjNkYjQ3NWRlODEwMjQzOWQyZTllMTdkNmZkN2IxLi5jZTEyMjNjMjFkNWEwYzlk NjZkZDczN2U4MGQwYTk3NTVjNzQyMWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv TWVtb3J5Q2FjaGUuaApAQCAtMTg2LDcgKzE4Niw5IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQg ZGVhZENhcGFjaXR5KCkgY29uc3Q7CiAKICAgICBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2VGb3JS ZXF1ZXN0SW1wbChjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBDYWNoZWRSZXNvdXJjZU1hcCYpOwot ICAgIENhY2hlZFJlc291cmNlTWFwJiBnZXRTZXNzaW9uTWFwKFNlc3Npb25JRCk7CisKKyAgICBD YWNoZWRSZXNvdXJjZU1hcCYgZW5zdXJlU2Vzc2lvblJlc291cmNlTWFwKFNlc3Npb25JRCk7Cisg ICAgQ2FjaGVkUmVzb3VyY2VNYXAqIHNlc3Npb25SZXNvdXJjZU1hcChTZXNzaW9uSUQpIGNvbnN0 OwogCiAgICAgYm9vbCBtX2Rpc2FibGVkOyAgLy8gV2hldGhlciBvciBub3QgdGhlIGNhY2hlIGlz IGVuYWJsZWQuCiAgICAgYm9vbCBtX2luUHJ1bmVSZXNvdXJjZXM7Cg== 245759 2015-01-30 16:45:59 -0800 2015-01-30 17:39:27 -0800 Patch bug-141069-20150130164606.patch text/plain 8133 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNmMTUyNzRhZTc2ODc5 YjY0ZTYyZWIyZTkxNzc4NjNmOWQzNmY1Yy4uMjJlZGQwZjExNTg4ODQ2MWUwYzQ3MGI1NWMyMmNh YjM2ZGJkZTRmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1LTAxLTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2Fj aGU6OmdldFNlc3Npb25NYXAoKSBhIGJpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgT3B0aW1pemUgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25NYXAoKSBh IGJpdCBieSBkb2luZyAxIEhhc2hNYXAgbG9va3VwCisgICAgICAgIGluc3RlYWQgb2YgcHJldmlv dXNseSAzLiBBbHNvIHJlbmFtZSB0aGUgbWV0aG9kIHRvCisgICAgICAgIGVuc3VyZVNlc3Npb25S ZXNvdXJjZU1hcCgpIGFzIHdlIHVzdWFsbHkgZG9uJ3QgdXNlICJnZXQiIHByZWZpeCBmb3IKKyAg ICAgICAgZ2V0dGVycyBhbmQgdGhlIGltcGxlbWVudGF0aW9uIHdpbGwgYWxzbyBjcmVhdGUgdGhl IEhhc2hNYXAgdmFsdWUgaWYKKyAgICAgICAgdGhlIGtleSBpcyBub3QgZm91bmQuCisKKyAgICAg ICAgQWxzbyBhZGQgYSBhbHRlcm5hdGl2ZSBzZXNzaW9uUmVzb3VyY2VNYXAoKSBtZXRob2Qgd2hp Y2ggcmV0dXJucworICAgICAgICB0aGUgSGFzaE1hcCB2YWx1ZSBpZiB0aGUga2V5IGV4aXN0cyBi dXQgZG9lc24ndCB0cnkgdG8gY3JlYXRlIGl0IGlmCisgICAgICAgIG1pc3NpbmcuIFRoaXMgaXMg YWN0dWFsbHkgd2hhdCB3ZSByZWFsbHkgd2FudCBmb3Igc29tZSBjYWxsIHNpdGVzLgorCisgICAg ICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l bW9yeUNhY2hlOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJldmFsaWRh dGlvblN1Y2NlZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVzb3VyY2VG b3JSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZy b21DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cmVtb3ZlKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpnZXRTZXNzaW9uTWFwKTogRGVsZXRlZC4KKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuaDoKKworMjAxNS0wMS0zMCAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIFVwZGF0ZSBNZW1vcnlDYWNoZSBjb2Rl IHRvIHVzZSBtb3JlIHJlZmVyZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMDk5CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCmluZGV4IGI1YjUwY2QyYzZhOTU1MGEz Yzg5YjhhNDEzYzZlNGU5N2I2ZWM1ZGUuLjk1N2M1ZWMxOGMwNjRiZTZlZWVjZDYyMjUzYzdjYmVk ZGU4MDhmM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlD YWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNw cApAQCAtNzQsMTQgKzc0LDE4IEBAIE1lbW9yeUNhY2hlOjpNZW1vcnlDYWNoZSgpCiB7CiB9CiAK LU1lbW9yeUNhY2hlOjpDYWNoZWRSZXNvdXJjZU1hcCYgTWVtb3J5Q2FjaGU6OmdldFNlc3Npb25N YXAoU2Vzc2lvbklEIHNlc3Npb25JRCkKK2F1dG8gTWVtb3J5Q2FjaGU6OnNlc3Npb25SZXNvdXJj ZU1hcChTZXNzaW9uSUQgc2Vzc2lvbklEKSBjb25zdCAtPiBDYWNoZWRSZXNvdXJjZU1hcCoKIHsK ICAgICBBU1NFUlQoc2Vzc2lvbklELmlzVmFsaWQoKSk7Ci0gICAgQ2FjaGVkUmVzb3VyY2VNYXAq IG1hcCA9IG1fc2Vzc2lvblJlc291cmNlcy5nZXQoc2Vzc2lvbklEKTsKLSAgICBpZiAoIW1hcCkg ewotICAgICAgICBtX3Nlc3Npb25SZXNvdXJjZXMuc2V0KHNlc3Npb25JRCwgc3RkOjptYWtlX3Vu aXF1ZTxDYWNoZWRSZXNvdXJjZU1hcD4oKSk7Ci0gICAgICAgIG1hcCA9IG1fc2Vzc2lvblJlc291 cmNlcy5nZXQoc2Vzc2lvbklEKTsKLSAgICB9CisgICAgcmV0dXJuIG1fc2Vzc2lvblJlc291cmNl cy5nZXQoc2Vzc2lvbklEKTsKK30KKworYXV0byBNZW1vcnlDYWNoZTo6ZW5zdXJlU2Vzc2lvblJl c291cmNlTWFwKFNlc3Npb25JRCBzZXNzaW9uSUQpIC0+IENhY2hlZFJlc291cmNlTWFwJgorewor ICAgIEFTU0VSVChzZXNzaW9uSUQuaXNWYWxpZCgpKTsKKyAgICBhdXRvJiBtYXAgPSBtX3Nlc3Np b25SZXNvdXJjZXMuYWRkKHNlc3Npb25JRCwgbnVsbHB0cikuaXRlcmF0b3ItPnZhbHVlOworICAg IGlmICghbWFwKQorICAgICAgICBtYXAgPSBzdGQ6Om1ha2VfdW5pcXVlPENhY2hlZFJlc291cmNl TWFwPigpOwogICAgIHJldHVybiAqbWFwOwogfQogCkBAIC0xMDYsNyArMTEwLDcgQEAgYm9vbCBN ZW1vcnlDYWNoZTo6YWRkKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkKIAogICAgIEFTU0VSVChX VEY6OmlzTWFpblRocmVhZCgpKTsKIAotICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMg PSBnZXRTZXNzaW9uTWFwKHJlc291cmNlLnNlc3Npb25JRCgpKTsKKyAgICBhdXRvJiByZXNvdXJj ZXMgPSBlbnN1cmVTZXNzaW9uUmVzb3VyY2VNYXAocmVzb3VyY2Uuc2Vzc2lvbklEKCkpOwogI2lm IEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiAgICAgQ2FjaGVkUmVzb3VyY2VJdGVtKiBvcmln aW5NYXAgPSByZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgpKTsKICAgICBpZiAoIW9yaWdpbk1h cCkgewpAQCAtMTQxLDcgKzE0NSw3IEBAIHZvaWQgTWVtb3J5Q2FjaGU6OnJldmFsaWRhdGlvblN1 Y2NlZWRlZChDYWNoZWRSZXNvdXJjZSYgcmV2YWxpZGF0aW5nUmVzb3VyY2UsIGNvCiAKICAgICBy ZW1vdmUocmV2YWxpZGF0aW5nUmVzb3VyY2UpOwogCi0gICAgQ2FjaGVkUmVzb3VyY2VNYXAmIHJl c291cmNlcyA9IGdldFNlc3Npb25NYXAocmVzb3VyY2Uuc2Vzc2lvbklEKCkpOworICAgIGF1dG8m IHJlc291cmNlcyA9IGVuc3VyZVNlc3Npb25SZXNvdXJjZU1hcChyZXNvdXJjZS5zZXNzaW9uSUQo KSk7CiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKICAgICBBU1NFUlQoIXJlc291cmNl cy5nZXQocmVzb3VyY2UudXJsKCkpIHx8ICFyZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgpKS0+ Z2V0KHJlc291cmNlLmNhY2hlUGFydGl0aW9uKCkpKTsKICAgICBDYWNoZWRSZXNvdXJjZUl0ZW0q IG9yaWdpbk1hcCA9IHJlc291cmNlcy5nZXQocmVzb3VyY2UudXJsKCkpOwpAQCAtMTg0LDcgKzE4 OCwxMCBAQCBDYWNoZWRSZXNvdXJjZSogTWVtb3J5Q2FjaGU6OnJlc291cmNlRm9yVVJMKGNvbnN0 IFVSTCYgcmVzb3VyY2VVUkwsIFNlc3Npb25JRCBzZQogCiBDYWNoZWRSZXNvdXJjZSogTWVtb3J5 Q2FjaGU6OnJlc291cmNlRm9yUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IFNlc3Npb25JRCBzZXNzaW9uSUQpCiB7Ci0gICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdElt cGwocmVxdWVzdCwgZ2V0U2Vzc2lvbk1hcChzZXNzaW9uSUQpKTsKKyAgICBhdXRvKiByZXNvdXJj ZXMgPSBzZXNzaW9uUmVzb3VyY2VNYXAoc2Vzc2lvbklEKTsKKyAgICBpZiAoIXJlc291cmNlcykK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHJlc291cmNlRm9yUmVxdWVzdElt cGwocmVxdWVzdCwgKnJlc291cmNlcyk7CiB9CiAKIENhY2hlZFJlc291cmNlKiBNZW1vcnlDYWNo ZTo6cmVzb3VyY2VGb3JSZXF1ZXN0SW1wbChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMpCkBAIC0yNTEsMTYgKzI1OCwxOSBAQCBib29s IE1lbW9yeUNhY2hlOjphZGRJbWFnZVRvQ2FjaGUoTmF0aXZlSW1hZ2VQdHIgaW1hZ2UsIGNvbnN0 IFVSTCYgdXJsLCBjb25zdCBTdAogCiB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21D YWNoZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBkb21haW5Gb3JDYWNoZVBhcnRpdGlv bikKIHsKLSAgICBDYWNoZWRSZXNvdXJjZU1hcCYgcmVzb3VyY2VzID0gZ2V0U2Vzc2lvbk1hcChT ZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSk7CisgICAgYXV0byogcmVzb3VyY2VzID0gc2Vz c2lvblJlc291cmNlTWFwKFNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKTsKKyAgICBpZiAo IXJlc291cmNlcykKKyAgICAgICAgcmV0dXJuOworCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElP TklORykKICAgICBDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2U7Ci0gICAgaWYgKENhY2hlZFJlc291 cmNlSXRlbSogaXRlbSA9IHJlc291cmNlcy5nZXQodXJsKSkKKyAgICBpZiAoQ2FjaGVkUmVzb3Vy Y2VJdGVtKiBpdGVtID0gcmVzb3VyY2VzLT5nZXQodXJsKSkKICAgICAgICAgcmVzb3VyY2UgPSBp dGVtLT5nZXQoUmVzb3VyY2VSZXF1ZXN0OjpwYXJ0aXRpb25OYW1lKGRvbWFpbkZvckNhY2hlUGFy dGl0aW9uKSk7CiAgICAgZWxzZQogICAgICAgICByZXNvdXJjZSA9IG51bGxwdHI7CiAjZWxzZQog ICAgIFVOVVNFRF9QQVJBTShkb21haW5Gb3JDYWNoZVBhcnRpdGlvbik7Ci0gICAgQ2FjaGVkUmVz b3VyY2UqIHJlc291cmNlID0gcmVzb3VyY2VzLmdldCh1cmwpOworICAgIENhY2hlZFJlc291cmNl KiByZXNvdXJjZSA9IHJlc291cmNlcy0+Z2V0KHVybCk7CiAjZW5kaWYKICAgICBpZiAoIXJlc291 cmNlKQogICAgICAgICByZXR1cm47CkBAIC00MTgsMzEgKzQyOCwzMyBAQCB2b2lkIE1lbW9yeUNh Y2hlOjpyZW1vdmUoQ2FjaGVkUmVzb3VyY2UmIHJlc291cmNlKQogICAgIExPRyhSZXNvdXJjZUxv YWRpbmcsICJFdmljdGluZyByZXNvdXJjZSAlcCBmb3IgJyVzJyBmcm9tIGNhY2hlIiwgJnJlc291 cmNlLCByZXNvdXJjZS51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwogICAgIC8vIFRo ZSByZXNvdXJjZSBtYXkgaGF2ZSBhbHJlYWR5IGJlZW4gcmVtb3ZlZCBieSBzb21lb25lIG90aGVy IHRoYW4gb3VyIGNhbGxlciwKICAgICAvLyB3aG8gbmVlZGVkIGEgZnJlc2ggY29weSBmb3IgYSBy ZWxvYWQuIFNlZSA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0Nzkj YzY+LgotICAgIENhY2hlZFJlc291cmNlTWFwJiByZXNvdXJjZXMgPSBnZXRTZXNzaW9uTWFwKHJl c291cmNlLnNlc3Npb25JRCgpKTsKLSAgICBpZiAocmVzb3VyY2UuaW5DYWNoZSgpKSB7Ci0gICAg ICAgIC8vIFJlbW92ZSBmcm9tIHRoZSByZXNvdXJjZSBtYXAuCisgICAgaWYgKGF1dG8qIHJlc291 cmNlcyA9IHNlc3Npb25SZXNvdXJjZU1hcChyZXNvdXJjZS5zZXNzaW9uSUQoKSkpIHsKKyAgICAg ICAgaWYgKHJlc291cmNlLmluQ2FjaGUoKSkgeworICAgICAgICAgICAgLy8gUmVtb3ZlIGZyb20g dGhlIHJlc291cmNlIG1hcC4KICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQotICAgICAg ICBDYWNoZWRSZXNvdXJjZUl0ZW0qIGl0ZW0gPSByZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgp KTsKLSAgICAgICAgaWYgKGl0ZW0pIHsKLSAgICAgICAgICAgIGl0ZW0tPnJlbW92ZShyZXNvdXJj ZS5jYWNoZVBhcnRpdGlvbigpKTsKLSAgICAgICAgICAgIGlmICghaXRlbS0+c2l6ZSgpKQotICAg ICAgICAgICAgICAgIHJlc291cmNlcy5yZW1vdmUocmVzb3VyY2UudXJsKCkpOwotICAgICAgICB9 CisgICAgICAgICAgICBDYWNoZWRSZXNvdXJjZUl0ZW0qIGl0ZW0gPSByZXNvdXJjZXMtPmdldChy ZXNvdXJjZS51cmwoKSk7CisgICAgICAgICAgICBpZiAoaXRlbSkgeworICAgICAgICAgICAgICAg IGl0ZW0tPnJlbW92ZShyZXNvdXJjZS5jYWNoZVBhcnRpdGlvbigpKTsKKyAgICAgICAgICAgICAg ICBpZiAoIWl0ZW0tPnNpemUoKSkKKyAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2VzLT5yZW1v dmUocmVzb3VyY2UudXJsKCkpOworICAgICAgICAgICAgfQogI2Vsc2UKLSAgICAgICAgcmVzb3Vy Y2VzLnJlbW92ZShyZXNvdXJjZS51cmwoKSk7CisgICAgICAgICAgICByZXNvdXJjZXMtPnJlbW92 ZShyZXNvdXJjZS51cmwoKSk7CiAjZW5kaWYKLSAgICAgICAgcmVzb3VyY2Uuc2V0SW5DYWNoZShm YWxzZSk7CisgICAgICAgICAgICByZXNvdXJjZS5zZXRJbkNhY2hlKGZhbHNlKTsKIAotICAgICAg ICAvLyBSZW1vdmUgZnJvbSB0aGUgYXBwcm9wcmlhdGUgTFJVIGxpc3QuCi0gICAgICAgIHJlbW92 ZUZyb21MUlVMaXN0KHJlc291cmNlKTsKLSAgICAgICAgcmVtb3ZlRnJvbUxpdmVEZWNvZGVkUmVz b3VyY2VzTGlzdChyZXNvdXJjZSk7Ci0gICAgICAgIGFkanVzdFNpemUocmVzb3VyY2UuaGFzQ2xp ZW50cygpLCAtc3RhdGljX2Nhc3Q8aW50PihyZXNvdXJjZS5zaXplKCkpKTsKLSAgICB9IGVsc2UK KyAgICAgICAgICAgIC8vIFJlbW92ZSBmcm9tIHRoZSBhcHByb3ByaWF0ZSBMUlUgbGlzdC4KKyAg ICAgICAgICAgIHJlbW92ZUZyb21MUlVMaXN0KHJlc291cmNlKTsKKyAgICAgICAgICAgIHJlbW92 ZUZyb21MaXZlRGVjb2RlZFJlc291cmNlc0xpc3QocmVzb3VyY2UpOworICAgICAgICAgICAgYWRq dXN0U2l6ZShyZXNvdXJjZS5oYXNDbGllbnRzKCksIC1zdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNl LnNpemUoKSkpOworICAgICAgICB9IGVsc2UgewogI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05J TkcpCi0gICAgICAgIEFTU0VSVCghcmVzb3VyY2VzLmdldChyZXNvdXJjZS51cmwoKSkgfHwgcmVz b3VyY2VzLmdldChyZXNvdXJjZS51cmwoKSktPmdldChyZXNvdXJjZS5jYWNoZVBhcnRpdGlvbigp KSAhPSAmcmVzb3VyY2UpOworICAgICAgICAgICAgQVNTRVJUKCFyZXNvdXJjZXMtPmdldChyZXNv dXJjZS51cmwoKSkgfHwgcmVzb3VyY2VzLT5nZXQocmVzb3VyY2UudXJsKCkpLT5nZXQocmVzb3Vy Y2UuY2FjaGVQYXJ0aXRpb24oKSkgIT0gJnJlc291cmNlKTsKICNlbHNlCi0gICAgICAgIEFTU0VS VChyZXNvdXJjZXMuZ2V0KHJlc291cmNlLnVybCgpKSAhPSAmcmVzb3VyY2UpOworICAgICAgICAg ICAgQVNTRVJUKHJlc291cmNlcy0+Z2V0KHJlc291cmNlLnVybCgpKSAhPSAmcmVzb3VyY2UpOwog I2VuZGlmCisgICAgICAgIH0KKyAgICB9CiAKICAgICByZXNvdXJjZS5kZWxldGVJZlBvc3NpYmxl KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2Fj aGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5oCmluZGV4IDkx Y2Y3ZDMwOTAyM2RiNDc1ZGU4MTAyNDM5ZDJlOWUxN2Q2ZmQ3YjEuLmNlMTIyM2MyMWQ1YTBjOWQ2 NmRkNzM3ZTgwZDBhOTc1NWM3NDIxYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9NZW1vcnlDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9N ZW1vcnlDYWNoZS5oCkBAIC0xODYsNyArMTg2LDkgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBk ZWFkQ2FwYWNpdHkoKSBjb25zdDsKIAogICAgIENhY2hlZFJlc291cmNlKiByZXNvdXJjZUZvclJl cXVlc3RJbXBsKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIENhY2hlZFJlc291cmNlTWFwJik7Ci0g ICAgQ2FjaGVkUmVzb3VyY2VNYXAmIGdldFNlc3Npb25NYXAoU2Vzc2lvbklEKTsKKworICAgIENh Y2hlZFJlc291cmNlTWFwJiBlbnN1cmVTZXNzaW9uUmVzb3VyY2VNYXAoU2Vzc2lvbklEKTsKKyAg ICBDYWNoZWRSZXNvdXJjZU1hcCogc2Vzc2lvblJlc291cmNlTWFwKFNlc3Npb25JRCkgY29uc3Q7 CiAKICAgICBib29sIG1fZGlzYWJsZWQ7ICAvLyBXaGV0aGVyIG9yIG5vdCB0aGUgY2FjaGUgaXMg ZW5hYmxlZC4KICAgICBib29sIG1faW5QcnVuZVJlc291cmNlczsK