226674 2021-06-04 20:43:11 -0700 Optimize a few call sites creating SharedBuffer objects 2021-06-05 01:09:52 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin eric.carlson ews-watchlist glenn hi hta jer.noble joepeck philipj sam sergio tommyw webkit-bug-importer oldest_to_newest 1767084 0 cdumez 2021-06-04 20:43:11 -0700 Optimization a few call sites creating SharedBuffer objects. 1767085 1 430640 cdumez 2021-06-04 20:44:53 -0700 Created attachment 430640 Patch 1767093 2 430640 darin 2021-06-04 21:18:02 -0700 Comment on attachment 430640 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430640&action=review > Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp:-1249 > - overrideData = SharedBuffer::create(content.utf8().data(), content.utf8().length()); Wow, we should grep for this mistake, even when it doesn’t involve SharedBuffer. > Source/WebKit/WebProcess/WebPage/WebPage.cpp:1651 > + auto sharedBuffer = SharedBuffer::create(data.data(), data.size()); Seems a little sad that we copy in all these IPC cases. But I guess getting lifetime right would be tricky if we used more of a data view instead of a copy. 1767112 3 ews-feeder 2021-06-04 22:46:03 -0700 Committed r278523 (238522@main): <https://commits.webkit.org/238522@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430640. 1767113 4 webkit-bug-importer 2021-06-04 22:47:15 -0700 <rdar://problem/78899496> 430640 2021-06-04 20:44:53 -0700 2021-06-05 01:09:52 -0700 Patch bug-226674-20210604204452.patch text/plain 9757 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY1Nzk4MGY1Mzk1ODEw NjE2NjhmNzdmOGYwYTZiOGE3ZDU1ZDljNC4uY2MzZTA1MzU1YWZmZWYyNTEwOTE3YWNlNzA1Y2E0 Njc1NmExMGY1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgYSBmZXcgY2Fs bCBzaXRlcyBjcmVhdGluZyBTaGFyZWRCdWZmZXIgb2JqZWN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Njc0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0 cFNGcmFtZVRyYW5zZm9ybS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0cmFuc2Zvcm1GcmFtZSk6 CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0FnZW50OjppbnRlcmNlcHRXaXRoUmVz cG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTmV0d29ya0FnZW50OjppbnRlcmNl cHRSZXF1ZXN0V2l0aFJlc3BvbnNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0RN UHJpdmF0ZUZhaXJQbGF5U3RyZWFtaW5nOjpleHRyYWN0S2V5SURzU2luZik6CisgICAgICAgICog d29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlckZldGNoLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJGZXRjaDo6cHJvY2Vzc1Jlc3BvbnNlKToKKwogMjAyMS0w Ni0wNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQgV2luZG93cyBidWlsZCBmaXggYWZ0ZXIgcjI3ODUxNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNGEzMDQ1OWQ3 ZTEwMTc5NTRkNjIwYTQ2OWVkMzA1NjE0MDIyMzhkYy4uMGFiMzlmZjZjNDI2MTUyODFmYzVkOWRk NWRkMzdmNjkyOWQ2ZGJjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNi0wNCAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIE9wdGltaXplIGEgZmV3 IGNhbGwgc2l0ZXMgY3JlYXRpbmcgU2hhcmVkQnVmZmVyIG9iamVjdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjY3NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkRGF0YUluRnJhbWUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OmxvYWRBbHRlcm5hdGVIVE1MKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9h ZFNpbXVsYXRlZFJlcXVlc3RBbmRSZXNwb25zZSk6CisKIDIwMjEtMDYtMDQgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIy NzU3NjUpIFdoZW4gaWdub3JpbmcgSFNUUywgc29tZXRpbWVzIGxvYWRzIGZhaWwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0ZyYW1lVHJhbnNm b3JtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUnRwU0ZyYW1l VHJhbnNmb3JtLmNwcAppbmRleCA0MDlmMzU3NGY3OWFmYjZiYzhmZGY2MGQzNTM1NDcyZWU5NDM3 MmQwLi41MmUyODgwYjgyMDdmNTljOGNmNzBhM2I5MmQxNzU4OWUxN2NjNGU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1J0cFNGcmFtZVRyYW5zZm9y bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENSdHBTRnJh bWVUcmFuc2Zvcm0uY3BwCkBAIC0xNTksNyArMTU5LDcgQEAgc3RhdGljIHZvaWQgdHJhbnNmb3Jt RnJhbWUoY29uc3QgdWludDhfdCogZGF0YSwgc2l6ZV90IHNpemUsIEpTRE9NR2xvYmFsT2JqZWN0 JgogICAgIGF1dG8gcmVzdWx0ID0gdHJhbnNmb3JtZXIudHJhbnNmb3JtKGRhdGEsIHNpemUpOwog ICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGKHJlc3VsdC5oYXNFeGNlcHRpb24oKSwgV2ViUlRDLCAi UlRDUnRwU0ZyYW1lVHJhbnNmb3JtIGZhaWxlZCB0cmFuc2Zvcm1pbmcgYSBmcmFtZSIpOwogCi0g ICAgYXV0byBidWZmZXIgPSByZXN1bHQuaGFzRXhjZXB0aW9uKCkgPyBTaGFyZWRCdWZmZXI6OmNy ZWF0ZSgpIDogU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVzdWx0LnJldHVyblZhbHVlKCkuZGF0YSgp LCByZXN1bHQucmV0dXJuVmFsdWUoKS5zaXplKCkpOworICAgIGF1dG8gYnVmZmVyID0gcmVzdWx0 Lmhhc0V4Y2VwdGlvbigpID8gU2hhcmVkQnVmZmVyOjpjcmVhdGUoKSA6IFNoYXJlZEJ1ZmZlcjo6 Y3JlYXRlKHJlc3VsdC5yZWxlYXNlUmV0dXJuVmFsdWUoKSk7CiAgICAgc291cmNlLmVucXVldWUo dG9KUygmZ2xvYmFsT2JqZWN0LCAmZ2xvYmFsT2JqZWN0LCBidWZmZXItPnRyeUNyZWF0ZUFycmF5 QnVmZmVyKCkuZ2V0KCkpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JOZXR3b3JrQWdlbnQuY3BwCmluZGV4IGM2OTY3MGUxYzMz MjUyODczOGNkZTAxZjFhZDA2N2JjY2IzOTAwOTEuLmQ0Zjc4NzNlODVmOTEzMTYwMTJiOTQ0MDg0 ZjkyMDk3NjAxZTA2NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2Vu dHMvSW5zcGVjdG9yTmV0d29ya0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3Rvck5ldHdvcmtBZ2VudC5jcHAKQEAgLTEyNDUsOCArMTI0NSwxMCBA QCBQcm90b2NvbDo6RXJyb3JTdHJpbmdPcjx2b2lkPiBJbnNwZWN0b3JOZXR3b3JrQWdlbnQ6Omlu dGVyY2VwdFdpdGhSZXNwb25zZShjb25zdAogICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVj dGVkKCJVbmFibGUgdG8gZGVjb2RlIGdpdmVuIGNvbnRlbnQiX3MpOwogCiAgICAgICAgIG92ZXJy aWRlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKFdURk1vdmUoKmJ1ZmZlcikpOwotICAgIH0g ZWxzZQotICAgICAgICBvdmVycmlkZURhdGEgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50 LnV0ZjgoKS5kYXRhKCksIGNvbnRlbnQudXRmOCgpLmxlbmd0aCgpKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICBhdXRvIHV0ZjhDb250ZW50ID0gY29udGVudC51dGY4KCk7CisgICAgICAgIG92ZXJy aWRlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHV0ZjhDb250ZW50LmRhdGEoKSwgdXRmOENv bnRlbnQubGVuZ3RoKCkpOworICAgIH0KIAogICAgIHBlbmRpbmdJbnRlcmNlcHRSZXNwb25zZS0+ cmVzcG9uZChvdmVycmlkZVJlc3BvbnNlLCBvdmVycmlkZURhdGEpOwogCkBAIC0xMjcxLDggKzEy NzMsMTAgQEAgUHJvdG9jb2w6OkVycm9yU3RyaW5nT3I8dm9pZD4gSW5zcGVjdG9yTmV0d29ya0Fn ZW50OjppbnRlcmNlcHRSZXF1ZXN0V2l0aFJlc3BvbnMKICAgICAgICAgICAgIHJldHVybiBtYWtl VW5leHBlY3RlZCgiVW5hYmxlIHRvIGRlY29kZSBnaXZlbiBjb250ZW50Il9zKTsKIAogICAgICAg ICBkYXRhID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoV1RGTW92ZSgqYnVmZmVyKSk7Ci0gICAgfSBl bHNlCi0gICAgICAgIGRhdGEgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50LnV0ZjgoKS5k YXRhKCksIGNvbnRlbnQudXRmOCgpLmxlbmd0aCgpKTsKKyAgICB9IGVsc2UgeworICAgICAgICBh dXRvIHV0ZjhDb250ZW50ID0gY29udGVudC51dGY4KCk7CisgICAgICAgIGRhdGEgPSBTaGFyZWRC dWZmZXI6OmNyZWF0ZSh1dGY4Q29udGVudC5kYXRhKCksIHV0ZjhDb250ZW50Lmxlbmd0aCgpKTsK KyAgICB9CiAKICAgICAvLyBNaW1pYyBkYXRhIFVSTCBsb2FkIGJlaGF2aW9yIC0gcmVwb3J0IGRp ZFJlY2VpdmVSZXNwb25zZSAmIGRpZEZpbmlzaExvYWRpbmcuCiAgICAgUmVzb3VyY2VSZXNwb25z ZSByZXNwb25zZShwZW5kaW5nUmVxdWVzdC0+bV9sb2FkZXItPnVybCgpLCBtaW1lVHlwZSwgZGF0 YS0+c2l6ZSgpLCBTdHJpbmcoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJlYW1pbmcuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0NETUZhaXJQbGF5U3RyZWFt aW5nLmNwcAppbmRleCA5ZmM1NzAzZWM0NTBlYTIxNzVlOTE4ZTZlMmY3OWNjMTEwOWFjMDRjLi42 NDVlMDY4MDg3Y2JiZTJhM2FhOTAxZjllODZmYjg2NTkzZmU0ZTRhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQ0RNRmFpclBsYXlTdHJl YW1pbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9DRE1GYWlyUGxheVN0cmVhbWluZy5jcHAKQEAgLTE3Nyw3ICsxNzcsNyBAQCBzdGQ6Om9w dGlvbmFsPFZlY3RvcjxSZWY8U2hhcmVkQnVmZmVyPj4+IENETVByaXZhdGVGYWlyUGxheVN0cmVh bWluZzo6ZXh0cmFjdEtleQogCiAgICAgZm9yIChhdXRvJiByZXN1bHQgOiByZXN1bHRzKSB7CiAg ICAgICAgIGlmICh2YWxpZEZhaXJQbGF5U3RyZWFtaW5nU2NoZW1lcygpLmNvbnRhaW5zKHJlc3Vs dC5maXJzdCkpCi0gICAgICAgICAgICBrZXlJRHMuYXBwZW5kKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRl KHJlc3VsdC5zZWNvbmQuZGF0YSgpLCByZXN1bHQuc2Vjb25kLnNpemUoKSkpOworICAgICAgICAg ICAga2V5SURzLmFwcGVuZChTaGFyZWRCdWZmZXI6OmNyZWF0ZShXVEZNb3ZlKHJlc3VsdC5zZWNv bmQpKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGtleUlEczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJGZXRjaC5jcHAgYi9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvY29udGV4dC9TZXJ2aWNlV29ya2VyRmV0Y2gu Y3BwCmluZGV4IGUxZGFhNDJkMTJjNTNjYzE0NzNjYWY4YmI4NjE5M2M0M2YzNDk0NGQuLmE3YmMy MzFiYmZmY2MzMzE5MDYwZWM0ZWUyODA4NjhkZDRiZjAxMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvc2VydmljZS9jb250ZXh0L1NlcnZpY2VXb3JrZXJGZXRjaC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL2NvbnRleHQvU2VydmljZVdvcmtlckZl dGNoLmNwcApAQCAtMTIxLDcgKzEyMSw3IEBAIHN0YXRpYyB2b2lkIHByb2Nlc3NSZXNwb25zZShS ZWY8Q2xpZW50PiYmIGNsaWVudCwgRXhwZWN0ZWQ8UmVmPEZldGNoUmVzcG9uc2U+LCBzCiAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChhdXRvIGNodW5rID0gcmVzdWx0LnJldHVyblZh bHVlKCkpCi0gICAgICAgICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShTaGFyZWRCdWZm ZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihjaHVuay0+ZGF0YSksIGNo dW5rLT5zaXplKSk7CisgICAgICAgICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShTaGFy ZWRCdWZmZXI6OmNyZWF0ZShjaHVuay0+ZGF0YSwgY2h1bmstPnNpemUpKTsKICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICBjbGllbnQtPmRpZEZpbmlzaCgpOwogICAgICAgICB9KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzFi NTM3ZmMzZTQ2MGYxYzFmNmQ3M2U0YjE1NDkyYWEwM2U0NmRlZi4uMjBlMWNlZGI4OTc1ZGI2NDAx ZjRjMTQxMWRlZmExZGQ5Mjk5YzU4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTE2NDgsNyArMTY0OCw3IEBAIHZvaWQgV2ViUGFnZTo6bG9h ZERhdGFJbkZyYW1lKElQQzo6RGF0YVJlZmVyZW5jZSYmIGRhdGEsIFN0cmluZyYmIE1JTUVUeXBl LCBTdHJpCiAgICAgICAgIHJldHVybjsKICAgICBBU1NFUlQoJm1haW5XZWJGcmFtZSgpICE9IGZy YW1lKTsKIAotICAgIGF1dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVp bnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5kYXRhKCkpLCBkYXRhLnNpemUoKSk7Cisg ICAgYXV0byBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhLmRhdGEoKSwg ZGF0YS5zaXplKCkpOwogICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UoYmFzZVVSTCwgTUlN RVR5cGUsIHNoYXJlZEJ1ZmZlci0+c2l6ZSgpLCBlbmNvZGluZ05hbWUpOwogICAgIFN1YnN0aXR1 dGVEYXRhIHN1YnN0aXR1dGVEYXRhKFdURk1vdmUoc2hhcmVkQnVmZmVyKSwgYmFzZVVSTCwgV1RG TW92ZShyZXNwb25zZSksIFN1YnN0aXR1dGVEYXRhOjpTZXNzaW9uSGlzdG9yeVZpc2liaWxpdHk6 OkhpZGRlbik7CiAgICAgZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkKEZyYW1lTG9h ZFJlcXVlc3QoKmZyYW1lLT5jb3JlRnJhbWUoKSwgUmVzb3VyY2VSZXF1ZXN0KGJhc2VVUkwpLCBX VEZNb3ZlKHN1YnN0aXR1dGVEYXRhKSkpOwpAQCAtMTczMyw3ICsxNzMzLDcgQEAgdm9pZCBXZWJQ YWdlOjpsb2FkRGF0YShMb2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzKQogewogICAgIHBs YXRmb3JtRGlkUmVjZWl2ZUxvYWRQYXJhbWV0ZXJzKGxvYWRQYXJhbWV0ZXJzKTsKIAotICAgIGF1 dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxj b25zdCBjaGFyKj4obG9hZFBhcmFtZXRlcnMuZGF0YS5kYXRhKCkpLCBsb2FkUGFyYW1ldGVycy5k YXRhLnNpemUoKSk7CisgICAgYXV0byBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0 ZShsb2FkUGFyYW1ldGVycy5kYXRhLmRhdGEoKSwgbG9hZFBhcmFtZXRlcnMuZGF0YS5zaXplKCkp OwogICAgIFVSTCBiYXNlVVJMID0gbG9hZFBhcmFtZXRlcnMuYmFzZVVSTFN0cmluZy5pc0VtcHR5 KCkgPyBhYm91dEJsYW5rVVJMKCkgOiBVUkwoVVJMKCksIGxvYWRQYXJhbWV0ZXJzLmJhc2VVUkxT dHJpbmcpOwogICAgIGxvYWREYXRhSW1wbChsb2FkUGFyYW1ldGVycy5uYXZpZ2F0aW9uSUQsIGxv YWRQYXJhbWV0ZXJzLnNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgV1RGTW92ZShsb2FkUGFy YW1ldGVycy53ZWJzaXRlUG9saWNpZXMpLCBXVEZNb3ZlKHNoYXJlZEJ1ZmZlciksIGxvYWRQYXJh bWV0ZXJzLk1JTUVUeXBlLCBsb2FkUGFyYW1ldGVycy5lbmNvZGluZ05hbWUsIGJhc2VVUkwsIFVS TCgpLCBsb2FkUGFyYW1ldGVycy51c2VyRGF0YSwgbG9hZFBhcmFtZXRlcnMuaXNOYXZpZ2F0aW5n VG9BcHBCb3VuZERvbWFpbiwgbG9hZFBhcmFtZXRlcnMuc2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeSk7CiB9CkBAIC0xNzQ1LDcgKzE3NDUsNyBAQCB2b2lkIFdlYlBhZ2U6OmxvYWRBbHRlcm5h dGVIVE1MKExvYWRQYXJhbWV0ZXJzJiYgbG9hZFBhcmFtZXRlcnMpCiAgICAgVVJMIGJhc2VVUkwg PSBsb2FkUGFyYW1ldGVycy5iYXNlVVJMU3RyaW5nLmlzRW1wdHkoKSA/IGFib3V0QmxhbmtVUkwo KSA6IFVSTChVUkwoKSwgbG9hZFBhcmFtZXRlcnMuYmFzZVVSTFN0cmluZyk7CiAgICAgVVJMIHVu cmVhY2hhYmxlVVJMID0gbG9hZFBhcmFtZXRlcnMudW5yZWFjaGFibGVVUkxTdHJpbmcuaXNFbXB0 eSgpID8gVVJMKCkgOiBVUkwoVVJMKCksIGxvYWRQYXJhbWV0ZXJzLnVucmVhY2hhYmxlVVJMU3Ry aW5nKTsKICAgICBVUkwgcHJvdmlzaW9uYWxMb2FkRXJyb3JVUkwgPSBsb2FkUGFyYW1ldGVycy5w cm92aXNpb25hbExvYWRFcnJvclVSTFN0cmluZy5pc0VtcHR5KCkgPyBVUkwoKSA6IFVSTChVUkwo KSwgbG9hZFBhcmFtZXRlcnMucHJvdmlzaW9uYWxMb2FkRXJyb3JVUkxTdHJpbmcpOwotICAgIGF1 dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxj b25zdCBjaGFyKj4obG9hZFBhcmFtZXRlcnMuZGF0YS5kYXRhKCkpLCBsb2FkUGFyYW1ldGVycy5k YXRhLnNpemUoKSk7CisgICAgYXV0byBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0 ZShsb2FkUGFyYW1ldGVycy5kYXRhLmRhdGEoKSwgbG9hZFBhcmFtZXRlcnMuZGF0YS5zaXplKCkp OwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc2V0UHJvdmlzaW9uYWxM b2FkRXJyb3JCZWluZ0hhbmRsZWRVUkwocHJvdmlzaW9uYWxMb2FkRXJyb3JVUkwpOyAgICAKICAg ICBsb2FkRGF0YUltcGwobG9hZFBhcmFtZXRlcnMubmF2aWdhdGlvbklELCBsb2FkUGFyYW1ldGVy cy5zaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQsIFdURk1vdmUobG9hZFBhcmFtZXRlcnMud2Vi c2l0ZVBvbGljaWVzKSwgV1RGTW92ZShzaGFyZWRCdWZmZXIpLCBsb2FkUGFyYW1ldGVycy5NSU1F VHlwZSwgbG9hZFBhcmFtZXRlcnMuZW5jb2RpbmdOYW1lLCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVS TCwgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEsIGxvYWRQYXJhbWV0ZXJzLmlzTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW4pOwogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCku c2V0UHJvdmlzaW9uYWxMb2FkRXJyb3JCZWluZ0hhbmRsZWRVUkwoeyB9KTsKQEAgLTE3NjAsNyAr MTc2MCw3IEBAIHZvaWQgV2ViUGFnZTo6bG9hZFNpbXVsYXRlZFJlcXVlc3RBbmRSZXNwb25zZShM b2FkUGFyYW1ldGVycyYmIGxvYWRQYXJhbWV0ZXJzLCBSCiAKICAgICBwbGF0Zm9ybURpZFJlY2Vp dmVMb2FkUGFyYW1ldGVycyhsb2FkUGFyYW1ldGVycyk7CiAKLSAgICBhdXRvIHNoYXJlZEJ1ZmZl ciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGxv YWRQYXJhbWV0ZXJzLmRhdGEuZGF0YSgpKSwgbG9hZFBhcmFtZXRlcnMuZGF0YS5zaXplKCkpOwor ICAgIGF1dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUobG9hZFBhcmFtZXRl cnMuZGF0YS5kYXRhKCksIGxvYWRQYXJhbWV0ZXJzLmRhdGEuc2l6ZSgpKTsKIAogI2lmIEVOQUJM RShBUFBfQk9VTkRfRE9NQUlOUykKICAgICBzZXRJc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWlu KGxvYWRQYXJhbWV0ZXJzLmlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4sICZtX21haW5GcmFt ZS5nZXQoKSk7Cg==