Browse Source

avdevice/decklink: fix leak when listing devices and there is no memory

Fixes Coverity CID 1419523.

Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n4.0
Marton Balint 7 years ago
parent
commit
87455b78cc
1 changed files with 5 additions and 12 deletions
  1. +5
    -12
      libavdevice/decklink_common.cpp

+ 5
- 12
libavdevice/decklink_common.cpp View File

@@ -322,21 +322,14 @@ int ff_decklink_list_devices(AVFormatContext *avctx,
ret = AVERROR(ENOMEM);
goto next;
}
new_device->device_name = av_strdup(displayName);
if (!new_device->device_name) {
ret = AVERROR(ENOMEM);
goto next;
}

new_device->device_name = av_strdup(displayName);
new_device->device_description = av_strdup(displayName);
if (!new_device->device_description) {
av_freep(&new_device->device_name);
ret = AVERROR(ENOMEM);
goto next;
}

if ((ret = av_dynarray_add_nofree(&device_list->devices,
&device_list->nb_devices, new_device)) < 0) {
if (!new_device->device_name ||
!new_device->device_description ||
av_dynarray_add_nofree(&device_list->devices, &device_list->nb_devices, new_device) < 0) {
ret = AVERROR(ENOMEM);
av_freep(&new_device->device_name);
av_freep(&new_device->device_description);
av_freep(&new_device);


Loading…
Cancel
Save