188944 2018-08-25 06:34:31 -0700 Shrink size of XMLHttpRequest 2018-08-30 03:24:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki benjamin cdumez cmarcelo darin dbates ews-watchlist rniwa saam simon.fraser webkit-bug-importer oldest_to_newest 1453673 0 ysuzuki 2018-08-25 06:34:31 -0700 Shrink size of XMLHttpRequest 1453674 1 348076 ysuzuki 2018-08-25 06:35:59 -0700 Created attachment 348076 Patch 1453824 2 ysuzuki 2018-08-27 01:31:04 -0700 Committed r235355: <https://trac.webkit.org/changeset/235355> 1453826 3 webkit-bug-importer 2018-08-27 01:33:31 -0700 <rdar://problem/43746199> 1453910 4 348076 simon.fraser 2018-08-27 09:27:22 -0700 Comment on attachment 348076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348076&action=review > Source/WebCore/xml/XMLHttpRequest.h:203 > + unsigned m_readyState : 3; > + unsigned m_responseType : 3; In cases like this I like to see a comment documenting the enum name. 1453917 5 348076 ysuzuki 2018-08-27 09:32:02 -0700 Comment on attachment 348076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348076&action=review >> Source/WebCore/xml/XMLHttpRequest.h:203 >> + unsigned m_responseType : 3; > > In cases like this I like to see a comment documenting the enum name. Sounds good! I've added this. 1455191 6 ysuzuki 2018-08-30 03:24:21 -0700 Committed r235498: <https://trac.webkit.org/changeset/235498> 348076 2018-08-25 06:35:59 -0700 2018-08-25 09:14:14 -0700 Patch bug-188944-20180825223558.patch text/plain 22823 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDlmYTRmZDVmN2Y1NjgwYjYzOWFlYTBm YjdkNDBkY2I1MjY1YWUyMjkuLmEwN2Y5N2YyOTJiYTQ5MDY4ZmQyNmMwNGMyMGNlNWU5MTgxOTQ3 YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDgtMjUgIFl1c3VrZSBTdXp1a2kgIDx5dXN1 a2VzdXp1a2lAc2xvd3N0YXJ0Lm9yZz4KKworICAgICAgICBTaHJpbmsgc2l6ZSBvZiBYTUxIdHRw UmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTg4OTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U3RyaW5nQnVpbGRlciBpcyBpbmNsdWRlZCBpbiBYTUxIdHRwUmVxdWVzdC4gV2UgcmVkdWNlIHRo ZSBzaXplIG9mIFN0cmluZ0J1aWxkZXIgdG9vCisgICAgICAgIGJ5IHJlb3JkZXJpbmcgbWVtYmVy cy4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaDoKKyAgICAgICAgKFdURjo6 U3RyaW5nQnVpbGRlcjo6U3RyaW5nQnVpbGRlcik6CisKIDIwMTgtMDgtMjQgIFRpbSBIb3J0b24g IDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSB1bmlmaWVkIHNv dXJjZSBnZW5lcmF0b3Igc2NyaXB0IGxvZ2dpbmcgYW5kIGVycm9yIG1lc3NhZ2VzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggMzAyYzk0MmE4Y2I3ZTQzZDVkZmM0NmQ1Y2JiMTg5NWU3OWI0YjE3Ni4uY2Y1ZDFmOTMy ZTdjY2NjMThhZDg4MWE3MzA0MTM0OTJiMzY5YWE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2 IEBACisyMDE4LTA4LTI1ICBZdXN1a2UgU3V6dWtpICA8eXVzdWtlc3V6dWtpQHNsb3dzdGFydC5v cmc+CisKKyAgICAgICAgU2hyaW5rIHNpemUgb2YgWE1MSHR0cFJlcXVlc3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODk0NAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNocmluayB0aGUgc2l6ZSBvZiBY TUxIdHRwUmVxdWVzdCBieSBwYWNraW5nIGJpdHMgYW5kIHJlb3JkZXJpbmcgbWVtYmVycy4KKyAg ICAgICAgSXQgcmVkdWNlcyB0aGUgc2l6ZSBmcm9tIDEyNDggdG8gMTE3Ni4KKworICAgICAgICBO byBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OlhNTEh0dHBSZXF1ZXN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6WE1MSHR0cFJlcXVlc3Q6OmNyZWF0ZVJlc3BvbnNlQmxvYik6CisgICAgICAgIChXZWJD b3JlOjpYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVzcG9uc2VBcnJheUJ1ZmZlcik6CisgICAgICAg IChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2V0UmVzcG9uc2VUeXBlKToKKyAgICAgICAgKFdl YkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpY TUxIdHRwUmVxdWVzdDo6Y2FsbFJlYWR5U3RhdGVDaGFuZ2VMaXN0ZW5lcik6CisgICAgICAgIChX ZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2V0V2l0aENyZWRlbnRpYWxzKToKKyAgICAgICAgKFdl YkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBS ZXF1ZXN0OjpwcmVwYXJlVG9TZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0 OjpjcmVhdGVSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjphYm9y dCk6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6b3ZlcnJpZGVNaW1lVHlwZSk6 CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2V0UmVxdWVzdEhlYWRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6Z2V0QWxsUmVzcG9uc2VIZWFkZXJzIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpnZXRSZXNwb25zZUhlYWRl ciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c3RhdHVzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpzdGF0dXNUZXh0IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpkaWRGaW5pc2hMb2FkaW5nKToKKyAg ICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVEZWNvZGVyIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6ZGlkUmVhY2hUaW1lb3V0KToKKyAgICAgICAgKFdl YkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpyZWFkeVN0YXRlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1 ZXN0OjpyZXNwb25zZVR5cGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVl c3Q6OnJlYWR5U3RhdGUgY29uc3QpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdFByb2dy ZXNzRXZlbnRUaHJvdHRsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdFBy b2dyZXNzRXZlbnRUaHJvdHRsZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUp OgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5oOgor CiAyMDE4LTA4LTI0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IENsaWNrIGV2ZW50IGZyb20gY2xpY2soKSBpcyBub3QgY29tcG9zZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nQnVpbGRlci5oIGIvU291cmNlL1dURi93dGYvdGV4dC9T dHJpbmdCdWlsZGVyLmgKaW5kZXggOGU0YzcyMDEyNjIxOTk1MzYxZjY3NGY4MzVlMWU1YmU4ZWQ4 ZGU5My4uMDM2ZWY3MjZjMTk4Mjk5Y2Y3ODU5ZjFmODNhZTg2YTBkMTAzMzM0MCAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmgKKysrIGIvU291cmNlL1dURi93 dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmgKQEAgLTQwLDkgKzQwLDcgQEAgY2xhc3MgU3RyaW5nQnVp bGRlciB7CiAKIHB1YmxpYzoKICAgICBTdHJpbmdCdWlsZGVyKCkKLSAgICAgICAgOiBtX2xlbmd0 aCgwKQotICAgICAgICAsIG1faXM4Qml0KHRydWUpCi0gICAgICAgICwgbV9idWZmZXJDaGFyYWN0 ZXJzOChudWxscHRyKQorICAgICAgICA6IG1fYnVmZmVyQ2hhcmFjdGVyczgobnVsbHB0cikKICAg ICB7CiAgICAgfQogICAgIFN0cmluZ0J1aWxkZXIoU3RyaW5nQnVpbGRlciYmKSA9IGRlZmF1bHQ7 CkBAIC0zMDgsMTQgKzMwNiwxNCBAQCBjbGFzcyBTdHJpbmdCdWlsZGVyIHsKICAgICBBTFdBWVNf SU5MSU5FIENoYXJUeXBlICogZ2V0QnVmZmVyQ2hhcmFjdGVycygpOwogICAgIFdURl9FWFBPUlRf UFJJVkFURSB2b2lkIHJlaWZ5U3RyaW5nKCkgY29uc3Q7CiAKLSAgICB1bnNpZ25lZCBtX2xlbmd0 aDsKICAgICBtdXRhYmxlIFN0cmluZyBtX3N0cmluZzsKICAgICBSZWZQdHI8U3RyaW5nSW1wbD4g bV9idWZmZXI7Ci0gICAgYm9vbCBtX2lzOEJpdDsKICAgICB1bmlvbiB7CiAgICAgICAgIExDaGFy KiBtX2J1ZmZlckNoYXJhY3RlcnM4OwogICAgICAgICBVQ2hhciogbV9idWZmZXJDaGFyYWN0ZXJz MTY7CiAgICAgfTsKKyAgICB1bnNpZ25lZCBtX2xlbmd0aCB7IDAgfTsKKyAgICBib29sIG1faXM4 Qml0IHsgdHJ1ZSB9OwogfTsKIAogdGVtcGxhdGUgPD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJl cXVlc3QuY3BwCmluZGV4IGZjMWFiMjA0NzI4NTI0YTUwNDNkZDVmMDllOTlmNTkwNDFjNGMxNjAu LjZlNzJjMTYzOGNlZDllNTQwOTE3YzA5ZGFjNTk3ZjU0NGZlODRhNjggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApAQCAtMTExLDYgKzExMSwxOCBAQCBSZWY8WE1MSHR0cFJl cXVlc3Q+IFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29u dGV4dCkKIAogWE1MSHR0cFJlcXVlc3Q6OlhNTEh0dHBSZXF1ZXN0KFNjcmlwdEV4ZWN1dGlvbkNv bnRleHQmIGNvbnRleHQpCiAgICAgOiBBY3RpdmVET01PYmplY3QoJmNvbnRleHQpCisgICAgLCBt X2FzeW5jKHRydWUpCisgICAgLCBtX2luY2x1ZGVDcmVkZW50aWFscyhmYWxzZSkKKyAgICAsIG1f c2VuZEZsYWcoZmFsc2UpCisgICAgLCBtX2NyZWF0ZWREb2N1bWVudChmYWxzZSkKKyAgICAsIG1f ZXJyb3IoZmFsc2UpCisgICAgLCBtX3VwbG9hZExpc3RlbmVyRmxhZyhmYWxzZSkKKyAgICAsIG1f dXBsb2FkQ29tcGxldGUoZmFsc2UpCisgICAgLCBtX3dhc0Fib3J0ZWRCeUNsaWVudChmYWxzZSkK KyAgICAsIG1fcmVzcG9uc2VDYWNoZUlzVmFsaWQoZmFsc2UpCisgICAgLCBtX2Rpc3BhdGNoRXJy b3JPblJlc3VtaW5nKGZhbHNlKQorICAgICwgbV9yZWFkeVN0YXRlKHN0YXRpY19jYXN0PHVuc2ln bmVkPihVTlNFTlQpKQorICAgICwgbV9yZXNwb25zZVR5cGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KFJlc3BvbnNlVHlwZTo6RW1wdHlTdHJpbmcpKQogICAgICwgbV9wcm9ncmVzc0V2ZW50VGhyb3R0 bGUodGhpcykKICAgICAsIG1fcmVzdW1lVGltZXIoKnRoaXMsICZYTUxIdHRwUmVxdWVzdDo6cmVz dW1lVGltZXJGaXJlZCkKICAgICAsIG1fbmV0d29ya0Vycm9yVGltZXIoKnRoaXMsICZYTUxIdHRw UmVxdWVzdDo6bmV0d29ya0Vycm9yVGltZXJGaXJlZCkKQEAgLTE1MCwxNCArMTYyLDkgQEAgYm9v bCBYTUxIdHRwUmVxdWVzdDo6dXNlc0Rhc2hib2FyZEJhY2t3YXJkQ29tcGF0aWJpbGl0eU1vZGUo KSBjb25zdAogCiAjZW5kaWYKIAotWE1MSHR0cFJlcXVlc3Q6OlN0YXRlIFhNTEh0dHBSZXF1ZXN0 OjpyZWFkeVN0YXRlKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9zdGF0ZTsKLX0KLQogRXhjZXB0 aW9uT3I8T3duZWRTdHJpbmc+IFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVRleHQoKQogewotICAg IGlmIChtX3Jlc3BvbnNlVHlwZSAhPSBSZXNwb25zZVR5cGU6OkVtcHR5U3RyaW5nICYmIG1fcmVz cG9uc2VUeXBlICE9IFJlc3BvbnNlVHlwZTo6VGV4dCkKKyAgICBpZiAocmVzcG9uc2VUeXBlKCkg IT0gUmVzcG9uc2VUeXBlOjpFbXB0eVN0cmluZyAmJiByZXNwb25zZVR5cGUoKSAhPSBSZXNwb25z ZVR5cGU6OlRleHQpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJv ciB9OwogICAgIHJldHVybiBPd25lZFN0cmluZyB7IHJlc3BvbnNlVGV4dElnbm9yaW5nUmVzcG9u c2VUeXBlKCkgfTsKIH0KQEAgLTE3Myw3ICsxODAsNyBAQCBFeGNlcHRpb25PcjxEb2N1bWVudCo+ IFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpCiB7CiAgICAgQVNTRVJUKHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKS0+aXNEb2N1bWVudCgpKTsKICAgICAKLSAgICBpZiAobV9yZXNwb25zZVR5 cGUgIT0gUmVzcG9uc2VUeXBlOjpFbXB0eVN0cmluZyAmJiBtX3Jlc3BvbnNlVHlwZSAhPSBSZXNw b25zZVR5cGU6OkRvY3VtZW50KQorICAgIGlmIChyZXNwb25zZVR5cGUoKSAhPSBSZXNwb25zZVR5 cGU6OkVtcHR5U3RyaW5nICYmIHJlc3BvbnNlVHlwZSgpICE9IFJlc3BvbnNlVHlwZTo6RG9jdW1l bnQpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciB9OwogCiAg ICAgaWYgKCFkb25lV2l0aG91dEVycm9ycygpKQpAQCAtMTg2LDcgKzE5Myw3IEBAIEV4Y2VwdGlv bk9yPERvY3VtZW50Kj4gWE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlWE1MKCkKICAgICAgICAgLy8g VGhlIFczQyBzcGVjIHJlcXVpcmVzIHRoZSBmaW5hbCBNSU1FIHR5cGUgdG8gYmUgc29tZSB2YWxp ZCBYTUwgdHlwZSwgb3IgdGV4dC9odG1sLgogICAgICAgICAvLyBJZiBpdCBpcyB0ZXh0L2h0bWws IHRoZW4gdGhlIHJlc3BvbnNlVHlwZSBvZiAiZG9jdW1lbnQiIG11c3QgaGF2ZSBiZWVuIHN1cHBs aWVkIGV4cGxpY2l0bHkuCiAgICAgICAgIGlmICgobV9yZXNwb25zZS5pc0hUVFAoKSAmJiAhcmVz cG9uc2VJc1hNTCgpICYmICFpc0hUTUwpCi0gICAgICAgICAgICB8fCAoaXNIVE1MICYmIG1fcmVz cG9uc2VUeXBlID09IFJlc3BvbnNlVHlwZTo6RW1wdHlTdHJpbmcpKSB7CisgICAgICAgICAgICB8 fCAoaXNIVE1MICYmIHJlc3BvbnNlVHlwZSgpID09IFJlc3BvbnNlVHlwZTo6RW1wdHlTdHJpbmcp KSB7CiAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQgPSBudWxscHRyOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgaWYgKGlzSFRNTCkKQEAgLTIxMCw3ICsyMTcsNyBAQCBFeGNl cHRpb25PcjxEb2N1bWVudCo+IFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25zZVhNTCgpCiAKIFJlZjxC bG9iPiBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVzcG9uc2VCbG9iKCkKIHsKLSAgICBBU1NFUlQo bV9yZXNwb25zZVR5cGUgPT0gUmVzcG9uc2VUeXBlOjpCbG9iKTsKKyAgICBBU1NFUlQocmVzcG9u c2VUeXBlKCkgPT0gUmVzcG9uc2VUeXBlOjpCbG9iKTsKICAgICBBU1NFUlQoZG9uZVdpdGhvdXRF cnJvcnMoKSk7CiAKICAgICBpZiAoIW1fYmluYXJ5UmVzcG9uc2VCdWlsZGVyKQpAQCAtMjI2LDcg KzIzMyw3IEBAIFJlZjxCbG9iPiBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVzcG9uc2VCbG9iKCkK IAogUmVmUHRyPEFycmF5QnVmZmVyPiBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVzcG9uc2VBcnJh eUJ1ZmZlcigpCiB7Ci0gICAgQVNTRVJUKG1fcmVzcG9uc2VUeXBlID09IFJlc3BvbnNlVHlwZTo6 QXJyYXlidWZmZXIpOworICAgIEFTU0VSVChyZXNwb25zZVR5cGUoKSA9PSBSZXNwb25zZVR5cGU6 OkFycmF5YnVmZmVyKTsKICAgICBBU1NFUlQoZG9uZVdpdGhvdXRFcnJvcnMoKSk7CiAKICAgICBh dXRvIHJlc3VsdCA9IG1fYmluYXJ5UmVzcG9uc2VCdWlsZGVyID8gbV9iaW5hcnlSZXNwb25zZUJ1 aWxkZXItPnRyeUNyZWF0ZUFycmF5QnVmZmVyKCkgOiBBcnJheUJ1ZmZlcjo6Y3JlYXRlKG51bGxw dHIsIDApOwpAQCAtMjU1LDcgKzI2Miw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBSZXF1 ZXN0OjpzZXRSZXNwb25zZVR5cGUoUmVzcG9uc2VUeXBlIHR5cGUpCiAgICAgaWYgKCFzY3JpcHRF eGVjdXRpb25Db250ZXh0KCktPmlzRG9jdW1lbnQoKSAmJiB0eXBlID09IFJlc3BvbnNlVHlwZTo6 RG9jdW1lbnQpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICBpZiAobV9zdGF0ZSA+PSBMT0FE SU5HKQorICAgIGlmIChyZWFkeVN0YXRlKCkgPj0gTE9BRElORykKICAgICAgICAgcmV0dXJuIEV4 Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVycm9yIH07CiAKICAgICAvLyBOZXdlciBmdW5jdGlvbmFs aXR5IGlzIG5vdCBhdmFpbGFibGUgdG8gc3luY2hyb25vdXMgcmVxdWVzdHMgaW4gd2luZG93IGNv bnRleHRzLCBhcyBhIHNwZWMtbWFuZGF0ZWQKQEAgLTI2Nyw3ICsyNzQsNyBAQCBFeGNlcHRpb25P cjx2b2lkPiBYTUxIdHRwUmVxdWVzdDo6c2V0UmVzcG9uc2VUeXBlKFJlc3BvbnNlVHlwZSB0eXBl KQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vycm9yIH07CiAgICAg fQogCi0gICAgbV9yZXNwb25zZVR5cGUgPSB0eXBlOworICAgIG1fcmVzcG9uc2VUeXBlID0gc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KHR5cGUpOwogICAgIHJldHVybiB7IH07CiB9CiAKQEAgLTI4OCw4 ICsyOTUsOCBAQCBYTUxIdHRwUmVxdWVzdFVwbG9hZCYgWE1MSHR0cFJlcXVlc3Q6OnVwbG9hZCgp CiAKIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNoYW5nZVN0YXRlKFN0YXRlIG5ld1N0YXRlKQogewot ICAgIGlmIChtX3N0YXRlICE9IG5ld1N0YXRlKSB7Ci0gICAgICAgIG1fc3RhdGUgPSBuZXdTdGF0 ZTsKKyAgICBpZiAocmVhZHlTdGF0ZSgpICE9IG5ld1N0YXRlKSB7CisgICAgICAgIG1fcmVhZHlT dGF0ZSA9IHN0YXRpY19jYXN0PFN0YXRlPihuZXdTdGF0ZSk7CiAgICAgICAgIGNhbGxSZWFkeVN0 YXRlQ2hhbmdlTGlzdGVuZXIoKTsKICAgICB9CiB9CkBAIC0yOTksMTIgKzMwNiwxMiBAQCB2b2lk IFhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyKCkKICAgICBpZiAo IXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gQ2hl Y2sgd2hldGhlciBzZW5kaW5nIGxvYWQgYW5kIGxvYWRlbmQgZXZlbnRzIGJlZm9yZSBzZW5kaW5n IHJlYWR5c3RhdGVjaGFuZ2UgZXZlbnQsIGFzIGl0IG1heSBjaGFuZ2UgbV9lcnJvci9tX3N0YXRl IHZhbHVlcy4KLSAgICBib29sIHNob3VsZFNlbmRMb2FkRXZlbnQgPSAobV9zdGF0ZSA9PSBET05F ICYmICFtX2Vycm9yKTsKKyAgICAvLyBDaGVjayB3aGV0aGVyIHNlbmRpbmcgbG9hZCBhbmQgbG9h ZGVuZCBldmVudHMgYmVmb3JlIHNlbmRpbmcgcmVhZHlzdGF0ZWNoYW5nZSBldmVudCwgYXMgaXQg bWF5IGNoYW5nZSBtX2Vycm9yL21fcmVhZHlTdGF0ZSB2YWx1ZXMuCisgICAgYm9vbCBzaG91bGRT ZW5kTG9hZEV2ZW50ID0gKHJlYWR5U3RhdGUoKSA9PSBET05FICYmICFtX2Vycm9yKTsKIAotICAg IGlmIChtX2FzeW5jIHx8IChtX3N0YXRlIDw9IE9QRU5FRCB8fCBtX3N0YXRlID09IERPTkUpKSB7 CisgICAgaWYgKG1fYXN5bmMgfHwgKHJlYWR5U3RhdGUoKSA8PSBPUEVORUQgfHwgcmVhZHlTdGF0 ZSgpID09IERPTkUpKSB7CiAgICAgICAgIG1fcHJvZ3Jlc3NFdmVudFRocm90dGxlLmRpc3BhdGNo UmVhZHlTdGF0ZUNoYW5nZUV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnJlYWR5c3Rh dGVjaGFuZ2VFdmVudCwgRXZlbnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNlbGFibGU6 Ok5vKSwKLSAgICAgICAgICAgIG1fc3RhdGUgPT0gRE9ORSA/IEZsdXNoUHJvZ3Jlc3NFdmVudCA6 IERvTm90Rmx1c2hQcm9ncmVzc0V2ZW50KTsKKyAgICAgICAgICAgIHJlYWR5U3RhdGUoKSA9PSBE T05FID8gRmx1c2hQcm9ncmVzc0V2ZW50IDogRG9Ob3RGbHVzaFByb2dyZXNzRXZlbnQpOwogICAg IH0KIAogICAgIGlmIChzaG91bGRTZW5kTG9hZEV2ZW50KSB7CkBAIC0zMTUsNyArMzIyLDcgQEAg dm9pZCBYTUxIdHRwUmVxdWVzdDo6Y2FsbFJlYWR5U3RhdGVDaGFuZ2VMaXN0ZW5lcigpCiAKIEV4 Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBSZXF1ZXN0OjpzZXRXaXRoQ3JlZGVudGlhbHMoYm9vbCB2 YWx1ZSkKIHsKLSAgICBpZiAobV9zdGF0ZSA+IE9QRU5FRCB8fCBtX3NlbmRGbGFnKQorICAgIGlm IChyZWFkeVN0YXRlKCkgPiBPUEVORUQgfHwgbV9zZW5kRmxhZykKICAgICAgICAgcmV0dXJuIEV4 Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVycm9yIH07CiAKICAgICBtX2luY2x1ZGVDcmVkZW50aWFs cyA9IHZhbHVlOwpAQCAtMzQxLDcgKzM0OCw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBS ZXF1ZXN0OjpvcGVuKGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBVUkwmIHVybCwgYm9vCiAg ICAgICAgIC8vIGF0dGVtcHQgdG8gZGlzY291cmFnZSBzeW5jaHJvbm91cyBYSFIgdXNlLiByZXNw b25zZVR5cGUgaXMgb25lIHN1Y2ggcGllY2Ugb2YgZnVuY3Rpb25hbGl0eS4KICAgICAgICAgLy8g V2UnbGwgb25seSBkaXNhYmxlIHRoaXMgZnVuY3Rpb25hbGl0eSBmb3IgSFRUUChTKSByZXF1ZXN0 cyBzaW5jZSBzeW5jIHJlcXVlc3RzIGZvciBsb2NhbCBwcm90b2NvbHMKICAgICAgICAgLy8gc3Vj aCBhcyBmaWxlOiBhbmQgZGF0YTogc3RpbGwgbWFrZSBzZW5zZSB0byBhbGxvdy4KLSAgICAgICAg aWYgKHVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgbV9yZXNwb25zZVR5cGUgIT0gUmVz cG9uc2VUeXBlOjpFbXB0eVN0cmluZykgeworICAgICAgICBpZiAodXJsLnByb3RvY29sSXNJbkhU VFBGYW1pbHkoKSAmJiByZXNwb25zZVR5cGUoKSAhPSBSZXNwb25zZVR5cGU6OkVtcHR5U3RyaW5n KSB7CiAgICAgICAgICAgICBsb2dDb25zb2xlRXJyb3Ioc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp LCAiU3luY2hyb25vdXMgSFRUUChTKSByZXF1ZXN0cyBtYWRlIGZyb20gdGhlIHdpbmRvdyBjb250 ZXh0IGNhbm5vdCBoYXZlIFhNTEh0dHBSZXF1ZXN0LnJlc3BvbnNlVHlwZSBzZXQuIik7CiAgICAg ICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vycm9yIH07CiAgICAgICAg IH0KQEAgLTQwMSw3ICs0MDgsNyBAQCBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbk9yPHZvaWQ+PiBY TUxIdHRwUmVxdWVzdDo6cHJlcGFyZVRvU2VuZCgpCiAKICAgICBhdXRvJiBjb250ZXh0ID0gKnNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKIAotICAgIGlmIChtX3N0YXRlICE9IE9QRU5FRCB8fCBt X3NlbmRGbGFnKQorICAgIGlmIChyZWFkeVN0YXRlKCkgIT0gT1BFTkVEIHx8IG1fc2VuZEZsYWcp CiAgICAgICAgIHJldHVybiBFeGNlcHRpb25Pcjx2b2lkPiB7IEV4Y2VwdGlvbiB7IEludmFsaWRT dGF0ZUVycm9yIH0gfTsKICAgICBBU1NFUlQoIW1fbG9hZGVyKTsKIApAQCAtNjEzLDcgKzYyMCw3 IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KCkKICAg ICAgICAgaWYgKCFtX3VwbG9hZENvbXBsZXRlICYmIG1fdXBsb2FkTGlzdGVuZXJGbGFnKQogICAg ICAgICAgICAgbV91cGxvYWQtPmRpc3BhdGNoUHJvZ3Jlc3NFdmVudChldmVudE5hbWVzKCkubG9h ZHN0YXJ0RXZlbnQpOwogCi0gICAgICAgIGlmIChtX3N0YXRlICE9IE9QRU5FRCB8fCAhbV9zZW5k RmxhZyB8fCBtX2xvYWRlcikKKyAgICAgICAgaWYgKHJlYWR5U3RhdGUoKSAhPSBPUEVORUQgfHwg IW1fc2VuZEZsYWcgfHwgbV9sb2FkZXIpCiAgICAgICAgICAgICByZXR1cm4geyB9OwogCiAgICAg ICAgIC8vIFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZSBjYW4gcmV0dXJuIG51bGwgaGVyZSwgZm9y IGV4YW1wbGUgaWYgd2UncmUgbm8gbG9uZ2VyIGF0dGFjaGVkIHRvIGEgcGFnZSBvciBpZiBhIGNv bnRlbnQgYmxvY2tlciBibG9ja3MgdGhlIGxvYWQuCkBAIC02NTUsMTQgKzY2MiwxNCBAQCB2b2lk IFhNTEh0dHBSZXF1ZXN0OjphYm9ydCgpCiAgICAgY2xlYXJSZXNwb25zZUJ1ZmZlcnMoKTsKIAog ICAgIG1fcmVxdWVzdEhlYWRlcnMuY2xlYXIoKTsKLSAgICBpZiAoKG1fc3RhdGUgPT0gT1BFTkVE ICYmIG1fc2VuZEZsYWcpIHx8IG1fc3RhdGUgPT0gSEVBREVSU19SRUNFSVZFRCB8fCBtX3N0YXRl ID09IExPQURJTkcpIHsKKyAgICBpZiAoKHJlYWR5U3RhdGUoKSA9PSBPUEVORUQgJiYgbV9zZW5k RmxhZykgfHwgcmVhZHlTdGF0ZSgpID09IEhFQURFUlNfUkVDRUlWRUQgfHwgcmVhZHlTdGF0ZSgp ID09IExPQURJTkcpIHsKICAgICAgICAgQVNTRVJUKCFtX2xvYWRlcik7CiAgICAgICAgIG1fc2Vu ZEZsYWcgPSBmYWxzZTsKICAgICAgICAgY2hhbmdlU3RhdGUoRE9ORSk7CiAgICAgICAgIGRpc3Bh dGNoRXJyb3JFdmVudHMoZXZlbnROYW1lcygpLmFib3J0RXZlbnQpOwogICAgIH0KLSAgICBpZiAo bV9zdGF0ZSA9PSBET05FKQotICAgICAgICBtX3N0YXRlID0gVU5TRU5UOworICAgIGlmIChyZWFk eVN0YXRlKCkgPT0gRE9ORSkKKyAgICAgICAgbV9yZWFkeVN0YXRlID0gc3RhdGljX2Nhc3Q8U3Rh dGU+KFVOU0VOVCk7CiB9CiAKIGJvb2wgWE1MSHR0cFJlcXVlc3Q6OmludGVybmFsQWJvcnQoKQpA QCAtNzY3LDcgKzc3NCw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmRyb3BQcm90ZWN0aW9uKCkK IAogRXhjZXB0aW9uT3I8dm9pZD4gWE1MSHR0cFJlcXVlc3Q6Om92ZXJyaWRlTWltZVR5cGUoY29u c3QgU3RyaW5nJiBvdmVycmlkZSkKIHsKLSAgICBpZiAobV9zdGF0ZSA9PSBMT0FESU5HIHx8IG1f c3RhdGUgPT0gRE9ORSkKKyAgICBpZiAocmVhZHlTdGF0ZSgpID09IExPQURJTkcgfHwgcmVhZHlT dGF0ZSgpID09IERPTkUpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVF cnJvciB9OwogCiAgICAgbV9taW1lVHlwZU92ZXJyaWRlID0gb3ZlcnJpZGU7CkBAIC03NzYsNyAr NzgzLDcgQEAgRXhjZXB0aW9uT3I8dm9pZD4gWE1MSHR0cFJlcXVlc3Q6Om92ZXJyaWRlTWltZVR5 cGUoY29uc3QgU3RyaW5nJiBvdmVycmlkZSkKIAogRXhjZXB0aW9uT3I8dm9pZD4gWE1MSHR0cFJl cXVlc3Q6OnNldFJlcXVlc3RIZWFkZXIoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHZhbHVlKQogewotICAgIGlmIChtX3N0YXRlICE9IE9QRU5FRCB8fCBtX3NlbmRGbGFnKSB7Cisg ICAgaWYgKHJlYWR5U3RhdGUoKSAhPSBPUEVORUQgfHwgbV9zZW5kRmxhZykgewogI2lmIEVOQUJM RShEQVNIQk9BUkRfU1VQUE9SVCkKICAgICAgICAgaWYgKHVzZXNEYXNoYm9hcmRCYWNrd2FyZENv bXBhdGliaWxpdHlNb2RlKCkpCiAgICAgICAgICAgICByZXR1cm4geyB9OwpAQCAtODA1LDcgKzgx Miw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBSZXF1ZXN0OjpzZXRSZXF1ZXN0SGVhZGVy KGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyCiAKIFN0cmluZyBYTUxIdHRwUmVxdWVzdDo6 Z2V0QWxsUmVzcG9uc2VIZWFkZXJzKCkgY29uc3QKIHsKLSAgICBpZiAobV9zdGF0ZSA8IEhFQURF UlNfUkVDRUlWRUQgfHwgbV9lcnJvcikKKyAgICBpZiAocmVhZHlTdGF0ZSgpIDwgSEVBREVSU19S RUNFSVZFRCB8fCBtX2Vycm9yKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAogICAg IGlmICghbV9hbGxSZXNwb25zZUhlYWRlcnMpIHsKQEAgLTgzMyw3ICs4NDAsNyBAQCBTdHJpbmcg WE1MSHR0cFJlcXVlc3Q6OmdldEFsbFJlc3BvbnNlSGVhZGVycygpIGNvbnN0CiAKIFN0cmluZyBY TUxIdHRwUmVxdWVzdDo6Z2V0UmVzcG9uc2VIZWFkZXIoY29uc3QgU3RyaW5nJiBuYW1lKSBjb25z dAogewotICAgIGlmIChtX3N0YXRlIDwgSEVBREVSU19SRUNFSVZFRCB8fCBtX2Vycm9yKQorICAg IGlmIChyZWFkeVN0YXRlKCkgPCBIRUFERVJTX1JFQ0VJVkVEIHx8IG1fZXJyb3IpCiAgICAgICAg IHJldHVybiBTdHJpbmcoKTsKIAogICAgIHJldHVybiBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVs ZChuYW1lKTsKQEAgLTg2MCw3ICs4NjcsNyBAQCBib29sIFhNTEh0dHBSZXF1ZXN0OjpyZXNwb25z ZUlzWE1MKCkgY29uc3QKIAogaW50IFhNTEh0dHBSZXF1ZXN0OjpzdGF0dXMoKSBjb25zdAogewot ICAgIGlmIChtX3N0YXRlID09IFVOU0VOVCB8fCBtX3N0YXRlID09IE9QRU5FRCB8fCBtX2Vycm9y KQorICAgIGlmIChyZWFkeVN0YXRlKCkgPT0gVU5TRU5UIHx8IHJlYWR5U3RhdGUoKSA9PSBPUEVO RUQgfHwgbV9lcnJvcikKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gbV9yZXNwb25z ZS5odHRwU3RhdHVzQ29kZSgpOwpAQCAtODY4LDcgKzg3NSw3IEBAIGludCBYTUxIdHRwUmVxdWVz dDo6c3RhdHVzKCkgY29uc3QKIAogU3RyaW5nIFhNTEh0dHBSZXF1ZXN0OjpzdGF0dXNUZXh0KCkg Y29uc3QKIHsKLSAgICBpZiAobV9zdGF0ZSA9PSBVTlNFTlQgfHwgbV9zdGF0ZSA9PSBPUEVORUQg fHwgbV9lcnJvcikKKyAgICBpZiAocmVhZHlTdGF0ZSgpID09IFVOU0VOVCB8fCByZWFkeVN0YXRl KCkgPT0gT1BFTkVEIHx8IG1fZXJyb3IpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAogICAg IHJldHVybiBtX3Jlc3BvbnNlLmh0dHBTdGF0dXNUZXh0KCk7CkBAIC05MTAsNyArOTE3LDcgQEAg dm9pZCBYTUxIdHRwUmVxdWVzdDo6ZGlkRmluaXNoTG9hZGluZyh1bnNpZ25lZCBsb25nKQogICAg IGlmIChtX2Vycm9yKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9zdGF0ZSA8IEhFQURF UlNfUkVDRUlWRUQpCisgICAgaWYgKHJlYWR5U3RhdGUoKSA8IEhFQURFUlNfUkVDRUlWRUQpCiAg ICAgICAgIGNoYW5nZVN0YXRlKEhFQURFUlNfUkVDRUlWRUQpOwogCiAgICAgaWYgKG1fZGVjb2Rl cikKQEAgLTk3Nyw3ICs5ODQsNyBAQCBSZWY8VGV4dFJlc291cmNlRGVjb2Rlcj4gWE1MSHR0cFJl cXVlc3Q6OmNyZWF0ZURlY29kZXIoKSBjb25zdAogICAgIGlmICghbV9yZXNwb25zZUVuY29kaW5n LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIFRleHRSZXNvdXJjZURlY29kZXI6OmNyZWF0ZSgi dGV4dC9wbGFpbiIsIG1fcmVzcG9uc2VFbmNvZGluZyk7CiAKLSAgICBzd2l0Y2ggKG1fcmVzcG9u c2VUeXBlKSB7CisgICAgc3dpdGNoIChyZXNwb25zZVR5cGUoKSkgewogICAgIGNhc2UgUmVzcG9u c2VUeXBlOjpFbXB0eVN0cmluZzoKICAgICAgICAgaWYgKHJlc3BvbnNlSXNYTUwoKSkgewogICAg ICAgICAgICAgYXV0byBkZWNvZGVyID0gVGV4dFJlc291cmNlRGVjb2Rlcjo6Y3JlYXRlKCJhcHBs aWNhdGlvbi94bWwiKTsKQEAgLTEwMTAsNyArMTAxNyw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6 OmRpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW4pCiAgICAgaWYgKG1fZXJy b3IpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3N0YXRlIDwgSEVBREVSU19SRUNFSVZF RCkKKyAgICBpZiAocmVhZHlTdGF0ZSgpIDwgSEVBREVSU19SRUNFSVZFRCkKICAgICAgICAgY2hh bmdlU3RhdGUoSEVBREVSU19SRUNFSVZFRCk7CiAKICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHVw ZGF0ZSAiQ29udGVudC1UeXBlIiBoZWFkZXIgZmllbGQgd2l0aCBtX21pbWVUeXBlT3ZlcnJpZGUg dmFsdWUgaW4gY2FzZSBpdCBoYXMgY2hhbmdlZCBzaW5jZSBkaWRSZWNlaXZlUmVzcG9uc2U/CkBA IC0xMDE5LDcgKzEwMjYsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YShj b25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuKQogICAgIGlmIChtX3Jlc3BvbnNlRW5jb2RpbmcuaXNF bXB0eSgpKQogICAgICAgICBtX3Jlc3BvbnNlRW5jb2RpbmcgPSBtX3Jlc3BvbnNlLnRleHRFbmNv ZGluZ05hbWUoKTsKIAotICAgIGJvb2wgdXNlRGVjb2RlciA9IHNob3VsZERlY29kZVJlc3BvbnNl KG1fcmVzcG9uc2VUeXBlKTsKKyAgICBib29sIHVzZURlY29kZXIgPSBzaG91bGREZWNvZGVSZXNw b25zZShyZXNwb25zZVR5cGUoKSk7CiAKICAgICBpZiAodXNlRGVjb2RlciAmJiAhbV9kZWNvZGVy KQogICAgICAgICBtX2RlY29kZXIgPSBjcmVhdGVEZWNvZGVyKCk7CkBAIC0xMDQ5LDcgKzEwNTYs NyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YShjb25zdCBjaGFyKiBkYXRh LCBpbnQgbGVuKQogICAgICAgICAgICAgbV9wcm9ncmVzc0V2ZW50VGhyb3R0bGUuZGlzcGF0Y2hU aHJvdHRsZWRQcm9ncmVzc0V2ZW50KGxlbmd0aENvbXB1dGFibGUsIG1fcmVjZWl2ZWRMZW5ndGgs IHRvdGFsKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChtX3N0YXRlICE9IExPQURJTkcpCisg ICAgICAgIGlmIChyZWFkeVN0YXRlKCkgIT0gTE9BRElORykKICAgICAgICAgICAgIGNoYW5nZVN0 YXRlKExPQURJTkcpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICAvLyBGaXJlZm94IGNhbGxz IHJlYWR5U3RhdGVDaGFuZ2VkIGV2ZXJ5IHRpbWUgaXQgcmVjZWl2ZXMgZGF0YSwgNDQ0OTQ0MgpA QCAtMTA4NSw3ICsxMDkyLDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6ZGlkUmVhY2hUaW1lb3V0 KCkKICAgICBtX2V4Y2VwdGlvbkNvZGUgPSBUaW1lb3V0RXJyb3I7CiAKICAgICBpZiAoIW1fYXN5 bmMpIHsKLSAgICAgICAgbV9zdGF0ZSA9IERPTkU7CisgICAgICAgIG1fcmVhZHlTdGF0ZSA9IHN0 YXRpY19jYXN0PFN0YXRlPihET05FKTsKICAgICAgICAgbV9leGNlcHRpb25Db2RlID0gVGltZW91 dEVycm9yOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVl c3QuaAppbmRleCBlMzJkMDEzMzVjYWIzNzA2MDBiZjA2YjYyMmUzNzllMjY3ZDZmY2UyLi40ZThh ZTcwYmJlNTJhZTZmZTJkY2Q0MDY0MDg4YWQwN2NmN2VkYmI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1M SHR0cFJlcXVlc3QuaApAQCAtNDksMTMgKzQ5LDE0IEBAIGNsYXNzIFRocmVhZGFibGVMb2FkZXI7 CiBjbGFzcyBYTUxIdHRwUmVxdWVzdFVwbG9hZDsKIHN0cnVjdCBPd25lZFN0cmluZzsKIAotY2xh c3MgWE1MSHR0cFJlcXVlc3QgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxYTUxIdHRwUmVxdWVz dD4sIHB1YmxpYyBYTUxIdHRwUmVxdWVzdEV2ZW50VGFyZ2V0LCBwcml2YXRlIFRocmVhZGFibGVM b2FkZXJDbGllbnQsIHB1YmxpYyBBY3RpdmVET01PYmplY3QgeworY2xhc3MgWE1MSHR0cFJlcXVl c3QgZmluYWwgOiBwdWJsaWMgQWN0aXZlRE9NT2JqZWN0LCBwdWJsaWMgUmVmQ291bnRlZDxYTUxI dHRwUmVxdWVzdD4sIHByaXZhdGUgVGhyZWFkYWJsZUxvYWRlckNsaWVudCwgcHVibGljIFhNTEh0 dHBSZXF1ZXN0RXZlbnRUYXJnZXQgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVi bGljOgogICAgIHN0YXRpYyBSZWY8WE1MSHR0cFJlcXVlc3Q+IGNyZWF0ZShTY3JpcHRFeGVjdXRp b25Db250ZXh0Jik7CiAgICAgV0VCQ09SRV9FWFBPUlQgflhNTEh0dHBSZXF1ZXN0KCk7CiAKLSAg ICBlbnVtIFN0YXRlIHsKKyAgICAvLyBLZWVwIGl0IGluIDNiaXRzLgorICAgIGVudW0gU3RhdGUg OiB1aW50OF90IHsKICAgICAgICAgVU5TRU5UID0gMCwKICAgICAgICAgT1BFTkVEID0gMSwKICAg ICAgICAgSEVBREVSU19SRUNFSVZFRCA9IDIsCkBAIC04Myw3ICs4NCw3IEBAIGNsYXNzIFhNTEh0 dHBSZXF1ZXN0IGZpbmFsIDogcHVibGljIFJlZkNvdW50ZWQ8WE1MSHR0cFJlcXVlc3Q+LCBwdWJs aWMgWE1MSHR0cFJlCiAgICAgdm9pZCBhYm9ydCgpOwogICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNl dFJlcXVlc3RIZWFkZXIoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsK ICAgICBFeGNlcHRpb25Pcjx2b2lkPiBvdmVycmlkZU1pbWVUeXBlKGNvbnN0IFN0cmluZyYgb3Zl cnJpZGUpOwotICAgIGJvb2wgZG9uZVdpdGhvdXRFcnJvcnMoKSBjb25zdCB7IHJldHVybiAhbV9l cnJvciAmJiBtX3N0YXRlID09IERPTkU7IH0KKyAgICBib29sIGRvbmVXaXRob3V0RXJyb3JzKCkg Y29uc3QgeyByZXR1cm4gIW1fZXJyb3IgJiYgcmVhZHlTdGF0ZSgpID09IERPTkU7IH0KICAgICBT dHJpbmcgZ2V0QWxsUmVzcG9uc2VIZWFkZXJzKCkgY29uc3Q7CiAgICAgU3RyaW5nIGdldFJlc3Bv bnNlSGVhZGVyKGNvbnN0IFN0cmluZyYgbmFtZSkgY29uc3Q7CiAgICAgRXhjZXB0aW9uT3I8T3du ZWRTdHJpbmc+IHJlc3BvbnNlVGV4dCgpOwpAQCAtMTAyLDcgKzEwMywxNSBAQCBjbGFzcyBYTUxI dHRwUmVxdWVzdCBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPFhNTEh0dHBSZXF1ZXN0PiwgcHVi bGljIFhNTEh0dHBSZQogICAgIGJvb2wgcmVzcG9uc2VDYWNoZUlzVmFsaWQoKSBjb25zdCB7IHJl dHVybiBtX3Jlc3BvbnNlQ2FjaGVJc1ZhbGlkOyB9CiAgICAgdm9pZCBkaWRDYWNoZVJlc3BvbnNl KCk7CiAKLSAgICBlbnVtIGNsYXNzIFJlc3BvbnNlVHlwZSB7IEVtcHR5U3RyaW5nLCBBcnJheWJ1 ZmZlciwgQmxvYiwgRG9jdW1lbnQsIEpzb24sIFRleHQgfTsKKyAgICAvLyBLZWVwIGl0IGluIDNi aXRzLgorICAgIGVudW0gY2xhc3MgUmVzcG9uc2VUeXBlIDogdWludDhfdCB7CisgICAgICAgIEVt cHR5U3RyaW5nID0gMCwKKyAgICAgICAgQXJyYXlidWZmZXIgPSAxLAorICAgICAgICBCbG9iID0g MiwKKyAgICAgICAgRG9jdW1lbnQgPSAzLAorICAgICAgICBKc29uID0gNCwKKyAgICAgICAgVGV4 dCA9IDUsCisgICAgfTsKICAgICBFeGNlcHRpb25Pcjx2b2lkPiBzZXRSZXNwb25zZVR5cGUoUmVz cG9uc2VUeXBlKTsKICAgICBSZXNwb25zZVR5cGUgcmVzcG9uc2VUeXBlKCkgY29uc3Q7CiAKQEAg LTE3OCw2ICsxODcsMjMgQEAgY2xhc3MgWE1MSHR0cFJlcXVlc3QgZmluYWwgOiBwdWJsaWMgUmVm Q291bnRlZDxYTUxIdHRwUmVxdWVzdD4sIHB1YmxpYyBYTUxIdHRwUmUKICAgICB2b2lkIHJlc3Vt ZVRpbWVyRmlyZWQoKTsKICAgICBSZWY8VGV4dFJlc291cmNlRGVjb2Rlcj4gY3JlYXRlRGVjb2Rl cigpIGNvbnN0OwogCisgICAgdm9pZCBuZXR3b3JrRXJyb3JUaW1lckZpcmVkKCk7CisKKyAgICB1 bnNpZ25lZCBtX2FzeW5jIDogMTsKKyAgICB1bnNpZ25lZCBtX2luY2x1ZGVDcmVkZW50aWFscyA6 IDE7CisgICAgdW5zaWduZWQgbV9zZW5kRmxhZyA6IDE7CisgICAgdW5zaWduZWQgbV9jcmVhdGVk RG9jdW1lbnQgOiAxOworICAgIHVuc2lnbmVkIG1fZXJyb3IgOiAxOworICAgIHVuc2lnbmVkIG1f dXBsb2FkTGlzdGVuZXJGbGFnIDogMTsKKyAgICB1bnNpZ25lZCBtX3VwbG9hZENvbXBsZXRlIDog MTsKKyAgICB1bnNpZ25lZCBtX3dhc0Fib3J0ZWRCeUNsaWVudCA6IDE7CisgICAgdW5zaWduZWQg bV9yZXNwb25zZUNhY2hlSXNWYWxpZCA6IDE7CisgICAgdW5zaWduZWQgbV9kaXNwYXRjaEVycm9y T25SZXN1bWluZyA6IDE7CisgICAgdW5zaWduZWQgbV9yZWFkeVN0YXRlIDogMzsKKyAgICB1bnNp Z25lZCBtX3Jlc3BvbnNlVHlwZSA6IDM7CisKKyAgICB1bnNpZ25lZCBtX3RpbWVvdXRNaWxsaXNl Y29uZHMgeyAwIH07CisKICAgICBzdGQ6OnVuaXF1ZV9wdHI8WE1MSHR0cFJlcXVlc3RVcGxvYWQ+ IG1fdXBsb2FkOwogCiAgICAgVVJMIG1fdXJsOwpAQCAtMTg1LDU2ICsyMTEsNDUgQEAgY2xhc3Mg WE1MSHR0cFJlcXVlc3QgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxYTUxIdHRwUmVxdWVzdD4s IHB1YmxpYyBYTUxIdHRwUmUKICAgICBIVFRQSGVhZGVyTWFwIG1fcmVxdWVzdEhlYWRlcnM7CiAg ICAgUmVmUHRyPEZvcm1EYXRhPiBtX3JlcXVlc3RFbnRpdHlCb2R5OwogICAgIFN0cmluZyBtX21p bWVUeXBlT3ZlcnJpZGU7Ci0gICAgYm9vbCBtX2FzeW5jIHsgdHJ1ZSB9OwotICAgIGJvb2wgbV9p bmNsdWRlQ3JlZGVudGlhbHMgeyBmYWxzZSB9OwogCiAgICAgUmVmUHRyPFRocmVhZGFibGVMb2Fk ZXI+IG1fbG9hZGVyOwotICAgIFN0YXRlIG1fc3RhdGUgeyBVTlNFTlQgfTsKLSAgICBib29sIG1f c2VuZEZsYWcgeyBmYWxzZSB9OwogCi0gICAgUmVzb3VyY2VSZXNwb25zZSBtX3Jlc3BvbnNlOwog ICAgIFN0cmluZyBtX3Jlc3BvbnNlRW5jb2Rpbmc7CiAKKyAgICBSZXNvdXJjZVJlc3BvbnNlIG1f cmVzcG9uc2U7CisKICAgICBSZWZQdHI8VGV4dFJlc291cmNlRGVjb2Rlcj4gbV9kZWNvZGVyOwog Ci0gICAgU3RyaW5nQnVpbGRlciBtX3Jlc3BvbnNlQnVpbGRlcjsKLSAgICBib29sIG1fY3JlYXRl ZERvY3VtZW50IHsgZmFsc2UgfTsKICAgICBSZWZQdHI8RG9jdW1lbnQ+IG1fcmVzcG9uc2VEb2N1 bWVudDsKIAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fYmluYXJ5UmVzcG9uc2VCdWlsZGVy OwogCi0gICAgYm9vbCBtX2Vycm9yIHsgZmFsc2UgfTsKLQotICAgIGJvb2wgbV91cGxvYWRMaXN0 ZW5lckZsYWcgeyBmYWxzZSB9OwotICAgIGJvb2wgbV91cGxvYWRDb21wbGV0ZSB7IGZhbHNlIH07 Ci0KLSAgICBib29sIG1fd2FzQWJvcnRlZEJ5Q2xpZW50IHsgZmFsc2UgfTsKKyAgICBTdHJpbmdC dWlsZGVyIG1fcmVzcG9uc2VCdWlsZGVyOwogCiAgICAgLy8gVXNlZCBmb3IgcHJvZ3Jlc3MgZXZl bnQgdHJhY2tpbmcuCiAgICAgbG9uZyBsb25nIG1fcmVjZWl2ZWRMZW5ndGggeyAwIH07CiAKLSAg ICBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbkNvZGU+IG1fZXhjZXB0aW9uQ29kZTsKLQogICAgIFhN TEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlIG1fcHJvZ3Jlc3NFdmVudFRocm90dGxl OwogCi0gICAgUmVzcG9uc2VUeXBlIG1fcmVzcG9uc2VUeXBlIHsgUmVzcG9uc2VUeXBlOjpFbXB0 eVN0cmluZyB9OwotICAgIGJvb2wgbV9yZXNwb25zZUNhY2hlSXNWYWxpZCB7IGZhbHNlIH07CiAg ICAgbXV0YWJsZSBTdHJpbmcgbV9hbGxSZXNwb25zZUhlYWRlcnM7CiAKICAgICBUaW1lciBtX3Jl c3VtZVRpbWVyOwotICAgIGJvb2wgbV9kaXNwYXRjaEVycm9yT25SZXN1bWluZyB7IGZhbHNlIH07 Ci0KICAgICBUaW1lciBtX25ldHdvcmtFcnJvclRpbWVyOwotICAgIHZvaWQgbmV0d29ya0Vycm9y VGltZXJGaXJlZCgpOworICAgIFRpbWVyIG1fdGltZW91dFRpbWVyOwogCi0gICAgdW5zaWduZWQg bV90aW1lb3V0TWlsbGlzZWNvbmRzIHsgMCB9OwogICAgIE1vbm90b25pY1RpbWUgbV9zZW5kaW5n VGltZTsKLSAgICBUaW1lciBtX3RpbWVvdXRUaW1lcjsKKworICAgIHN0ZDo6b3B0aW9uYWw8RXhj ZXB0aW9uQ29kZT4gbV9leGNlcHRpb25Db2RlOwogfTsKIAogaW5saW5lIGF1dG8gWE1MSHR0cFJl cXVlc3Q6OnJlc3BvbnNlVHlwZSgpIGNvbnN0IC0+IFJlc3BvbnNlVHlwZQogewotICAgIHJldHVy biBtX3Jlc3BvbnNlVHlwZTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UmVzcG9uc2VUeXBlPiht X3Jlc3BvbnNlVHlwZSk7Cit9CisKK2lubGluZSBhdXRvIFhNTEh0dHBSZXF1ZXN0OjpyZWFkeVN0 YXRlKCkgY29uc3QgLT4gU3RhdGUKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U3RhdGU+KG1f cmVhZHlTdGF0ZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUu Y3BwCmluZGV4IDU4YzJmZmJiMzk5NmJiMjFjM2RjYmU0MmM2N2I5NzRhNjgxYjAzOGUuLjRhMTlj NDc5Yzc2M2M3N2MzNmQ5MDJmYTRlYjkyZmU4MDA2ZmMxNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlLmNw cApAQCAtMzcsMTEgKzM3LDYgQEAgY29uc3QgU2Vjb25kcyBYTUxIdHRwUmVxdWVzdFByb2dyZXNz RXZlbnRUaHJvdHRsZTo6bWluaW11bVByb2dyZXNzRXZlbnREaXNwYXRjaGkKIAogWE1MSHR0cFJl cXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OlhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRo cm90dGxlKEV2ZW50VGFyZ2V0KiB0YXJnZXQpCiAgICAgOiBtX3RhcmdldCh0YXJnZXQpCi0gICAg LCBtX2hhc1Rocm90dGxlZFByb2dyZXNzRXZlbnQoZmFsc2UpCi0gICAgLCBtX2xlbmd0aENvbXB1 dGFibGUoZmFsc2UpCi0gICAgLCBtX2xvYWRlZCgwKQotICAgICwgbV90b3RhbCgwKQotICAgICwg bV9kZWZlckV2ZW50cyhmYWxzZSkKICAgICAsIG1fZGlzcGF0Y2hEZWZlcnJlZEV2ZW50c1RpbWVy KCp0aGlzLCAmWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoRGVm ZXJyZWRFdmVudHMpCiB7CiAgICAgQVNTRVJUKHRhcmdldCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5oCmluZGV4 IDAxYzE3YTY2ZjI5NWQ3NDZmNWEwZWQzYTA0NzFlYzc5YjgxMmEwYjMuLjU1M2YxMDM5OGE0YzA3 OTlkODY4ZjY1MWJmYzA2YTQ5YTZkMjIwOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3ht bC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5oCkBAIC02NywxNSAr NjcsMTYgQEAgY2xhc3MgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUgOiBwdWJs aWMgVGltZXJCYXNlIHsKICAgICAvLyBXZWFrIHBvaW50ZXIgdG8gb3VyIFhNTEh0dHBSZXF1ZXN0 IG9iamVjdCBhcyBpdCBpcyB0aGUgb25lIGhvbGRpbmcgdXMuCiAgICAgRXZlbnRUYXJnZXQqIG1f dGFyZ2V0OwogCi0gICAgYm9vbCBtX2hhc1Rocm90dGxlZFByb2dyZXNzRXZlbnQ7Ci0gICAgYm9v bCBtX2xlbmd0aENvbXB1dGFibGU7Ci0gICAgdW5zaWduZWQgbG9uZyBsb25nIG1fbG9hZGVkOwot ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBtX3RvdGFsOworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBt X2xvYWRlZCB7IDAgfTsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgbV90b3RhbCB7IDAgfTsKIAot ICAgIGJvb2wgbV9kZWZlckV2ZW50czsKICAgICBSZWZQdHI8RXZlbnQ+IG1fZGVmZXJyZWRQcm9n cmVzc0V2ZW50OwogICAgIFZlY3RvcjxSZWY8RXZlbnQ+PiBtX2RlZmVycmVkRXZlbnRzOwogICAg IFRpbWVyIG1fZGlzcGF0Y2hEZWZlcnJlZEV2ZW50c1RpbWVyOworCisgICAgYm9vbCBtX2hhc1Ro cm90dGxlZFByb2dyZXNzRXZlbnQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9sZW5ndGhDb21wdXRh YmxlIHsgZmFsc2UgfTsKKyAgICBib29sIG1fZGVmZXJFdmVudHMgeyBmYWxzZSB9OwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=