mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: fixed a small leak and double free

Browse source
This commit is contained in:
raghu447 2020-06-15 12:01:19 +05:30
parent 5778de090f
commit 7c05a7f7b4
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/plugins/libcamera/libcamera-client.c
View file

@ -162,7 +162,6 @@ static int impl_clear(struct spa_handle *handle)
if(this->dev.camera) { if(this->dev.camera) {
deleteLibCamera(this->dev.camera); deleteLibCamera(this->dev.camera);
free(this->dev.camera);
this->dev.camera = NULL; this->dev.camera = NULL;
} }
return 0; return 0;

1
spa/plugins/libcamera/libcamera-source.c
View file

@ -900,7 +900,6 @@ static int impl_clear(struct spa_handle *handle)
if(port->dev.camera) { if(port->dev.camera) {
deleteLibCamera(port->dev.camera); deleteLibCamera(port->dev.camera);
free(port->dev.camera);
port->dev.camera = NULL; port->dev.camera = NULL;
} }
if(this->have_source) { if(this->have_source) {

19
spa/plugins/libcamera/libcamera_wrapper.cpp
View file

@ -529,6 +529,16 @@ extern "C" {
void LibCamera::stop() { void LibCamera::stop() {
this->disconnect(); this->disconnect();
uint32_t bufIdx = 0;
StreamConfiguration &cfg = this->config_->at(0);
Stream *stream = cfg.stream();
for (const std::unique_ptr<FrameBuffer> &buffer : this->allocator_->buffers(stream)) {
delete [] this->fd_[bufIdx];
bufIdx++;
}
delete [] this->fd_;
spa_log_info(this->log_, "Stopping camera ..."); spa_log_info(this->log_, "Stopping camera ...");
this->cam_->stop(); this->cam_->stop();
if(this->allocator_) { if(this->allocator_) {
@ -536,15 +546,6 @@ extern "C" {
this->allocator_ = nullptr; this->allocator_ = nullptr;
} }
if(this->fd_) {
for(uint32_t i = 0; i < this->nplanes_; i++) {
delete this->fd_[i];
this->fd_[i] = nullptr;
}
delete this->fd_;
this->fd_ = nullptr;
}
this->item_free_fn(); this->item_free_fn();
} }