223444 2021-03-18 08:52:09 -0700 Avoid heap allocations under BiquadDSPKernel::updateCoefficientsIfNecessary() 2021-03-18 12:24:24 -0700 1 1 1 Unclassified WebKit Web Audio WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 223226 1 cdumez cdumez cdumez darin eric.carlson ews-watchlist ggaren glenn jer.noble peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1741211 0 cdumez 2021-03-18 08:52:09 -0700 Avoid heap allocations under BiquadDSPKernel::updateCoefficientsIfNecessary() since this runs on the audio thread. 1741212 1 cdumez 2021-03-18 08:52:26 -0700 Thread 10 Crashed:: offline renderer 0 com.apple.JavaScriptCore 0x00000007b7d88aee 0x7b7d86000 + 10990 1 com.apple.JavaScriptCore 0x00000007b952629b 0x7b7d86000 + 24773275 2 com.apple.JavaScriptCore 0x00000007b7dc6a5f 0x7b7d86000 + 264799 3 com.apple.WebCore 0x000000079abfe795 WebCore::AudioArray<float>::resize(WTF::Checked<unsigned long, WTF::CrashOnOverflow>) + 133 (AudioArray.h:65) 4 com.apple.WebCore 0x000000079abfe701 WebCore::AudioArray<float>::AudioArray(unsigned long) + 65 (AudioArray.h:45) 5 com.apple.WebCore 0x000000079abd7b2d WebCore::AudioArray<float>::AudioArray(unsigned long) + 29 (AudioArray.h:44) 6 com.apple.WebCore 0x000000079ac41bb1 WebCore::BiquadDSPKernel::updateCoefficientsIfNecessary(unsigned long) + 129 (BiquadDSPKernel.cpp:45) 7 com.apple.WebCore 0x000000079ac42571 WebCore::BiquadDSPKernel::process(float const*, float*, unsigned long) + 161 (BiquadDSPKernel.cpp:140) 8 com.apple.WebCore 0x000000079ac43789 WebCore::BiquadProcessor::process(WebCore::AudioBus const*, WebCore::AudioBus*, unsigned long) + 233 (BiquadProcessor.cpp:106) 9 com.apple.WebCore 0x000000079abc0f3d WebCore::AudioBasicProcessorNode::process(unsigned long) + 253 (AudioBasicProcessorNode.cpp:86) 10 com.apple.WebCore 0x000000079abdc5be WebCore::AudioNode::processIfNecessary(unsigned long) + 462 (AudioNode.cpp:474) 11 com.apple.WebCore 0x000000079abdee77 WebCore::AudioNodeOutput::pull(WebCore::AudioBus*, unsigned long) + 407 (AudioNodeOutput.cpp:124) 12 com.apple.WebCore 0x000000079abdec46 WebCore::AudioNodeInput::sumAllConnections(WebCore::AudioBus*, unsigned long) + 566 (AudioNodeInput.cpp:197) 13 com.apple.WebCore 0x000000079abd7477 WebCore::AudioNodeInput::pull(WebCore::AudioBus*, unsigned long) + 295 (AudioNodeInput.cpp:225) 14 com.apple.WebCore 0x000000079abd7015 WebCore::AudioDestinationNode::render(WebCore::AudioBus*, WebCore::AudioBus*, unsigned long, WebCore::AudioIOPosition const&) + 469 (AudioDestinationNode.cpp:94) 15 com.apple.WebCore 0x000000079ac9e11d WebCore::OfflineAudioDestinationNode::offlineRender() + 877 (OfflineAudioDestinationNode.cpp:164) 16 com.apple.WebCore 0x000000079acbe213 WebCore::OfflineAudioDestinationNode::startRendering(WTF::CompletionHandler<void (WTF::Optional<WebCore::Exception>&&)>&&)::$_2::operator()() + 35 (OfflineAudioDestinationNode.cpp:103) 17 com.apple.WebCore 0x000000079acbfbee WTF::Detail::CallableWrapper<WebCore::OfflineAudioDestinationNode::startRendering(WTF::CompletionHandler<void (WTF::Optional<WebCore::Exception>&&)>&&)::$_2, void>::call() + 30 (Function.h:52) 1741213 2 423603 cdumez 2021-03-18 08:54:21 -0700 Created attachment 423603 Patch 1741281 3 423603 peng.liu6 2021-03-18 11:25:25 -0700 Comment on attachment 423603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423603&action=review > Source/WebCore/Modules/webaudio/BiquadDSPKernel.cpp:61 > + RELEASE_ASSERT(framesToProcess <= AudioUtilities::renderQuantumSize); Is this change intentional? 1741285 4 423603 darin 2021-03-18 11:27:48 -0700 Comment on attachment 423603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423603&action=review >> Source/WebCore/Modules/webaudio/BiquadDSPKernel.cpp:61 >> + RELEASE_ASSERT(framesToProcess <= AudioUtilities::renderQuantumSize); > > Is this change intentional? I had assumed it was, and I think it’s a good idea to check this at runtime unconditionally. 1741286 5 423603 darin 2021-03-18 11:28:29 -0700 Comment on attachment 423603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423603&action=review > Source/WebCore/Modules/webaudio/BiquadDSPKernel.cpp:41 > +static bool hasConstantValue(float* values, size_t framesToProcess) Could consider returning false if framesToProcess is 0, rather than reading an uninitialized value and then returning true. 1741293 6 cdumez 2021-03-18 11:41:41 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 423603 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=423603&action=review > > >> Source/WebCore/Modules/webaudio/BiquadDSPKernel.cpp:61 > >> + RELEASE_ASSERT(framesToProcess <= AudioUtilities::renderQuantumSize); > > > > Is this change intentional? > > I had assumed it was, and I think it’s a good idea to check this at runtime > unconditionally. Yes, definitely intentional as we we get a security bug if this assertion did not hold. 1741294 7 cdumez 2021-03-18 11:41:57 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 423603 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=423603&action=review > > > Source/WebCore/Modules/webaudio/BiquadDSPKernel.cpp:41 > > +static bool hasConstantValue(float* values, size_t framesToProcess) > > Could consider returning false if framesToProcess is 0, rather than reading > an uninitialized value and then returning true. Will make this change before landing. 1741296 8 423626 cdumez 2021-03-18 11:44:59 -0700 Created attachment 423626 Patch 1741326 9 ews-feeder 2021-03-18 12:23:07 -0700 Committed r274664: <https://commits.webkit.org/r274664> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423626. 1741327 10 webkit-bug-importer 2021-03-18 12:24:24 -0700 <rdar://problem/75584924> 423603 2021-03-18 08:54:21 -0700 2021-03-18 11:44:57 -0700 Patch bug-223444-20210318085420.patch text/plain 4572 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM0NjYzODU4OGJkMGFh ZmVkYTJhYmM3ZDMwZGJhNDlkODE5ZDU1Zi4uYjE1NjZiZWM3Mjg4Y2E0OWJhZDUxY2NjNDNiYTA0 NzExMDY3MTVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgaGVhcCBhbGxvY2F0 aW9ucyB1bmRlciBCaXF1YWREU1BLZXJuZWw6OnVwZGF0ZUNvZWZmaWNpZW50c0lmTmVjZXNzYXJ5 KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQ0 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBm bG9hdFtdIGluc3RlYWQgb2YgQXVkaW9GbG9hdEFycmF5IGZvciBsb2NhbCB2YXJpYWJsZXMgaW4g dXBkYXRlQ29lZmZpY2llbnRzSWZOZWNlc3NhcnkoKQorICAgICAgICBpbiBvcmRlciB0byBhdm9p ZCBkb2luZyBoZWFwIGFsbG9jYXRpb25zIG9uIHRoZSBhdWRpbyB0aHJlYWQsIGZvciBwZXJmb3Jt YW5jZSByZWFzb25zLgorCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9CaXF1YWREU1BLZXJu ZWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFzQ29uc3RhbnRWYWx1ZSk6CisgICAgICAgIChX ZWJDb3JlOjpCaXF1YWREU1BLZXJuZWw6OnVwZGF0ZUNvZWZmaWNpZW50c0lmTmVjZXNzYXJ5KToK KwogMjAyMS0wMy0xNyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBbR1BVUF0gbWVkaWEvdmlkZW8tc2V0LXJhdGUtZnJvbS1wYXVzZS5odG1sIGZhaWxz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0JpcXVhZERTUEtl cm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0JpcXVhZERTUEtlcm5l bC5jcHAKaW5kZXggYWU0MTZmODliZGI1ODM0ODhiNzE2ODE3MTRiYTQzOTMwNGViZTU3OC4uOTk1 NTAyZWE4OGIxZThiZWEzYTA2MWE1YTRjZWY2MDAxZWFiYmIwZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9CaXF1YWREU1BLZXJuZWwuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQmlxdWFkRFNQS2VybmVsLmNwcApAQCAtMzgsMzAg KzM4LDQzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGJvb2wgaGFzQ29uc3Rh bnRWYWx1ZShmbG9hdCogdmFsdWVzLCBzaXplX3QgZnJhbWVzVG9Qcm9jZXNzKQoreworICAgIGZs b2F0IGNvbnN0YW50ID0gdmFsdWVzWzBdOworICAgIGZvciAoc2l6ZV90IGkgPSAxOyBpIDwgZnJh bWVzVG9Qcm9jZXNzOyArK2kpIHsKKyAgICAgICAgaWYgKHZhbHVlc1tpXSAhPSBjb25zdGFudCkK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisK IHZvaWQgQmlxdWFkRFNQS2VybmVsOjp1cGRhdGVDb2VmZmljaWVudHNJZk5lY2Vzc2FyeShzaXpl X3QgZnJhbWVzVG9Qcm9jZXNzKQogewogICAgIGlmIChiaXF1YWRQcm9jZXNzb3IoKS0+ZmlsdGVy Q29lZmZpY2llbnRzRGlydHkoKSkgewogICAgICAgICBpZiAoYmlxdWFkUHJvY2Vzc29yKCktPmhh c1NhbXBsZUFjY3VyYXRlVmFsdWVzKCkgJiYgYmlxdWFkUHJvY2Vzc29yKCktPnNob3VsZFVzZUFS YXRlKCkpIHsKLSAgICAgICAgICAgIEF1ZGlvRmxvYXRBcnJheSBjdXRvZmZGcmVxdWVuY3koZnJh bWVzVG9Qcm9jZXNzKTsKLSAgICAgICAgICAgIEF1ZGlvRmxvYXRBcnJheSBxKGZyYW1lc1RvUHJv Y2Vzcyk7Ci0gICAgICAgICAgICBBdWRpb0Zsb2F0QXJyYXkgZ2FpbihmcmFtZXNUb1Byb2Nlc3Mp OwotICAgICAgICAgICAgQXVkaW9GbG9hdEFycmF5IGRldHVuZShmcmFtZXNUb1Byb2Nlc3MpOyAv LyBpbiBDZW50cworICAgICAgICAgICAgLy8gVXNlIGZsb2F0IGFycmF5cyBpbnN0ZWFkIG9mIEF1 ZGlvRmxvYXRBcnJheSB0byBhdm9pZCBoZWFwIGFsbG9jYXRpb25zIG9uIHRoZSBhdWRpbyB0aHJl YWQuCisgICAgICAgICAgICBmbG9hdCBjdXRvZmZGcmVxdWVuY3lbQXVkaW9VdGlsaXRpZXM6OnJl bmRlclF1YW50dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IHFbQXVkaW9VdGlsaXRpZXM6OnJl bmRlclF1YW50dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IGdhaW5bQXVkaW9VdGlsaXRpZXM6 OnJlbmRlclF1YW50dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IGRldHVuZVtBdWRpb1V0aWxp dGllczo6cmVuZGVyUXVhbnR1bVNpemVdOyAvLyBpbiBDZW50cwogCi0gICAgICAgICAgICBBU1NF UlQoZnJhbWVzVG9Qcm9jZXNzIDw9IEF1ZGlvVXRpbGl0aWVzOjpyZW5kZXJRdWFudHVtU2l6ZSk7 CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChmcmFtZXNUb1Byb2Nlc3MgPD0gQXVkaW9VdGls aXRpZXM6OnJlbmRlclF1YW50dW1TaXplKTsKIAotICAgICAgICAgICAgYmlxdWFkUHJvY2Vzc29y KCktPnBhcmFtZXRlcjEoKS5jYWxjdWxhdGVTYW1wbGVBY2N1cmF0ZVZhbHVlcyhjdXRvZmZGcmVx dWVuY3kuZGF0YSgpLCBmcmFtZXNUb1Byb2Nlc3MpOwotICAgICAgICAgICAgYmlxdWFkUHJvY2Vz c29yKCktPnBhcmFtZXRlcjIoKS5jYWxjdWxhdGVTYW1wbGVBY2N1cmF0ZVZhbHVlcyhxLmRhdGEo KSwgZnJhbWVzVG9Qcm9jZXNzKTsKLSAgICAgICAgICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJh bWV0ZXIzKCkuY2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZ2Fpbi5kYXRhKCksIGZyYW1l c1RvUHJvY2Vzcyk7Ci0gICAgICAgICAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyNCgp LmNhbGN1bGF0ZVNhbXBsZUFjY3VyYXRlVmFsdWVzKGRldHVuZS5kYXRhKCksIGZyYW1lc1RvUHJv Y2Vzcyk7CisgICAgICAgICAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMSgpLmNhbGN1 bGF0ZVNhbXBsZUFjY3VyYXRlVmFsdWVzKGN1dG9mZkZyZXF1ZW5jeSwgZnJhbWVzVG9Qcm9jZXNz KTsKKyAgICAgICAgICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIyKCkuY2FsY3VsYXRl U2FtcGxlQWNjdXJhdGVWYWx1ZXMocSwgZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAgICAgICAgIGJp cXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIzKCkuY2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1 ZXMoZ2FpbiwgZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAgICAgICAgIGJpcXVhZFByb2Nlc3Nvcigp LT5wYXJhbWV0ZXI0KCkuY2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZGV0dW5lLCBmcmFt ZXNUb1Byb2Nlc3MpOwogCiAgICAgICAgICAgICAvLyBJZiBhbGwgdGhlIHZhbHVlcyBhcmUgYWN0 dWFsbHkgY29uc3RhbnQgZm9yIHRoaXMgcmVuZGVyIChvciB0aGUKICAgICAgICAgICAgIC8vIGF1 dG9tYXRpb24gcmF0ZSBpcyAiay1yYXRlIiBmb3IgYWxsIG9mIHRoZSBBdWRpb1BhcmFtcyksIHdl IGRvbid0IG5lZWQKICAgICAgICAgICAgIC8vIHRvIGNvbXB1dGUgZmlsdGVyIGNvZWZmaWNpZW50 cyBmb3IgZWFjaCBmcmFtZSBzaW5jZSB0aGV5IHdvdWxkIGJlIHRoZQogICAgICAgICAgICAgLy8g c2FtZSBhcyB0aGUgZmlyc3QuCi0gICAgICAgICAgICBib29sIGlzQ29uc3RhbnQgPSBjdXRvZmZG cmVxdWVuY3kuY29udGFpbnNDb25zdGFudFZhbHVlKCkgJiYgcS5jb250YWluc0NvbnN0YW50VmFs dWUoKQotICAgICAgICAgICAgICAgICYmIGdhaW4uY29udGFpbnNDb25zdGFudFZhbHVlKCkgJiYg ZGV0dW5lLmNvbnRhaW5zQ29uc3RhbnRWYWx1ZSgpOworICAgICAgICAgICAgYm9vbCBpc0NvbnN0 YW50ID0gaGFzQ29uc3RhbnRWYWx1ZShjdXRvZmZGcmVxdWVuY3ksIGZyYW1lc1RvUHJvY2VzcykK KyAgICAgICAgICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKHEsIGZyYW1lc1RvUHJvY2VzcykK KyAgICAgICAgICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKGdhaW4sIGZyYW1lc1RvUHJvY2Vz cykKKyAgICAgICAgICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKGRldHVuZSwgZnJhbWVzVG9Q cm9jZXNzKTsKIAotICAgICAgICAgICAgdXBkYXRlQ29lZmZpY2llbnRzKGlzQ29uc3RhbnQgPyAx IDogZnJhbWVzVG9Qcm9jZXNzLCBjdXRvZmZGcmVxdWVuY3kuZGF0YSgpLCBxLmRhdGEoKSwgZ2Fp bi5kYXRhKCksIGRldHVuZS5kYXRhKCkpOworICAgICAgICAgICAgdXBkYXRlQ29lZmZpY2llbnRz KGlzQ29uc3RhbnQgPyAxIDogZnJhbWVzVG9Qcm9jZXNzLCBjdXRvZmZGcmVxdWVuY3ksIHEsIGdh aW4sIGRldHVuZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBmbG9hdCBjdXRvZmZG cmVxdWVuY3kgPSBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMSgpLmZpbmFsVmFsdWUoKTsK ICAgICAgICAgICAgIGZsb2F0IHEgPSBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMigpLmZp bmFsVmFsdWUoKTsK 423626 2021-03-18 11:44:59 -0700 2021-03-18 12:23:09 -0700 Patch bug-223444-20210318114458.patch text/plain 4620 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY4ZDZkYzE3NWZjMjY1 ZTllOTc0N2E5OTgyMTg1NGZiZGJlZTNiYi4uZGEyMTkwOTg0MTgwMGQyY2MwZTBhOWY0OTkzNjRm MjVjMzFjYTNkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgaGVhcCBhbGxvY2F0 aW9ucyB1bmRlciBCaXF1YWREU1BLZXJuZWw6OnVwZGF0ZUNvZWZmaWNpZW50c0lmTmVjZXNzYXJ5 KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQ0 NAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFVzZSBmbG9h dFtdIGluc3RlYWQgb2YgQXVkaW9GbG9hdEFycmF5IGZvciBsb2NhbCB2YXJpYWJsZXMgaW4gdXBk YXRlQ29lZmZpY2llbnRzSWZOZWNlc3NhcnkoKQorICAgICAgICBpbiBvcmRlciB0byBhdm9pZCBk b2luZyBoZWFwIGFsbG9jYXRpb25zIG9uIHRoZSBhdWRpbyB0aHJlYWQsIGZvciBwZXJmb3JtYW5j ZSByZWFzb25zLgorCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9CaXF1YWREU1BLZXJuZWwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFzQ29uc3RhbnRWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpCaXF1YWREU1BLZXJuZWw6OnVwZGF0ZUNvZWZmaWNpZW50c0lmTmVjZXNzYXJ5KToKKwog MjAyMS0wMy0xOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEF2 b2lkIGhlYXAgYWxsb2NhdGlvbiB1bmRlciBQYW5uZXJOb2RlOjpwdWxsSW5wdXRzKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQmlxdWFkRFNQS2VybmVsLmNw cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQmlxdWFkRFNQS2VybmVsLmNwcApp bmRleCBhZTQxNmY4OWJkYjU4MzQ4OGI3MTY4MTcxNGJhNDM5MzA0ZWJlNTc4Li5lMmQxNGJlNzQ3 NmRlMDljM2FiOWYxNDQ2YjY0Y2ZmNDRmOTFjZDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmF1ZGlvL0JpcXVhZERTUEtlcm5lbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy93ZWJhdWRpby9CaXF1YWREU1BLZXJuZWwuY3BwCkBAIC0zOCwzMCArMzgsNDYg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgYm9vbCBoYXNDb25zdGFudFZhbHVl KGZsb2F0KiB2YWx1ZXMsIHNpemVfdCBmcmFtZXNUb1Byb2Nlc3MpCit7CisgICAgaWYgKGZyYW1l c1RvUHJvY2VzcyA8PSAxKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGZsb2F0IGNvbnN0 YW50ID0gdmFsdWVzWzBdOworICAgIGZvciAoc2l6ZV90IGkgPSAxOyBpIDwgZnJhbWVzVG9Qcm9j ZXNzOyArK2kpIHsKKyAgICAgICAgaWYgKHZhbHVlc1tpXSAhPSBjb25zdGFudCkKKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKIHZvaWQgQmlx dWFkRFNQS2VybmVsOjp1cGRhdGVDb2VmZmljaWVudHNJZk5lY2Vzc2FyeShzaXplX3QgZnJhbWVz VG9Qcm9jZXNzKQogewogICAgIGlmIChiaXF1YWRQcm9jZXNzb3IoKS0+ZmlsdGVyQ29lZmZpY2ll bnRzRGlydHkoKSkgewogICAgICAgICBpZiAoYmlxdWFkUHJvY2Vzc29yKCktPmhhc1NhbXBsZUFj Y3VyYXRlVmFsdWVzKCkgJiYgYmlxdWFkUHJvY2Vzc29yKCktPnNob3VsZFVzZUFSYXRlKCkpIHsK LSAgICAgICAgICAgIEF1ZGlvRmxvYXRBcnJheSBjdXRvZmZGcmVxdWVuY3koZnJhbWVzVG9Qcm9j ZXNzKTsKLSAgICAgICAgICAgIEF1ZGlvRmxvYXRBcnJheSBxKGZyYW1lc1RvUHJvY2Vzcyk7Ci0g ICAgICAgICAgICBBdWRpb0Zsb2F0QXJyYXkgZ2FpbihmcmFtZXNUb1Byb2Nlc3MpOwotICAgICAg ICAgICAgQXVkaW9GbG9hdEFycmF5IGRldHVuZShmcmFtZXNUb1Byb2Nlc3MpOyAvLyBpbiBDZW50 cworICAgICAgICAgICAgLy8gVXNlIGZsb2F0IGFycmF5cyBpbnN0ZWFkIG9mIEF1ZGlvRmxvYXRB cnJheSB0byBhdm9pZCBoZWFwIGFsbG9jYXRpb25zIG9uIHRoZSBhdWRpbyB0aHJlYWQuCisgICAg ICAgICAgICBmbG9hdCBjdXRvZmZGcmVxdWVuY3lbQXVkaW9VdGlsaXRpZXM6OnJlbmRlclF1YW50 dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IHFbQXVkaW9VdGlsaXRpZXM6OnJlbmRlclF1YW50 dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IGdhaW5bQXVkaW9VdGlsaXRpZXM6OnJlbmRlclF1 YW50dW1TaXplXTsKKyAgICAgICAgICAgIGZsb2F0IGRldHVuZVtBdWRpb1V0aWxpdGllczo6cmVu ZGVyUXVhbnR1bVNpemVdOyAvLyBpbiBDZW50cwogCi0gICAgICAgICAgICBBU1NFUlQoZnJhbWVz VG9Qcm9jZXNzIDw9IEF1ZGlvVXRpbGl0aWVzOjpyZW5kZXJRdWFudHVtU2l6ZSk7CisgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVChmcmFtZXNUb1Byb2Nlc3MgPD0gQXVkaW9VdGlsaXRpZXM6OnJl bmRlclF1YW50dW1TaXplKTsKIAotICAgICAgICAgICAgYmlxdWFkUHJvY2Vzc29yKCktPnBhcmFt ZXRlcjEoKS5jYWxjdWxhdGVTYW1wbGVBY2N1cmF0ZVZhbHVlcyhjdXRvZmZGcmVxdWVuY3kuZGF0 YSgpLCBmcmFtZXNUb1Byb2Nlc3MpOwotICAgICAgICAgICAgYmlxdWFkUHJvY2Vzc29yKCktPnBh cmFtZXRlcjIoKS5jYWxjdWxhdGVTYW1wbGVBY2N1cmF0ZVZhbHVlcyhxLmRhdGEoKSwgZnJhbWVz VG9Qcm9jZXNzKTsKLSAgICAgICAgICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIzKCku Y2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZ2Fpbi5kYXRhKCksIGZyYW1lc1RvUHJvY2Vz cyk7Ci0gICAgICAgICAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyNCgpLmNhbGN1bGF0 ZVNhbXBsZUFjY3VyYXRlVmFsdWVzKGRldHVuZS5kYXRhKCksIGZyYW1lc1RvUHJvY2Vzcyk7Cisg ICAgICAgICAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMSgpLmNhbGN1bGF0ZVNhbXBs ZUFjY3VyYXRlVmFsdWVzKGN1dG9mZkZyZXF1ZW5jeSwgZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAg ICAgICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIyKCkuY2FsY3VsYXRlU2FtcGxlQWNj dXJhdGVWYWx1ZXMocSwgZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAgICAgICAgIGJpcXVhZFByb2Nl c3NvcigpLT5wYXJhbWV0ZXIzKCkuY2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZ2Fpbiwg ZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAgICAgICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0 ZXI0KCkuY2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZGV0dW5lLCBmcmFtZXNUb1Byb2Nl c3MpOwogCiAgICAgICAgICAgICAvLyBJZiBhbGwgdGhlIHZhbHVlcyBhcmUgYWN0dWFsbHkgY29u c3RhbnQgZm9yIHRoaXMgcmVuZGVyIChvciB0aGUKICAgICAgICAgICAgIC8vIGF1dG9tYXRpb24g cmF0ZSBpcyAiay1yYXRlIiBmb3IgYWxsIG9mIHRoZSBBdWRpb1BhcmFtcyksIHdlIGRvbid0IG5l ZWQKICAgICAgICAgICAgIC8vIHRvIGNvbXB1dGUgZmlsdGVyIGNvZWZmaWNpZW50cyBmb3IgZWFj aCBmcmFtZSBzaW5jZSB0aGV5IHdvdWxkIGJlIHRoZQogICAgICAgICAgICAgLy8gc2FtZSBhcyB0 aGUgZmlyc3QuCi0gICAgICAgICAgICBib29sIGlzQ29uc3RhbnQgPSBjdXRvZmZGcmVxdWVuY3ku Y29udGFpbnNDb25zdGFudFZhbHVlKCkgJiYgcS5jb250YWluc0NvbnN0YW50VmFsdWUoKQotICAg ICAgICAgICAgICAgICYmIGdhaW4uY29udGFpbnNDb25zdGFudFZhbHVlKCkgJiYgZGV0dW5lLmNv bnRhaW5zQ29uc3RhbnRWYWx1ZSgpOworICAgICAgICAgICAgYm9vbCBpc0NvbnN0YW50ID0gaGFz Q29uc3RhbnRWYWx1ZShjdXRvZmZGcmVxdWVuY3ksIGZyYW1lc1RvUHJvY2VzcykKKyAgICAgICAg ICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKHEsIGZyYW1lc1RvUHJvY2VzcykKKyAgICAgICAg ICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKGdhaW4sIGZyYW1lc1RvUHJvY2VzcykKKyAgICAg ICAgICAgICAgICAmJiBoYXNDb25zdGFudFZhbHVlKGRldHVuZSwgZnJhbWVzVG9Qcm9jZXNzKTsK IAotICAgICAgICAgICAgdXBkYXRlQ29lZmZpY2llbnRzKGlzQ29uc3RhbnQgPyAxIDogZnJhbWVz VG9Qcm9jZXNzLCBjdXRvZmZGcmVxdWVuY3kuZGF0YSgpLCBxLmRhdGEoKSwgZ2Fpbi5kYXRhKCks IGRldHVuZS5kYXRhKCkpOworICAgICAgICAgICAgdXBkYXRlQ29lZmZpY2llbnRzKGlzQ29uc3Rh bnQgPyAxIDogZnJhbWVzVG9Qcm9jZXNzLCBjdXRvZmZGcmVxdWVuY3ksIHEsIGdhaW4sIGRldHVu ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBmbG9hdCBjdXRvZmZGcmVxdWVuY3kg PSBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMSgpLmZpbmFsVmFsdWUoKTsKICAgICAgICAg ICAgIGZsb2F0IHEgPSBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMigpLmZpbmFsVmFsdWUo KTsK