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

avoid deref

Browse source 
We can avoid a deref when we use container_of to get from the interface
to the handle.
This commit is contained in:
Wim Taymans 2016-10-12 17:27:29 +02:00
parent 6b3bb79e70
commit 82414810e8
23 changed files with 433 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/v4l2/v4l2-monitor.c
View file

@ -218,10 +218,10 @@ spa_v4l2_monitor_set_event_callback (SpaMonitor *monitor,
SpaResult res;
SpaV4l2Monitor *this;
if (monitor == NULL || monitor->handle == NULL)
if (monitor == NULL)
return SPA_RESULT_INVALID_ARGUMENTS;
this = (SpaV4l2Monitor *) monitor->handle;
this = SPA_CONTAINER_OF (monitor, SpaV4l2Monitor, monitor);
this->event_cb = callback;
this->user_data = user_data;
@ -271,10 +271,10 @@ spa_v4l2_monitor_enum_items (SpaMonitor *monitor,
struct udev_list_entry *devices;
struct udev_device *dev;
if (monitor == NULL || monitor->handle == NULL || item == NULL || state == NULL)
if (monitor == NULL || item == NULL || state == NULL)
return SPA_RESULT_INVALID_ARGUMENTS;
this = (SpaV4l2Monitor *) monitor->handle;
this = SPA_CONTAINER_OF (monitor, SpaV4l2Monitor, monitor);
if ((res = v4l2_udev_open (this)) < 0)
return res;
@ -315,7 +315,6 @@ spa_v4l2_monitor_enum_items (SpaMonitor *monitor,
}
static const SpaMonitor v4l2monitor = {
NULL,
NULL,
sizeof (SpaMonitor),
spa_v4l2_monitor_set_event_callback,
@ -385,7 +384,6 @@ v4l2_monitor_init (const SpaHandleFactory *factory,
this->uri.monitor = spa_id_map_get_id (this->map, SPA_MONITOR_URI);
this->monitor = v4l2monitor;
this->monitor.handle = handle;
return SPA_RESULT_OK;
}