| commit | 43b69a6dc23580004c823d5dcc30f912da34b3ad | [log] [tgz] |
|---|---|---|
| author | Daniel Hung-yu Wu <hywu@google.com> | Mon Feb 24 15:06:09 2020 +0800 |
| committer | Commit Bot <commit-bot@chromium.org> | Wed Feb 26 23:23:29 2020 +0000 |
| tree | 881bc8c97cb2b85b43269138cca279a36d80e895 | |
| parent | f2a9f168f5c88160ca1efd1ff62773dc6e62b4f5 [diff] |
camera: camera3_test: fix segfault with metadata vendor ops BUG=b:149891235 TEST=tast run sparky360 camera.HAL3Device Change-Id: Ibc16354f7ecd7bd020e5e18450957e6165df1bd4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2069978 Reviewed-by: Shik Chen <shik@chromium.org> Tested-by: Hung-yu Wu <hywu@chromium.org> Commit-Queue: Shik Chen <shik@chromium.org> (cherry picked from commit e13a5f16d39711cbb8ce36552332a18d652d53b9) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2075320 Reviewed-by: Hung-yu Wu <hywu@chromium.org> Commit-Queue: Hung-yu Wu <hywu@chromium.org>
diff --git a/camera/camera3_test/camera3_module_test.cc b/camera/camera3_test/camera3_module_test.cc index 7684a9f..99f2b42 100644 --- a/camera/camera3_test/camera3_module_test.cc +++ b/camera/camera3_test/camera3_module_test.cc
@@ -226,7 +226,7 @@ }(); if (cam_module->get_vendor_tag_ops) { - vendor_tag_ops ops = {}; + static vendor_tag_ops ops = {}; cam_module->get_vendor_tag_ops(&ops); ASSERT_EQ(0, set_camera_metadata_vendor_ops(&ops)) << "Failed to set camera metadata vendor ops";