145037 2015-05-14 20:47:02 -0700 Have DOMWindow::createWindow() take references to frames 2015-05-14 22:08:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue japhet kling koivisto oldest_to_newest 1095019 0 cdumez 2015-05-14 20:47:02 -0700 Have DOMWindow::createWindow() take references to frames instead of pointers as they are expected to be non-null. Also return a RefPtr instead of a PassRefPtr. 1095020 1 253173 cdumez 2015-05-14 20:49:09 -0700 Created attachment 253173 Patch 1095021 2 commit-queue 2015-05-14 20:50:50 -0700 Attachment 253173 did not pass style-queue: ERROR: Source/WebCore/page/DOMWindow.h:356: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/DOMWindow.cpp:2075: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1095025 3 253173 gyuyoung.kim 2015-05-14 21:17:19 -0700 Comment on attachment 253173 Patch LGTM. 1095031 4 253173 commit-queue 2015-05-14 22:08:53 -0700 Comment on attachment 253173 Patch Clearing flags on attachment: 253173 Committed r184372: <http://trac.webkit.org/changeset/184372> 1095032 5 commit-queue 2015-05-14 22:08:57 -0700 All reviewed patches have been landed. Closing bug. 253173 2015-05-14 20:49:09 -0700 2015-05-14 22:08:53 -0700 Patch bug-145037-20150514204745.patch text/plain 10367 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE4N2ZiYjI5ZDY0MmQ5 MzAwNzNlMWFmY2ViOTllZWI1NTkyYWE2Yy4uZDU0NWFlOTU3MWUyYzAxMjIxMjRmMjkxODVhZDhl ZDkxY2ZiMTkyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA1LTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgSGF2ZSBET01XaW5kb3c6OmNy ZWF0ZVdpbmRvdygpIHRha2UgcmVmZXJlbmNlcyB0byBmcmFtZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTAzNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhdmUgRE9NV2luZG93OjpjcmVhdGVXaW5k b3coKSB0YWtlIHJlZmVyZW5jZXMgdG8gZnJhbWVzIGluc3RlYWQgb2YKKyAgICAgICAgcG9pbnRl cnMgYXMgdGhleSBhcmUgZXhwZWN0ZWQgdG8gYmUgbm9uLW51bGwuIEFsc28gcmV0dXJuIGEgUmVm UHRyCisgICAgICAgIGluc3RlYWQgb2YgYSBQYXNzUmVmUHRyLgorCisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6b3BlbkluTmV3VGFiKToKKyAgICAgICAgKiBs b2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlV2luZG93KToK KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRv dy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyk6CisgICAg ICAgIChXZWJDb3JlOjpET01XaW5kb3c6Om9wZW4pOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2lu ZG93OjpzaG93TW9kYWxEaWFsb2cpOgorICAgICAgICAqIHBhZ2UvRE9NV2luZG93Lmg6CisKIDIw MTUtMDUtMTQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXggYWZ0ZXIgcjE4NDM1OTsgdHlwby4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLmNwcApp bmRleCBjYjI0ZDFmNWY4YWFiOTI2N2QwYzQwYzY2NzVhMTcxODY4MTlhZjQwLi4zNzRkY2MxMTMx NDFiMzBlNmEwODU3ZjdkOTcyNGFjMGEwMWZhZGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCkBAIC0y MTQsNyArMjE0LDcgQEAgdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpvcGVuSW5O ZXdUYWIoY29uc3QgU3RyaW5nJiB1cmwpCiAKICAgICBib29sIGNyZWF0ZWQ7CiAgICAgV2luZG93 RmVhdHVyZXMgd2luZG93RmVhdHVyZXM7Ci0gICAgUmVmUHRyPEZyYW1lPiBmcmFtZSA9IFdlYkNv cmU6OmNyZWF0ZVdpbmRvdyhtYWluRnJhbWUsICZtYWluRnJhbWUsIHJlcXVlc3QsIHdpbmRvd0Zl YXR1cmVzLCBjcmVhdGVkKTsKKyAgICBSZWZQdHI8RnJhbWU+IGZyYW1lID0gV2ViQ29yZTo6Y3Jl YXRlV2luZG93KG1haW5GcmFtZSwgbWFpbkZyYW1lLCByZXF1ZXN0LCB3aW5kb3dGZWF0dXJlcywg Y3JlYXRlZCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBlZDQ5NDhlMGMwY2Y2OWM3NzUwZDViZmJmNjE3 YmYyMzFjMzZmN2UwLi5hNDQ0ZTkzZTUwYzNjYWEyNDBhNTE1NmU5NmQ3MzM5MDkyMmEyZDdjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTM0MTUsMTkgKzM0MTUsMTkg QEAgYm9vbCBGcmFtZUxvYWRlckNsaWVudDo6aGFzSFRNTFZpZXcoKSBjb25zdAogICAgIHJldHVy biB0cnVlOwogfQogCi1QYXNzUmVmUHRyPEZyYW1lPiBjcmVhdGVXaW5kb3coRnJhbWUmIG9wZW5l ckZyYW1lLCBGcmFtZSogbG9va3VwRnJhbWUsIGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVl c3QsIGNvbnN0IFdpbmRvd0ZlYXR1cmVzJiBmZWF0dXJlcywgYm9vbCYgY3JlYXRlZCkKK1JlZlB0 cjxGcmFtZT4gY3JlYXRlV2luZG93KEZyYW1lJiBvcGVuZXJGcmFtZSwgRnJhbWUmIGxvb2t1cEZy YW1lLCBjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXaW5kb3dGZWF0dXJl cyYgZmVhdHVyZXMsIGJvb2wmIGNyZWF0ZWQpCiB7CiAgICAgQVNTRVJUKCFmZWF0dXJlcy5kaWFs b2cgfHwgcmVxdWVzdC5mcmFtZU5hbWUoKS5pc0VtcHR5KCkpOwogCiAgICAgY3JlYXRlZCA9IGZh bHNlOwogCiAgICAgaWYgKCFyZXF1ZXN0LmZyYW1lTmFtZSgpLmlzRW1wdHkoKSAmJiByZXF1ZXN0 LmZyYW1lTmFtZSgpICE9ICJfYmxhbmsiKSB7Ci0gICAgICAgIGlmIChSZWZQdHI8RnJhbWU+IGZy YW1lID0gbG9va3VwRnJhbWUtPmxvYWRlcigpLmZpbmRGcmFtZUZvck5hdmlnYXRpb24ocmVxdWVz dC5mcmFtZU5hbWUoKSwgb3BlbmVyRnJhbWUuZG9jdW1lbnQoKSkpIHsKKyAgICAgICAgaWYgKFJl ZlB0cjxGcmFtZT4gZnJhbWUgPSBsb29rdXBGcmFtZS5sb2FkZXIoKS5maW5kRnJhbWVGb3JOYXZp Z2F0aW9uKHJlcXVlc3QuZnJhbWVOYW1lKCksIG9wZW5lckZyYW1lLmRvY3VtZW50KCkpKSB7CiAg ICAgICAgICAgICBpZiAocmVxdWVzdC5mcmFtZU5hbWUoKSAhPSAiX3NlbGYiKSB7CiAgICAgICAg ICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgpKQogICAgICAgICAgICAgICAg ICAgICBwYWdlLT5jaHJvbWUoKS5mb2N1cygpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAg cmV0dXJuIGZyYW1lLnJlbGVhc2UoKTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om1vdmUoZnJh bWUpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNTE4LDcgKzM1MTgsNyBAQCBQYXNzUmVmUHRy PEZyYW1lPiBjcmVhdGVXaW5kb3coRnJhbWUmIG9wZW5lckZyYW1lLCBGcmFtZSogbG9va3VwRnJh bWUsIGNvbnN0IEZyYQogICAgIHBhZ2UtPmNocm9tZSgpLnNob3coKTsKIAogICAgIGNyZWF0ZWQg PSB0cnVlOwotICAgIHJldHVybiBmcmFtZS5yZWxlYXNlKCk7CisgICAgcmV0dXJuIFdURjo6bW92 ZShmcmFtZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmgKaW5kZXggOGY0NjJkMjkxNWIyOGFkZDFmMTcwZTYzOWZkMzY2MmQwNmJhZjQy OC4uNTc5ODA3YTZmMzhjMmE0MDkyMjk4MzRhYmQ2NTA2OWQ3ODU1NmYzNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTQ1OCw3ICs0NTgsNyBAQCBwcml2YXRlOgogLy8KIC8v IEZJWE1FOiBDb25zaWRlciBtYWtpbmcgdGhpcyBmdW5jdGlvbiBwYXJ0IG9mIGFuIGFwcHJvcHJp YXRlIGNsYXNzIChub3QgRnJhbWVMb2FkZXIpCiAvLyBhbmQgbW92aW5nIGl0IHRvIGEgbW9yZSBh cHByb3ByaWF0ZSBsb2NhdGlvbi4KLVBhc3NSZWZQdHI8RnJhbWU+IGNyZWF0ZVdpbmRvdyhGcmFt ZSYgb3BlbmVyRnJhbWUsIEZyYW1lKiBsb29rdXBGcmFtZSwgY29uc3QgRnJhbWVMb2FkUmVxdWVz dCYsIGNvbnN0IFdpbmRvd0ZlYXR1cmVzJiwgYm9vbCYgY3JlYXRlZCk7CitSZWZQdHI8RnJhbWU+ IGNyZWF0ZVdpbmRvdyhGcmFtZSYgb3BlbmVyRnJhbWUsIEZyYW1lJiBsb29rdXBGcmFtZSwgY29u c3QgRnJhbWVMb2FkUmVxdWVzdCYsIGNvbnN0IFdpbmRvd0ZlYXR1cmVzJiwgYm9vbCYgY3JlYXRl ZCk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3Bw CmluZGV4IGE5Yzg1ZDMxMDczYzM4YjM5MTM0NTE1YmFlZTExYjE3OTYzNDA2NWQuLmIyYTdkN2M1 NTJjOWRjZjUxNTAyOTcxODg4ZjQ0NjAwOWRmNTRjZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRv dy5jcHAKQEAgLTIwNzIsMTMgKzIwNzIsMTMgQEAgYm9vbCBET01XaW5kb3c6OmlzSW5zZWN1cmVT Y3JpcHRBY2Nlc3MoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIGNvbnN0IFN0cmluZyYgdXIKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAotUGFzc1JlZlB0cjxGcmFtZT4gRE9NV2luZG93OjpjcmVhdGVX aW5kb3coY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IEF0b21pY1N0cmluZyYgZnJhbWVO YW1lLCBjb25zdCBXaW5kb3dGZWF0dXJlcyYgd2luZG93RmVhdHVyZXMsIERPTVdpbmRvdyYgYWN0 aXZlV2luZG93LCBGcmFtZSogZmlyc3RGcmFtZSwgRnJhbWUqIG9wZW5lckZyYW1lLCBzdGQ6OmZ1 bmN0aW9uPHZvaWQgKERPTVdpbmRvdyYpPiBwcmVwYXJlRGlhbG9nRnVuY3Rpb24pCitSZWZQdHI8 RnJhbWU+IERPTVdpbmRvdzo6Y3JlYXRlV2luZG93KGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBj b25zdCBBdG9taWNTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgV2luZG93RmVhdHVyZXMmIHdpbmRv d0ZlYXR1cmVzLCBET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgRnJhbWUmIGZpcnN0RnJhbWUsIEZy YW1lJiBvcGVuZXJGcmFtZSwgc3RkOjpmdW5jdGlvbjx2b2lkIChET01XaW5kb3cmKT4gcHJlcGFy ZURpYWxvZ0Z1bmN0aW9uKQogewogICAgIEZyYW1lKiBhY3RpdmVGcmFtZSA9IGFjdGl2ZVdpbmRv dy5mcmFtZSgpOwogICAgIGlmICghYWN0aXZlRnJhbWUpCiAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgVVJMIGNvbXBsZXRlZFVSTCA9IHVybFN0cmluZy5pc0VtcHR5KCkgPyBVUkwoUGFy c2VkVVJMU3RyaW5nLCBlbXB0eVN0cmluZygpKSA6IGZpcnN0RnJhbWUtPmRvY3VtZW50KCktPmNv bXBsZXRlVVJMKHVybFN0cmluZyk7CisgICAgVVJMIGNvbXBsZXRlZFVSTCA9IHVybFN0cmluZy5p c0VtcHR5KCkgPyBVUkwoUGFyc2VkVVJMU3RyaW5nLCBlbXB0eVN0cmluZygpKSA6IGZpcnN0RnJh bWUuZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwodXJsU3RyaW5nKTsKICAgICBpZiAoIWNvbXBsZXRl ZFVSTC5pc0VtcHR5KCkgJiYgIWNvbXBsZXRlZFVSTC5pc1ZhbGlkKCkpIHsKICAgICAgICAgLy8g RG9uJ3QgZXhwb3NlIGNsaWVudCBjb2RlIHRvIGludmFsaWQgVVJMcy4KICAgICAgICAgYWN0aXZl V2luZG93LnByaW50RXJyb3JNZXNzYWdlKCJVbmFibGUgdG8gb3BlbiBhIHdpbmRvdyB3aXRoIGlu dmFsaWQgVVJMICciICsgY29tcGxldGVkVVJMLnN0cmluZygpICsgIicuXG4iKTsKQEAgLTIwODYs MTAgKzIwODYsMTAgQEAgUGFzc1JlZlB0cjxGcmFtZT4gRE9NV2luZG93OjpjcmVhdGVXaW5kb3co Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IEF0b21pY1MKICAgICB9CiAKICAgICAvLyBG b3Igd2hhdGV2ZXIgcmVhc29uLCBGaXJlZm94IHVzZXMgdGhlIGZpcnN0IGZyYW1lIHRvIGRldGVy bWluZSB0aGUgb3V0Z29pbmdSZWZlcnJlci4gV2UgcmVwbGljYXRlIHRoYXQgYmVoYXZpb3IgaGVy ZS4KLSAgICBTdHJpbmcgcmVmZXJyZXIgPSBTZWN1cml0eVBvbGljeTo6Z2VuZXJhdGVSZWZlcnJl ckhlYWRlcihmaXJzdEZyYW1lLT5kb2N1bWVudCgpLT5yZWZlcnJlclBvbGljeSgpLCBjb21wbGV0 ZWRVUkwsIGZpcnN0RnJhbWUtPmxvYWRlcigpLm91dGdvaW5nUmVmZXJyZXIoKSk7CisgICAgU3Ry aW5nIHJlZmVycmVyID0gU2VjdXJpdHlQb2xpY3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIoZmly c3RGcmFtZS5kb2N1bWVudCgpLT5yZWZlcnJlclBvbGljeSgpLCBjb21wbGV0ZWRVUkwsIGZpcnN0 RnJhbWUubG9hZGVyKCkub3V0Z29pbmdSZWZlcnJlcigpKTsKIAogICAgIFJlc291cmNlUmVxdWVz dCByZXF1ZXN0KGNvbXBsZXRlZFVSTCwgcmVmZXJyZXIpOwotICAgIEZyYW1lTG9hZGVyOjphZGRI VFRQT3JpZ2luSWZOZWVkZWQocmVxdWVzdCwgZmlyc3RGcmFtZS0+bG9hZGVyKCkub3V0Z29pbmdP cmlnaW4oKSk7CisgICAgRnJhbWVMb2FkZXI6OmFkZEhUVFBPcmlnaW5JZk5lZWRlZChyZXF1ZXN0 LCBmaXJzdEZyYW1lLmxvYWRlcigpLm91dGdvaW5nT3JpZ2luKCkpOwogICAgIEZyYW1lTG9hZFJl cXVlc3QgZnJhbWVSZXF1ZXN0KGFjdGl2ZVdpbmRvdy5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdp bigpLCByZXF1ZXN0LCBmcmFtZU5hbWUsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJk TGlzdDo6Tm8sIE1heWJlU2VuZFJlZmVycmVyLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6 OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OkFsbG93LCBSZXBsYWNlRG9jdW1lbnRJZkphdmFT Y3JpcHRVUkwpOwogCiAgICAgLy8gV2UgcGFzcyB0aGUgb3BlbmVyIGZyYW1lIGZvciB0aGUgbG9v a3VwRnJhbWUgaW4gY2FzZSB0aGUgYWN0aXZlIGZyYW1lIGlzIGRpZmZlcmVudCBmcm9tCkBAIC0y MDk5LDExICsyMDk5LDExIEBAIFBhc3NSZWZQdHI8RnJhbWU+IERPTVdpbmRvdzo6Y3JlYXRlV2lu ZG93KGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBBdG9taWNTCiAgICAgaWYgKCFuZXdG cmFtZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBuZXdGcmFtZS0+bG9hZGVyKCku c2V0T3BlbmVyKG9wZW5lckZyYW1lKTsKKyAgICBuZXdGcmFtZS0+bG9hZGVyKCkuc2V0T3BlbmVy KCZvcGVuZXJGcmFtZSk7CiAgICAgbmV3RnJhbWUtPnBhZ2UoKS0+c2V0T3BlbmVkQnlET00oKTsK IAogICAgIGlmIChuZXdGcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPmlzSW5zZWN1cmVT Y3JpcHRBY2Nlc3MoYWN0aXZlV2luZG93LCBjb21wbGV0ZWRVUkwpKQotICAgICAgICByZXR1cm4g bmV3RnJhbWUucmVsZWFzZSgpOworICAgICAgICByZXR1cm4gV1RGOjptb3ZlKG5ld0ZyYW1lKTsK IAogICAgIGlmIChwcmVwYXJlRGlhbG9nRnVuY3Rpb24pCiAgICAgICAgIHByZXBhcmVEaWFsb2dG dW5jdGlvbigqbmV3RnJhbWUtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpKTsKQEAgLTIxMjEsNyAr MjEyMSw3IEBAIFBhc3NSZWZQdHI8RnJhbWU+IERPTVdpbmRvdzo6Y3JlYXRlV2luZG93KGNvbnN0 IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBBdG9taWNTCiAgICAgaWYgKCFuZXdGcmFtZS0+cGFn ZSgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIHJldHVybiBuZXdGcmFtZS5yZWxl YXNlKCk7CisgICAgcmV0dXJuIFdURjo6bW92ZShuZXdGcmFtZSk7CiB9CiAKIFBhc3NSZWZQdHI8 RE9NV2luZG93PiBET01XaW5kb3c6Om9wZW4oY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0 IEF0b21pY1N0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBTdHJpbmcmIHdpbmRvd0ZlYXR1cmVzU3Ry aW5nLApAQCAtMjEzNyw4ICsyMTM3LDcgQEAgUGFzc1JlZlB0cjxET01XaW5kb3c+IERPTVdpbmRv dzo6b3Blbihjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgQXRvbWljU3RyaW4KICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CiAKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQotICAg IGlmIChmaXJzdEZyYW1lCi0gICAgICAgICYmIGZpcnN0RnJhbWUtPmRvY3VtZW50KCkKKyAgICBp ZiAoZmlyc3RGcmFtZS0+ZG9jdW1lbnQoKQogICAgICAgICAmJiBmaXJzdEZyYW1lLT5tYWluRnJh bWUoKS5wYWdlKCkKICAgICAgICAgJiYgZmlyc3RGcmFtZS0+bWFpbkZyYW1lKCkucGFnZSgpLT51 c2VyQ29udGVudENvbnRyb2xsZXIoKQogICAgICAgICAmJiBmaXJzdEZyYW1lLT5tYWluRnJhbWUo KS5kb2N1bWVudCgpKSB7CkBAIC0yMTkwLDcgKzIxODksNyBAQCBQYXNzUmVmUHRyPERPTVdpbmRv dz4gRE9NV2luZG93OjpvcGVuKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBBdG9taWNT dHJpbgogICAgIH0KIAogICAgIFdpbmRvd0ZlYXR1cmVzIHdpbmRvd0ZlYXR1cmVzKHdpbmRvd0Zl YXR1cmVzU3RyaW5nKTsKLSAgICBSZWZQdHI8RnJhbWU+IHJlc3VsdCA9IGNyZWF0ZVdpbmRvdyh1 cmxTdHJpbmcsIGZyYW1lTmFtZSwgd2luZG93RmVhdHVyZXMsIGFjdGl2ZVdpbmRvdywgZmlyc3RG cmFtZSwgbV9mcmFtZSk7CisgICAgUmVmUHRyPEZyYW1lPiByZXN1bHQgPSBjcmVhdGVXaW5kb3co dXJsU3RyaW5nLCBmcmFtZU5hbWUsIHdpbmRvd0ZlYXR1cmVzLCBhY3RpdmVXaW5kb3csICpmaXJz dEZyYW1lLCAqbV9mcmFtZSk7CiAgICAgcmV0dXJuIHJlc3VsdCA/IHJlc3VsdC0+ZG9jdW1lbnQo KS0+ZG9tV2luZG93KCkgOiBudWxscHRyOwogfQogCkBAIC0yMjE1LDcgKzIyMTQsNyBAQCB2b2lk IERPTVdpbmRvdzo6c2hvd01vZGFsRGlhbG9nKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25z dCBTdHJpbmcmIGRpYWxvZ0ZlYQogICAgICAgICByZXR1cm47CiAKICAgICBXaW5kb3dGZWF0dXJl cyB3aW5kb3dGZWF0dXJlcyhkaWFsb2dGZWF0dXJlc1N0cmluZywgc2NyZWVuQXZhaWxhYmxlUmVj dChtX2ZyYW1lLT52aWV3KCkpKTsKLSAgICBSZWZQdHI8RnJhbWU+IGRpYWxvZ0ZyYW1lID0gY3Jl YXRlV2luZG93KHVybFN0cmluZywgZW1wdHlBdG9tLCB3aW5kb3dGZWF0dXJlcywgYWN0aXZlV2lu ZG93LCBmaXJzdEZyYW1lLCBtX2ZyYW1lLCBXVEY6Om1vdmUocHJlcGFyZURpYWxvZ0Z1bmN0aW9u KSk7CisgICAgUmVmUHRyPEZyYW1lPiBkaWFsb2dGcmFtZSA9IGNyZWF0ZVdpbmRvdyh1cmxTdHJp bmcsIGVtcHR5QXRvbSwgd2luZG93RmVhdHVyZXMsIGFjdGl2ZVdpbmRvdywgKmZpcnN0RnJhbWUs ICptX2ZyYW1lLCBXVEY6Om1vdmUocHJlcGFyZURpYWxvZ0Z1bmN0aW9uKSk7CiAgICAgaWYgKCFk aWFsb2dGcmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgIGRpYWxvZ0ZyYW1lLT5wYWdlKCktPmNo cm9tZSgpLnJ1bk1vZGFsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdp bmRvdy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaAppbmRleCA1NjUzZWNlNDgz MjYxZTJlYzhlODBhZmZkMjA2ZTg2MzI4ZjI4ZGE4Li41ODliM2M1ZmM1NjVkODI1NmQwMjc0YmYy ZTY4MzhlM2JlM2M5NGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRv dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgKQEAgLTM1Myw3ICszNTMs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCByZWZFdmVudFRh cmdldCgpIG92ZXJyaWRlIHsgcmVmKCk7IH0KICAgICAgICAgdmlydHVhbCB2b2lkIGRlcmVmRXZl bnRUYXJnZXQoKSBvdmVycmlkZSB7IGRlcmVmKCk7IH0KIAotICAgICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxGcmFtZT4gY3JlYXRlV2luZG93KGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBB dG9taWNTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgV2luZG93RmVhdHVyZXMmLCBET01XaW5kb3cm IGFjdGl2ZVdpbmRvdywgRnJhbWUqIGZpcnN0RnJhbWUsIEZyYW1lKiBvcGVuZXJGcmFtZSwgc3Rk OjpmdW5jdGlvbjx2b2lkIChET01XaW5kb3cmKT4gcHJlcGFyZURpYWxvZ0Z1bmN0aW9uID0gbnVs bHB0cik7CisgICAgICAgIHN0YXRpYyBSZWZQdHI8RnJhbWU+IGNyZWF0ZVdpbmRvdyhjb25zdCBT dHJpbmcmIHVybFN0cmluZywgY29uc3QgQXRvbWljU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IFdp bmRvd0ZlYXR1cmVzJiwgRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIEZyYW1lJiBmaXJzdEZyYW1l LCBGcmFtZSYgb3BlbmVyRnJhbWUsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoRE9NV2luZG93Jik+IHBy ZXBhcmVEaWFsb2dGdW5jdGlvbiA9IG51bGxwdHIpOwogICAgICAgICBib29sIGlzSW5zZWN1cmVT Y3JpcHRBY2Nlc3MoRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nKTsKIAogICAgICAgICB2b2lkIHJlc2V0RE9NV2luZG93UHJvcGVydGllcygpOwo=