174281 2017-07-07 15:45:22 -0700 Lower the max_protection for the separated heap 2017-07-07 17:03:32 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aringer webkit-unassigned buildbot commit-queue keith_miller mark.lam msaboff oliver saam webkit-bug-importer oldest_to_newest 1326662 0 aringer 2017-07-07 15:45:22 -0700 Lower the max_protection for the separated heap 1326664 1 314886 aringer 2017-07-07 15:46:09 -0700 Created attachment 314886 Patch 1326665 2 oliver 2017-07-07 15:47:16 -0700 <rdar://problem/27452153> 1326667 3 314886 saam 2017-07-07 15:49:31 -0700 Comment on attachment 314886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314886&action=review > Source/JavaScriptCore/jit/ExecutableAllocator.cpp:224 > + result = vm_protect(mach_task_self(), (vm_address_t)stubBase, stubSize, true, VM_PROT_EXECUTE); > RELEASE_ASSERT(!result); > #endif > > // Prevent writing into the executable JIT mapping. > - result = mprotect(jitBase, jitSize, VM_PROT_READ | VM_PROT_EXECUTE); > + result = vm_protect(mach_task_self(), (vm_address_t)jitBase, jitSize, true, VM_PROT_READ | VM_PROT_EXECUTE); > RELEASE_ASSERT(!result); > > // Prevent execution in the writable JIT mapping. > - result = mprotect((void*)writableAddr, jitSize, VM_PROT_READ | VM_PROT_WRITE); > + result = vm_protect(mach_task_self(), (vm_address_t)writableAddr, jitSize, true, VM_PROT_READ | VM_PROT_WRITE); Style nit: Please use static_cast instead of C-style casts. 1326668 4 saam 2017-07-07 15:49:43 -0700 Oops, didn't mean to clear r+ 1326670 5 oliver 2017-07-07 15:54:45 -0700 (In reply to Saam Barati from comment #3) > Comment on attachment 314886 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=314886&action=review > > > Source/JavaScriptCore/jit/ExecutableAllocator.cpp:224 > > + result = vm_protect(mach_task_self(), (vm_address_t)stubBase, stubSize, true, VM_PROT_EXECUTE); > > RELEASE_ASSERT(!result); > > #endif > > > > // Prevent writing into the executable JIT mapping. > > - result = mprotect(jitBase, jitSize, VM_PROT_READ | VM_PROT_EXECUTE); > > + result = vm_protect(mach_task_self(), (vm_address_t)jitBase, jitSize, true, VM_PROT_READ | VM_PROT_EXECUTE); > > RELEASE_ASSERT(!result); > > > > // Prevent execution in the writable JIT mapping. > > - result = mprotect((void*)writableAddr, jitSize, VM_PROT_READ | VM_PROT_WRITE); > > + result = vm_protect(mach_task_self(), (vm_address_t)writableAddr, jitSize, true, VM_PROT_READ | VM_PROT_WRITE); > > Style nit: Please use static_cast instead of C-style casts. for void*? I think it might need to be reinterpret_cast<> because vmprotect is obnoxious and uses uint66 or some such nonsense 1326676 6 314886 oliver 2017-07-07 16:06:52 -0700 Comment on attachment 314886 Patch AJ is posting an updated patch 1326684 7 314892 aringer 2017-07-07 16:14:49 -0700 Created attachment 314892 Patch 1326705 8 314892 commit-queue 2017-07-07 17:03:31 -0700 Comment on attachment 314892 Patch Clearing flags on attachment: 314892 Committed r219273: <http://trac.webkit.org/changeset/219273> 1326706 9 commit-queue 2017-07-07 17:03:32 -0700 All reviewed patches have been landed. Closing bug. 314886 2017-07-07 15:46:09 -0700 2017-07-07 16:14:47 -0700 Patch bug-174281-20170707154607.patch text/plain 3585 aringer U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 YjYyNWQwNmVjZWI4MDJhYzAwNGVjNTA4NDg3NTBiMTM5ZDdhMzM3Li41ZTA2MzgwYzRjYTA0YWVl YzJiYzNkNTAwY2E3NTkxOGNiNDBmYzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNy0wNy0wNyAgQUogUmluZ2VyICA8YXJpbmdlckBhcHBsZS5jb20+CisK KyAgICAgICAgTG93ZXIgdGhlIG1heF9wcm90ZWN0aW9uIGZvciB0aGUgc2VwYXJhdGVkIGhlYXAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDI4MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaml0L0V4 ZWN1dGFibGVBbGxvY2F0b3IuY3BwOgorICAgICAgICAoSlNDOjpGaXhlZFZNUG9vbEV4ZWN1dGFi bGVBbGxvY2F0b3I6OmluaXRpYWxpemVTZXBhcmF0ZWRXWEhlYXBzKToKKyAgICAgICAgKEpTQzo6 RXhlY3V0YWJsZUFsbG9jYXRvcjo6YWxsb2NhdGUpOgorCiAyMDE3LTA3LTA1ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgV2ViS2l0UHJpdmF0ZUZy YW1ld29ya1N0dWJzIGZvciBpT1MgMTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0V4ZWN1dGFibGVBbGxvY2F0b3IuY3BwCmluZGV4IGNhMDZiMDNmMTVjZmU1MDA5MDUyMjdmNmE3 N2Y4YzE4NzUwYWVhNTcuLjZiZTVkNTA2MGFkNTY0ZDlhMGUwYWZhNGQ0MDljZDdlMTVkYzUyN2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvRXhlY3V0YWJsZUFsbG9jYXRv ci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9y LmNwcApAQCAtMjEyLDE2ICsyMTIsMTYgQEAgcHJpdmF0ZToKIAogI2lmIFVTRShFWEVDVVRFX09O TFlfSklUX1dSSVRFX0ZVTkNUSU9OKQogICAgICAgICAvLyBQcmV2ZW50IHJlYWRpbmcgdGhlIHdy aXRlIHRodW5rIGNvZGUuCi0gICAgICAgIHJlc3VsdCA9IG1wcm90ZWN0KHN0dWJCYXNlLCBzdHVi U2l6ZSwgVk1fUFJPVF9FWEVDVVRFX09OTFkpOworICAgICAgICByZXN1bHQgPSB2bV9wcm90ZWN0 KG1hY2hfdGFza19zZWxmKCksICh2bV9hZGRyZXNzX3Qpc3R1YkJhc2UsIHN0dWJTaXplLCB0cnVl LCBWTV9QUk9UX0VYRUNVVEUpOwogICAgICAgICBSRUxFQVNFX0FTU0VSVCghcmVzdWx0KTsKICNl bmRpZgogCiAgICAgICAgIC8vIFByZXZlbnQgd3JpdGluZyBpbnRvIHRoZSBleGVjdXRhYmxlIEpJ VCBtYXBwaW5nLgotICAgICAgICByZXN1bHQgPSBtcHJvdGVjdChqaXRCYXNlLCBqaXRTaXplLCBW TV9QUk9UX1JFQUQgfCBWTV9QUk9UX0VYRUNVVEUpOworICAgICAgICByZXN1bHQgPSB2bV9wcm90 ZWN0KG1hY2hfdGFza19zZWxmKCksICh2bV9hZGRyZXNzX3Qpaml0QmFzZSwgaml0U2l6ZSwgdHJ1 ZSwgVk1fUFJPVF9SRUFEIHwgVk1fUFJPVF9FWEVDVVRFKTsKICAgICAgICAgUkVMRUFTRV9BU1NF UlQoIXJlc3VsdCk7CiAKICAgICAgICAgLy8gUHJldmVudCBleGVjdXRpb24gaW4gdGhlIHdyaXRh YmxlIEpJVCBtYXBwaW5nLgotICAgICAgICByZXN1bHQgPSBtcHJvdGVjdCgodm9pZCopd3JpdGFi bGVBZGRyLCBqaXRTaXplLCBWTV9QUk9UX1JFQUQgfCBWTV9QUk9UX1dSSVRFKTsKKyAgICAgICAg cmVzdWx0ID0gdm1fcHJvdGVjdChtYWNoX3Rhc2tfc2VsZigpLCAodm1fYWRkcmVzc190KXdyaXRh YmxlQWRkciwgaml0U2l6ZSwgdHJ1ZSwgVk1fUFJPVF9SRUFEIHwgVk1fUFJPVF9XUklURSk7CiAg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCFyZXN1bHQpOwogCiAgICAgICAgIC8vIFplcm8gb3V0IHdy aXRhYmxlQWRkciB0byBhdm9pZCBsZWFraW5nIHRoZSBhZGRyZXNzIG9mIHRoZSB3cml0YWJsZSBt YXBwaW5nLgpAQCAtMzk2LDE2ICszOTYsMTYgQEAgUmVmUHRyPEV4ZWN1dGFibGVNZW1vcnlIYW5k bGU+IEV4ZWN1dGFibGVBbGxvY2F0b3I6OmFsbG9jYXRlKHNpemVfdCBzaXplSW5CeXRlcywKICAg ICAgICAgTWV0YUFsbG9jYXRvcjo6U3RhdGlzdGljcyBzdGF0cyA9IGFsbG9jYXRvci0+Y3VycmVu dFN0YXRpc3RpY3MoKTsKICAgICAgICAgZGF0YUxvZygiQWxsb2NhdGluZyAiLCBzaXplSW5CeXRl cywgIiBieXRlcyBvZiBleGVjdXRhYmxlIG1lbW9yeSB3aXRoICIsIHN0YXRzLmJ5dGVzQWxsb2Nh dGVkLCAiIGJ5dGVzIGFsbG9jYXRlZCwgIiwgc3RhdHMuYnl0ZXNSZXNlcnZlZCwgIiBieXRlcyBy ZXNlcnZlZCwgYW5kICIsIHN0YXRzLmJ5dGVzQ29tbWl0dGVkLCAiIGNvbW1pdHRlZC5cbiIpOwog ICAgIH0KLSAgICAKKwogICAgIGlmIChlZmZvcnQgIT0gSklUQ29tcGlsYXRpb25DYW5GYWlsICYm IE9wdGlvbnM6OnJlcG9ydE11c3RTdWNjZWVkRXhlY3V0YWJsZUFsbG9jYXRpb25zKCkpIHsKICAg ICAgICAgZGF0YUxvZygiQWxsb2NhdGluZyAiLCBzaXplSW5CeXRlcywgIiBieXRlcyBvZiBleGVj dXRhYmxlIG1lbW9yeSB3aXRoIEpJVENvbXBpbGF0aW9uTXVzdFN1Y2NlZWQuXG4iKTsKICAgICAg ICAgV1RGUmVwb3J0QmFja3RyYWNlKCk7CiAgICAgfQotICAgIAorCiAgICAgaWYgKGVmZm9ydCA9 PSBKSVRDb21waWxhdGlvbkNhbkZhaWwKICAgICAgICAgJiYgZG9FeGVjdXRhYmxlQWxsb2NhdGlv bkZ1enppbmdJZkVuYWJsZWQoKSA9PSBQcmV0ZW5kVG9GYWlsRXhlY3V0YWJsZUFsbG9jYXRpb24p CiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIAorCiAgICAgaWYgKGVmZm9ydCA9PSBKSVRD b21waWxhdGlvbkNhbkZhaWwpIHsKICAgICAgICAgLy8gRG9uJ3QgYWxsb3cgYWxsb2NhdGlvbnMg aWYgd2UgYXJlIGRvd24gdG8gcmVzZXJ2ZS4KICAgICAgICAgTWV0YUFsbG9jYXRvcjo6U3RhdGlz dGljcyBzdGF0aXN0aWNzID0gYWxsb2NhdG9yLT5jdXJyZW50U3RhdGlzdGljcygpOwpAQCAtNDE4 LDcgKzQxOCw3IEBAIFJlZlB0cjxFeGVjdXRhYmxlTWVtb3J5SGFuZGxlPiBFeGVjdXRhYmxlQWxs b2NhdG9yOjphbGxvY2F0ZShzaXplX3Qgc2l6ZUluQnl0ZXMsCiAgICAgICAgICAgICByZXR1cm4g bnVsbHB0cjsKICAgICAgICAgfQogICAgIH0KLSAgICAKKwogICAgIFJlZlB0cjxFeGVjdXRhYmxl TWVtb3J5SGFuZGxlPiByZXN1bHQgPSBhbGxvY2F0b3ItPmFsbG9jYXRlKHNpemVJbkJ5dGVzLCBv d25lclVJRCk7CiAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgaWYgKGVmZm9ydCAhPSBKSVRD b21waWxhdGlvbkNhbkZhaWwpIHsKQEAgLTQ1MSw3ICs0NTEsNyBAQCB2b2lkIEV4ZWN1dGFibGVB bGxvY2F0b3I6OmR1bXBQcm9maWxlKCkKICAgICBhbGxvY2F0b3ItPmR1bXBQcm9maWxlKCk7CiB9 CiAjZW5kaWYKLSAgICAKKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKEFTU0VNQkxFUikK 314892 2017-07-07 16:14:49 -0700 2017-07-07 17:03:31 -0700 Patch bug-174281-20170707161447.patch text/plain 3705 aringer U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 YjYyNWQwNmVjZWI4MDJhYzAwNGVjNTA4NDg3NTBiMTM5ZDdhMzM3Li4yZTAwZGZmNDM1ZTY1YzE4 ZmFhMzFmZjBkYzFiNmI0NTE4NjE4YTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxNy0wNy0wNyAgQUogUmluZ2VyICA8YXJpbmdlckBhcHBsZS5jb20+CisK KyAgICAgICAgTG93ZXIgdGhlIG1heF9wcm90ZWN0aW9uIGZvciB0aGUgc2VwYXJhdGVkIGhlYXAK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDI4MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCB0 byB2bV9wcm90ZWN0IHNvIHdlIGNhbiBzZXQgbWF4aW11bSBwYWdlIHByb3RlY3Rpb24uCisKKyAg ICAgICAgKiBqaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5jcHA6CisgICAgICAgIChKU0M6OkZpeGVk Vk1Qb29sRXhlY3V0YWJsZUFsbG9jYXRvcjo6aW5pdGlhbGl6ZVNlcGFyYXRlZFdYSGVhcHMpOgor ICAgICAgICAoSlNDOjpFeGVjdXRhYmxlQWxsb2NhdG9yOjphbGxvY2F0ZSk6CisKIDIwMTctMDct MDUgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBX ZWJLaXRQcml2YXRlRnJhbWV3b3JrU3R1YnMgZm9yIGlPUyAxMQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9FeGVjdXRhYmxlQWxsb2NhdG9yLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvRXhlY3V0YWJsZUFsbG9jYXRvci5jcHAKaW5kZXggY2EwNmIwM2YxNWNm ZTUwMDkwNTIyN2Y2YTc3ZjhjMTg3NTBhZWE1Ny4uN2VlY2FjN2Q1N2FlODcwNWEyZWVjMDAyY2Y0 NDNlMDgwNjVkNThlYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9FeGVj dXRhYmxlQWxsb2NhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0V4ZWN1 dGFibGVBbGxvY2F0b3IuY3BwCkBAIC0yMTIsMTYgKzIxMiwxNiBAQCBwcml2YXRlOgogCiAjaWYg VVNFKEVYRUNVVEVfT05MWV9KSVRfV1JJVEVfRlVOQ1RJT04pCiAgICAgICAgIC8vIFByZXZlbnQg cmVhZGluZyB0aGUgd3JpdGUgdGh1bmsgY29kZS4KLSAgICAgICAgcmVzdWx0ID0gbXByb3RlY3Qo c3R1YkJhc2UsIHN0dWJTaXplLCBWTV9QUk9UX0VYRUNVVEVfT05MWSk7CisgICAgICAgIHJlc3Vs dCA9IHZtX3Byb3RlY3QobWFjaF90YXNrX3NlbGYoKSwgcmVpbnRlcnByZXRfY2FzdDx2bV9hZGRy ZXNzX3Q+KHN0dWJCYXNlKSwgc3R1YlNpemUsIHRydWUsIFZNX1BST1RfRVhFQ1VURSk7CiAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKCFyZXN1bHQpOwogI2VuZGlmCiAKICAgICAgICAgLy8gUHJldmVu dCB3cml0aW5nIGludG8gdGhlIGV4ZWN1dGFibGUgSklUIG1hcHBpbmcuCi0gICAgICAgIHJlc3Vs dCA9IG1wcm90ZWN0KGppdEJhc2UsIGppdFNpemUsIFZNX1BST1RfUkVBRCB8IFZNX1BST1RfRVhF Q1VURSk7CisgICAgICAgIHJlc3VsdCA9IHZtX3Byb3RlY3QobWFjaF90YXNrX3NlbGYoKSwgcmVp bnRlcnByZXRfY2FzdDx2bV9hZGRyZXNzX3Q+KGppdEJhc2UpLCBqaXRTaXplLCB0cnVlLCBWTV9Q Uk9UX1JFQUQgfCBWTV9QUk9UX0VYRUNVVEUpOwogICAgICAgICBSRUxFQVNFX0FTU0VSVCghcmVz dWx0KTsKIAogICAgICAgICAvLyBQcmV2ZW50IGV4ZWN1dGlvbiBpbiB0aGUgd3JpdGFibGUgSklU IG1hcHBpbmcuCi0gICAgICAgIHJlc3VsdCA9IG1wcm90ZWN0KCh2b2lkKil3cml0YWJsZUFkZHIs IGppdFNpemUsIFZNX1BST1RfUkVBRCB8IFZNX1BST1RfV1JJVEUpOworICAgICAgICByZXN1bHQg PSB2bV9wcm90ZWN0KG1hY2hfdGFza19zZWxmKCksIHN0YXRpY19jYXN0PHZtX2FkZHJlc3NfdD4o d3JpdGFibGVBZGRyKSwgaml0U2l6ZSwgdHJ1ZSwgVk1fUFJPVF9SRUFEIHwgVk1fUFJPVF9XUklU RSk7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFyZXN1bHQpOwogCiAgICAgICAgIC8vIFplcm8g b3V0IHdyaXRhYmxlQWRkciB0byBhdm9pZCBsZWFraW5nIHRoZSBhZGRyZXNzIG9mIHRoZSB3cml0 YWJsZSBtYXBwaW5nLgpAQCAtMzk2LDE2ICszOTYsMTYgQEAgUmVmUHRyPEV4ZWN1dGFibGVNZW1v cnlIYW5kbGU+IEV4ZWN1dGFibGVBbGxvY2F0b3I6OmFsbG9jYXRlKHNpemVfdCBzaXplSW5CeXRl cywKICAgICAgICAgTWV0YUFsbG9jYXRvcjo6U3RhdGlzdGljcyBzdGF0cyA9IGFsbG9jYXRvci0+ Y3VycmVudFN0YXRpc3RpY3MoKTsKICAgICAgICAgZGF0YUxvZygiQWxsb2NhdGluZyAiLCBzaXpl SW5CeXRlcywgIiBieXRlcyBvZiBleGVjdXRhYmxlIG1lbW9yeSB3aXRoICIsIHN0YXRzLmJ5dGVz QWxsb2NhdGVkLCAiIGJ5dGVzIGFsbG9jYXRlZCwgIiwgc3RhdHMuYnl0ZXNSZXNlcnZlZCwgIiBi eXRlcyByZXNlcnZlZCwgYW5kICIsIHN0YXRzLmJ5dGVzQ29tbWl0dGVkLCAiIGNvbW1pdHRlZC5c biIpOwogICAgIH0KLSAgICAKKwogICAgIGlmIChlZmZvcnQgIT0gSklUQ29tcGlsYXRpb25DYW5G YWlsICYmIE9wdGlvbnM6OnJlcG9ydE11c3RTdWNjZWVkRXhlY3V0YWJsZUFsbG9jYXRpb25zKCkp IHsKICAgICAgICAgZGF0YUxvZygiQWxsb2NhdGluZyAiLCBzaXplSW5CeXRlcywgIiBieXRlcyBv ZiBleGVjdXRhYmxlIG1lbW9yeSB3aXRoIEpJVENvbXBpbGF0aW9uTXVzdFN1Y2NlZWQuXG4iKTsK ICAgICAgICAgV1RGUmVwb3J0QmFja3RyYWNlKCk7CiAgICAgfQotICAgIAorCiAgICAgaWYgKGVm Zm9ydCA9PSBKSVRDb21waWxhdGlvbkNhbkZhaWwKICAgICAgICAgJiYgZG9FeGVjdXRhYmxlQWxs b2NhdGlvbkZ1enppbmdJZkVuYWJsZWQoKSA9PSBQcmV0ZW5kVG9GYWlsRXhlY3V0YWJsZUFsbG9j YXRpb24pCiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIAorCiAgICAgaWYgKGVmZm9ydCA9 PSBKSVRDb21waWxhdGlvbkNhbkZhaWwpIHsKICAgICAgICAgLy8gRG9uJ3QgYWxsb3cgYWxsb2Nh dGlvbnMgaWYgd2UgYXJlIGRvd24gdG8gcmVzZXJ2ZS4KICAgICAgICAgTWV0YUFsbG9jYXRvcjo6 U3RhdGlzdGljcyBzdGF0aXN0aWNzID0gYWxsb2NhdG9yLT5jdXJyZW50U3RhdGlzdGljcygpOwpA QCAtNDE4LDcgKzQxOCw3IEBAIFJlZlB0cjxFeGVjdXRhYmxlTWVtb3J5SGFuZGxlPiBFeGVjdXRh YmxlQWxsb2NhdG9yOjphbGxvY2F0ZShzaXplX3Qgc2l6ZUluQnl0ZXMsCiAgICAgICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKICAgICAgICAgfQogICAgIH0KLSAgICAKKwogICAgIFJlZlB0cjxFeGVj dXRhYmxlTWVtb3J5SGFuZGxlPiByZXN1bHQgPSBhbGxvY2F0b3ItPmFsbG9jYXRlKHNpemVJbkJ5 dGVzLCBvd25lclVJRCk7CiAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgaWYgKGVmZm9ydCAh PSBKSVRDb21waWxhdGlvbkNhbkZhaWwpIHsKQEAgLTQ1MSw3ICs0NTEsNyBAQCB2b2lkIEV4ZWN1 dGFibGVBbGxvY2F0b3I6OmR1bXBQcm9maWxlKCkKICAgICBhbGxvY2F0b3ItPmR1bXBQcm9maWxl KCk7CiB9CiAjZW5kaWYKLSAgICAKKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKEFTU0VNQkxFUikK