Skip to content

B
benchmark
Commit f835dfa8 by Chris Kennelly
Options

Merge pull request #10 from Constellation/fix-segv

Ensure families is not nullptr before using it
parents 254a6f9a 45b79c3e
Showing with 3 additions and 0 deletions
AUTHORS
...@@ -14,3 +14,4 @@ Dominic Hamon <dma@stripysock.com> ...@@ -14,3 +14,4 @@ Dominic Hamon <dma@stripysock.com>
Eugene Zhuk <eugene.zhuk@gmail.com> Eugene Zhuk <eugene.zhuk@gmail.com>
Google Inc. Google Inc.
Oleksandr Sochka <sasha.sochka@gmail.com> Oleksandr Sochka <sasha.sochka@gmail.com>
Yusuke Suzuki <utatane.tea@gmail.com>
CONTRIBUTORS
...@@ -28,3 +28,4 @@ Dominic Hamon <dma@stripysock.com> ...@@ -28,3 +28,4 @@ Dominic Hamon <dma@stripysock.com>
Eugene Zhuk <eugene.zhuk@gmail.com> Eugene Zhuk <eugene.zhuk@gmail.com>
Oleksandr Sochka <sasha.sochka@gmail.com> Oleksandr Sochka <sasha.sochka@gmail.com>
Pierre Phaneuf <pphaneuf@google.com> Pierre Phaneuf <pphaneuf@google.com>
Yusuke Suzuki <utatane.tea@gmail.com>
src/benchmark.cc
...@@ -757,6 +757,7 @@ void Benchmark::FindBenchmarks(const std::string& spec, ...@@ -757,6 +757,7 @@ void Benchmark::FindBenchmarks(const std::string& spec,
} }
mutex_lock l(&benchmark_mutex); mutex_lock l(&benchmark_mutex);
if (families == nullptr) return; // There's no families.
for (Benchmark* family : *families) { for (Benchmark* family : *families) {
if (family == nullptr) continue; // Family was deleted if (family == nullptr) continue; // Family was deleted
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment