136000 2014-08-15 16:01:01 -0700 Use modern for loop instead of iterators in SharedBufferCF.cpp 2014-08-18 16:23:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki commit-queue psolanki oldest_to_newest 1029494 0 psolanki 2014-08-15 16:01:01 -0700 SharedBufferCF.cpp could use some for loop updates. 1029495 1 236685 psolanki 2014-08-15 16:02:32 -0700 Created attachment 236685 Patch 1029497 2 commit-queue 2014-08-15 16:05:06 -0700 Attachment 236685 did not pass style-queue: ERROR: Source/WebCore/platform/cf/SharedBufferCF.cpp:160: Missing space before ( in for( [whitespace/parens] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1029501 3 236687 psolanki 2014-08-15 16:07:59 -0700 Created attachment 236687 Patch 1029562 4 236687 ap 2014-08-15 21:02:45 -0700 Comment on attachment 236687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236687&action=review > Source/WebCore/platform/cf/SharedBufferCF.cpp:157 > + for (auto cfData : m_dataArray) { This makes the code slightly slower, as it makes a new RetainPtr which churns refcount. 1029569 5 236687 kling 2014-08-15 21:08:49 -0700 Comment on attachment 236687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236687&action=review >> Source/WebCore/platform/cf/SharedBufferCF.cpp:157 >> + for (auto cfData : m_dataArray) { > > This makes the code slightly slower, as it makes a new RetainPtr which churns refcount. Using auto& would avoid that. 1029824 6 236773 psolanki 2014-08-18 12:09:00 -0700 Created attachment 236773 Patch 1029911 7 psolanki 2014-08-18 16:23:20 -0700 Committed r172735: <http://trac.webkit.org/changeset/172735> 236685 2014-08-15 16:02:32 -0700 2014-08-15 16:07:59 -0700 Patch 136000.patch text/plain 2704 psolanki ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZGU1YTg4Li4xNzU0M2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTQtMDgtMTUgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisg ICAgICAgIFVzZSBtb2Rlcm4gZm9yIGxvb3AgaW5zdGVhZCBvZiBpdGVyYXRvcnMgaW4gU2hhcmVk QnVmZmVyQ0YuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYwMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL2NmL1NoYXJlZEJ1ZmZlckNGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNoYXJlZEJ1ZmZlcjo6Y29weUJ1ZmZlckFuZENsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcjo6Y29weVNvbWVEYXRhRnJvbURhdGFBcnJheSk6CisKIDIwMTQtMDgtMTMgIFBy YXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgRGlza0Nh Y2hlTW9uaXRvciB0byBXZWJDb3JlIHNvIHRoYXQgV2ViS2l0MSBjbGllbnRzIGNhbiB1c2UgaXQg YXMgd2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvU2hhcmVkQnVm ZmVyQ0YuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvU2hhcmVkQnVmZmVyQ0YuY3Bw CmluZGV4IGY2OWYyNTEuLjJjMDRmNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NmL1NoYXJlZEJ1ZmZlckNGLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j Zi9TaGFyZWRCdWZmZXJDRi5jcHAKQEAgLTE1NCwxMSArMTU0LDEwIEBAIHZvaWQgU2hhcmVkQnVm ZmVyOjpjb3B5QnVmZmVyQW5kQ2xlYXIoY2hhciogZGVzdGluYXRpb24sIHVuc2lnbmVkIGJ5dGVz VG9Db3B5KSBjCiAgICAgICAgIHJldHVybjsKIAogICAgIENGSW5kZXggYnl0ZXNMZWZ0ID0gYnl0 ZXNUb0NvcHk7Ci0gICAgVmVjdG9yPFJldGFpblB0cjxDRkRhdGFSZWY+Pjo6Y29uc3RfaXRlcmF0 b3IgZW5kID0gbV9kYXRhQXJyYXkuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8UmV0YWluUHRyPENG RGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZGF0YUFycmF5LmJlZ2luKCk7IGl0ICE9 IGVuZDsgKytpdCkgewotICAgICAgICBDRkluZGV4IGRhdGFMZW4gPSBDRkRhdGFHZXRMZW5ndGgo aXQtPmdldCgpKTsKKyAgICBmb3IoYXV0byBjZkRhdGEgOiBtX2RhdGFBcnJheSkgeworICAgICAg ICBDRkluZGV4IGRhdGFMZW4gPSBDRkRhdGFHZXRMZW5ndGgoY2ZEYXRhLmdldCgpKTsKICAgICAg ICAgQVNTRVJUKGJ5dGVzTGVmdCA+PSBkYXRhTGVuKTsKLSAgICAgICAgbWVtY3B5KGRlc3RpbmF0 aW9uLCBDRkRhdGFHZXRCeXRlUHRyKGl0LT5nZXQoKSksIGRhdGFMZW4pOworICAgICAgICBtZW1j cHkoZGVzdGluYXRpb24sIENGRGF0YUdldEJ5dGVQdHIoY2ZEYXRhLmdldCgpKSwgZGF0YUxlbik7 CiAgICAgICAgIGRlc3RpbmF0aW9uICs9IGRhdGFMZW47CiAgICAgICAgIGJ5dGVzTGVmdCAtPSBk YXRhTGVuOwogICAgIH0KQEAgLTE2NywxNCArMTY2LDEzIEBAIHZvaWQgU2hhcmVkQnVmZmVyOjpj b3B5QnVmZmVyQW5kQ2xlYXIoY2hhciogZGVzdGluYXRpb24sIHVuc2lnbmVkIGJ5dGVzVG9Db3B5 KSBjCiAKIHVuc2lnbmVkIFNoYXJlZEJ1ZmZlcjo6Y29weVNvbWVEYXRhRnJvbURhdGFBcnJheShj b25zdCBjaGFyKiYgc29tZURhdGEsIHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdAogewotICAgIFZl Y3RvcjxSZXRhaW5QdHI8Q0ZEYXRhUmVmPj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fZGF0YUFy cmF5LmVuZCgpOwogICAgIHVuc2lnbmVkIHRvdGFsT2Zmc2V0ID0gMDsKLSAgICBmb3IgKFZlY3Rv cjxSZXRhaW5QdHI8Q0ZEYXRhUmVmPj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9kYXRhQXJyYXku YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIHVuc2lnbmVkIGRhdGFMZW4gPSBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oQ0ZEYXRhR2V0TGVuZ3RoKGl0LT5nZXQoKSkpOworICAgIGZv ciAoYXV0byBjZkRhdGEgOiBtX2RhdGFBcnJheSkgeworICAgICAgICB1bnNpZ25lZCBkYXRhTGVu ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KENGRGF0YUdldExlbmd0aChjZkRhdGEuZ2V0KCkpKTsK ICAgICAgICAgQVNTRVJUKHRvdGFsT2Zmc2V0IDw9IHBvc2l0aW9uKTsKICAgICAgICAgdW5zaWdu ZWQgbG9jYWxPZmZzZXQgPSBwb3NpdGlvbiAtIHRvdGFsT2Zmc2V0OwogICAgICAgICBpZiAobG9j YWxPZmZzZXQgPCBkYXRhTGVuKSB7Ci0gICAgICAgICAgICBzb21lRGF0YSA9IHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgY2hhciAqPihDRkRhdGFHZXRCeXRlUHRyKGl0LT5nZXQoKSkpICsgbG9jYWxP ZmZzZXQ7CisgICAgICAgICAgICBzb21lRGF0YSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hh ciAqPihDRkRhdGFHZXRCeXRlUHRyKGNmRGF0YS5nZXQoKSkpICsgbG9jYWxPZmZzZXQ7CiAgICAg ICAgICAgICByZXR1cm4gZGF0YUxlbiAtIGxvY2FsT2Zmc2V0OwogICAgICAgICB9CiAgICAgICAg IHRvdGFsT2Zmc2V0ICs9IGRhdGFMZW47Cg== 236687 2014-08-15 16:07:59 -0700 2014-08-18 12:08:56 -0700 Patch 136000.patch text/plain 2705 psolanki ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZGU1YTg4Li4xNzU0M2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTQtMDgtMTUgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisg ICAgICAgIFVzZSBtb2Rlcm4gZm9yIGxvb3AgaW5zdGVhZCBvZiBpdGVyYXRvcnMgaW4gU2hhcmVk QnVmZmVyQ0YuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzYwMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBsYXRmb3JtL2NmL1NoYXJlZEJ1ZmZlckNGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNoYXJlZEJ1ZmZlcjo6Y29weUJ1ZmZlckFuZENsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNo YXJlZEJ1ZmZlcjo6Y29weVNvbWVEYXRhRnJvbURhdGFBcnJheSk6CisKIDIwMTQtMDgtMTMgIFBy YXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgRGlza0Nh Y2hlTW9uaXRvciB0byBXZWJDb3JlIHNvIHRoYXQgV2ViS2l0MSBjbGllbnRzIGNhbiB1c2UgaXQg YXMgd2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvU2hhcmVkQnVm ZmVyQ0YuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvU2hhcmVkQnVmZmVyQ0YuY3Bw CmluZGV4IGY2OWYyNTEuLjMxOTgzOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NmL1NoYXJlZEJ1ZmZlckNGLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j Zi9TaGFyZWRCdWZmZXJDRi5jcHAKQEAgLTE1NCwxMSArMTU0LDEwIEBAIHZvaWQgU2hhcmVkQnVm ZmVyOjpjb3B5QnVmZmVyQW5kQ2xlYXIoY2hhciogZGVzdGluYXRpb24sIHVuc2lnbmVkIGJ5dGVz VG9Db3B5KSBjCiAgICAgICAgIHJldHVybjsKIAogICAgIENGSW5kZXggYnl0ZXNMZWZ0ID0gYnl0 ZXNUb0NvcHk7Ci0gICAgVmVjdG9yPFJldGFpblB0cjxDRkRhdGFSZWY+Pjo6Y29uc3RfaXRlcmF0 b3IgZW5kID0gbV9kYXRhQXJyYXkuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8UmV0YWluUHRyPENG RGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZGF0YUFycmF5LmJlZ2luKCk7IGl0ICE9 IGVuZDsgKytpdCkgewotICAgICAgICBDRkluZGV4IGRhdGFMZW4gPSBDRkRhdGFHZXRMZW5ndGgo aXQtPmdldCgpKTsKKyAgICBmb3IgKGF1dG8gY2ZEYXRhIDogbV9kYXRhQXJyYXkpIHsKKyAgICAg ICAgQ0ZJbmRleCBkYXRhTGVuID0gQ0ZEYXRhR2V0TGVuZ3RoKGNmRGF0YS5nZXQoKSk7CiAgICAg ICAgIEFTU0VSVChieXRlc0xlZnQgPj0gZGF0YUxlbik7Ci0gICAgICAgIG1lbWNweShkZXN0aW5h dGlvbiwgQ0ZEYXRhR2V0Qnl0ZVB0cihpdC0+Z2V0KCkpLCBkYXRhTGVuKTsKKyAgICAgICAgbWVt Y3B5KGRlc3RpbmF0aW9uLCBDRkRhdGFHZXRCeXRlUHRyKGNmRGF0YS5nZXQoKSksIGRhdGFMZW4p OwogICAgICAgICBkZXN0aW5hdGlvbiArPSBkYXRhTGVuOwogICAgICAgICBieXRlc0xlZnQgLT0g ZGF0YUxlbjsKICAgICB9CkBAIC0xNjcsMTQgKzE2NiwxMyBAQCB2b2lkIFNoYXJlZEJ1ZmZlcjo6 Y29weUJ1ZmZlckFuZENsZWFyKGNoYXIqIGRlc3RpbmF0aW9uLCB1bnNpZ25lZCBieXRlc1RvQ29w eSkgYwogCiB1bnNpZ25lZCBTaGFyZWRCdWZmZXI6OmNvcHlTb21lRGF0YUZyb21EYXRhQXJyYXko Y29uc3QgY2hhciomIHNvbWVEYXRhLCB1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKIHsKLSAgICBW ZWN0b3I8UmV0YWluUHRyPENGRGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2RhdGFB cnJheS5lbmQoKTsKICAgICB1bnNpZ25lZCB0b3RhbE9mZnNldCA9IDA7Ci0gICAgZm9yIChWZWN0 b3I8UmV0YWluUHRyPENGRGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZGF0YUFycmF5 LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICB1bnNpZ25lZCBkYXRhTGVuID0g c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KENGRGF0YUdldExlbmd0aChpdC0+Z2V0KCkpKTsKKyAgICBm b3IgKGF1dG8gY2ZEYXRhIDogbV9kYXRhQXJyYXkpIHsKKyAgICAgICAgdW5zaWduZWQgZGF0YUxl biA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihDRkRhdGFHZXRMZW5ndGgoY2ZEYXRhLmdldCgpKSk7 CiAgICAgICAgIEFTU0VSVCh0b3RhbE9mZnNldCA8PSBwb3NpdGlvbik7CiAgICAgICAgIHVuc2ln bmVkIGxvY2FsT2Zmc2V0ID0gcG9zaXRpb24gLSB0b3RhbE9mZnNldDsKICAgICAgICAgaWYgKGxv Y2FsT2Zmc2V0IDwgZGF0YUxlbikgewotICAgICAgICAgICAgc29tZURhdGEgPSByZWludGVycHJl dF9jYXN0PGNvbnN0IGNoYXIgKj4oQ0ZEYXRhR2V0Qnl0ZVB0cihpdC0+Z2V0KCkpKSArIGxvY2Fs T2Zmc2V0OworICAgICAgICAgICAgc29tZURhdGEgPSByZWludGVycHJldF9jYXN0PGNvbnN0IGNo YXIgKj4oQ0ZEYXRhR2V0Qnl0ZVB0cihjZkRhdGEuZ2V0KCkpKSArIGxvY2FsT2Zmc2V0OwogICAg ICAgICAgICAgcmV0dXJuIGRhdGFMZW4gLSBsb2NhbE9mZnNldDsKICAgICAgICAgfQogICAgICAg ICB0b3RhbE9mZnNldCArPSBkYXRhTGVuOwo= 236773 2014-08-18 12:09:00 -0700 2014-08-18 12:39:41 -0700 Patch bug-136000-20140818120851.patch text/plain 3164 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyNzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcxZjAxOWZiYWYwY2Q5 ZTZhMzg5MzhmMjJjODA3ZDk4N2U1MWJjOC4uYjg0ZTJmZTFiNDZhYTViODM2Y2FiNjJjMDY0Yjcy YTUwOGQ5ZmZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA4LTE4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgbW9kZXJuIGZv ciBsb29wIGluc3RlYWQgb2YgaXRlcmF0b3JzIGluIFNoYXJlZEJ1ZmZlckNGLmNwcAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2MDAwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jZi9T aGFyZWRCdWZmZXJDRi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNvcHlC dWZmZXJBbmRDbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNvcHlTb21l RGF0YUZyb21EYXRhQXJyYXkpOgorCiAyMDE0LTA4LTE4ICBEaXJrIFNjaHVsemUgIDxrcml0QHdl YmtpdC5vcmc+CiAKICAgICAgICAgY2FsYygpIGRvZXNuJ3Qgd29yayBmb3IgU1ZHIENTUyBwcm9w ZXJ0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9TaGFyZWRCdWZm ZXJDRi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9TaGFyZWRCdWZmZXJDRi5jcHAK aW5kZXggZGU5YTc2MjUxYWZiY2ZiMWM2YzdmNTQ1NGRmNjQ2MDk2YmE4NTc0Yy4uZGY0ZDY4ZDFi MmFkN2UzMmYyOTlhZDVkOTY4NTg3MzFmNzI0ZDUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vY2YvU2hhcmVkQnVmZmVyQ0YuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2NmL1NoYXJlZEJ1ZmZlckNGLmNwcApAQCAtMTU3LDExICsxNTcsMTAgQEAgdm9pZCBT aGFyZWRCdWZmZXI6OmNvcHlCdWZmZXJBbmRDbGVhcihjaGFyKiBkZXN0aW5hdGlvbiwgdW5zaWdu ZWQgYnl0ZXNUb0NvcHkpIGMKICAgICAgICAgcmV0dXJuOwogCiAgICAgQ0ZJbmRleCBieXRlc0xl ZnQgPSBieXRlc1RvQ29weTsKLSAgICBWZWN0b3I8UmV0YWluUHRyPENGRGF0YVJlZj4+Ojpjb25z dF9pdGVyYXRvciBlbmQgPSBtX2RhdGFBcnJheS5lbmQoKTsKLSAgICBmb3IgKFZlY3RvcjxSZXRh aW5QdHI8Q0ZEYXRhUmVmPj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9kYXRhQXJyYXkuYmVnaW4o KTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIENGSW5kZXggZGF0YUxlbiA9IENGRGF0YUdl dExlbmd0aChpdC0+Z2V0KCkpOworICAgIGZvciAoYXV0byYgY2ZEYXRhIDogbV9kYXRhQXJyYXkp IHsKKyAgICAgICAgQ0ZJbmRleCBkYXRhTGVuID0gQ0ZEYXRhR2V0TGVuZ3RoKGNmRGF0YS5nZXQo KSk7CiAgICAgICAgIEFTU0VSVChieXRlc0xlZnQgPj0gZGF0YUxlbik7Ci0gICAgICAgIG1lbWNw eShkZXN0aW5hdGlvbiwgQ0ZEYXRhR2V0Qnl0ZVB0cihpdC0+Z2V0KCkpLCBkYXRhTGVuKTsKKyAg ICAgICAgbWVtY3B5KGRlc3RpbmF0aW9uLCBDRkRhdGFHZXRCeXRlUHRyKGNmRGF0YS5nZXQoKSks IGRhdGFMZW4pOwogICAgICAgICBkZXN0aW5hdGlvbiArPSBkYXRhTGVuOwogICAgICAgICBieXRl c0xlZnQgLT0gZGF0YUxlbjsKICAgICB9CkBAIC0xNzAsMTQgKzE2OSwxMyBAQCB2b2lkIFNoYXJl ZEJ1ZmZlcjo6Y29weUJ1ZmZlckFuZENsZWFyKGNoYXIqIGRlc3RpbmF0aW9uLCB1bnNpZ25lZCBi eXRlc1RvQ29weSkgYwogCiB1bnNpZ25lZCBTaGFyZWRCdWZmZXI6OmNvcHlTb21lRGF0YUZyb21E YXRhQXJyYXkoY29uc3QgY2hhciomIHNvbWVEYXRhLCB1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QK IHsKLSAgICBWZWN0b3I8UmV0YWluUHRyPENGRGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBlbmQg PSBtX2RhdGFBcnJheS5lbmQoKTsKICAgICB1bnNpZ25lZCB0b3RhbE9mZnNldCA9IDA7Ci0gICAg Zm9yIChWZWN0b3I8UmV0YWluUHRyPENGRGF0YVJlZj4+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1f ZGF0YUFycmF5LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICB1bnNpZ25lZCBk YXRhTGVuID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KENGRGF0YUdldExlbmd0aChpdC0+Z2V0KCkp KTsKKyAgICBmb3IgKGF1dG8mIGNmRGF0YSA6IG1fZGF0YUFycmF5KSB7CisgICAgICAgIHVuc2ln bmVkIGRhdGFMZW4gPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oQ0ZEYXRhR2V0TGVuZ3RoKGNmRGF0 YS5nZXQoKSkpOwogICAgICAgICBBU1NFUlQodG90YWxPZmZzZXQgPD0gcG9zaXRpb24pOwogICAg ICAgICB1bnNpZ25lZCBsb2NhbE9mZnNldCA9IHBvc2l0aW9uIC0gdG90YWxPZmZzZXQ7CiAgICAg ICAgIGlmIChsb2NhbE9mZnNldCA8IGRhdGFMZW4pIHsKLSAgICAgICAgICAgIHNvbWVEYXRhID0g cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyICo+KENGRGF0YUdldEJ5dGVQdHIoaXQtPmdldCgp KSkgKyBsb2NhbE9mZnNldDsKKyAgICAgICAgICAgIHNvbWVEYXRhID0gcmVpbnRlcnByZXRfY2Fz dDxjb25zdCBjaGFyICo+KENGRGF0YUdldEJ5dGVQdHIoY2ZEYXRhLmdldCgpKSkgKyBsb2NhbE9m ZnNldDsKICAgICAgICAgICAgIHJldHVybiBkYXRhTGVuIC0gbG9jYWxPZmZzZXQ7CiAgICAgICAg IH0KICAgICAgICAgdG90YWxPZmZzZXQgKz0gZGF0YUxlbjsKQEAgLTIwNSw3ICsyMDMsNyBAQCBi b29sIFNoYXJlZEJ1ZmZlcjo6bWF5YmVBcHBlbmREYXRhQXJyYXkoU2hhcmVkQnVmZmVyKiBkYXRh KQogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICB1bnNpZ25lZCBvcmlnaW5hbFNpemUgPSBzaXpl KCk7CiAjZW5kaWYKLSAgICBmb3IgKGF1dG8gY2ZEYXRhIDogZGF0YS0+bV9kYXRhQXJyYXkpCisg ICAgZm9yIChhdXRvJiBjZkRhdGEgOiBkYXRhLT5tX2RhdGFBcnJheSkKICAgICAgICAgYXBwZW5k KGNmRGF0YS5nZXQoKSk7CiAgICAgQVNTRVJUKHNpemUoKSA9PSBvcmlnaW5hbFNpemUgKyBkYXRh LT5zaXplKCkpOwogICAgIHJldHVybiB0cnVlOwo=