summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNícolas F. R. A. Prado <nfraprado@collabora.com>2021-04-06 15:23:34 -0300
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2021-04-14 16:33:09 +0200
commit63dd6a832722f801e93286f03428061dd0b16c00 (patch)
tree58e0c824d71793ebdb73b0876c17d18d9ce80cd9
parent330ea9d946f97001593f65a08276c44076fb0f10 (diff)
libcamera: pipeline: rkisp1: Assert empty queuedRequests before clearing frameInfo
Assert that there are no queued requests before clearing the frameInfo, otherwise a SEGFAULT can occur. This issue happened while running lc-compliance. Suggested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index c122c9be..3c8d9dfe 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -842,6 +842,7 @@ void PipelineHandlerRkISP1::stop(Camera *camera)
LOG(RkISP1, Warning)
<< "Failed to stop parameters for " << camera->id();
+ ASSERT(data->queuedRequests_.empty());
data->frameInfo_.clear();
freeBuffers(camera);