mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 14:56:36 +00:00
shmpipe: Fix crash when sp_close_shm is called with self == NULL.
If sp_open_shm errors out trying to open a shm area, it would crash when trying to free the area. The RETURN_ERROR macro calls sp_shm_area_dec with self == NULL. sp_shm_area_dec calls sp_shm_close, with self == NULL, which it then tries to access a parameter of without checking. This patch checks to make sure self != NULL before accessing that parameter.
This commit is contained in:
parent
e8b4310aa6
commit
b9decbb056
1 changed files with 13 additions and 12 deletions
|
@ -297,14 +297,14 @@ sp_open_shm (char *path, int id, int writer, mode_t perms, size_t size)
|
|||
static void
|
||||
sp_close_shm (ShmPipe * self, ShmArea * area)
|
||||
{
|
||||
ShmArea *item = NULL;
|
||||
ShmArea *prev_item = NULL;
|
||||
|
||||
assert (area->use_count == 0);
|
||||
|
||||
if (area->allocspace)
|
||||
shm_alloc_space_free (area->allocspace);
|
||||
|
||||
if (self != NULL) {
|
||||
ShmArea *item = NULL;
|
||||
ShmArea *prev_item = NULL;
|
||||
|
||||
for (item = self->shm_area; item; item = item->next) {
|
||||
if (item == area) {
|
||||
|
@ -317,6 +317,7 @@ sp_close_shm (ShmPipe * self, ShmArea * area)
|
|||
prev_item = item;
|
||||
}
|
||||
assert (item);
|
||||
}
|
||||
|
||||
if (area->shm_area != MAP_FAILED)
|
||||
munmap (area->shm_area, area->shm_area_len);
|
||||
|
|
Loading…
Reference in a new issue