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

Fixes Coverity CID 1419523.

Marton Balint committed 8 years ago

Commit 87455b71 parent 5f6126e1 file · +5 −12Browse files

Showing the changes to libavdevice/decklink_common.cpp (1 of 1 file). Show all

Unified · Split

                 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,
+            if (!new_device->device_name ||
-                                              &device_list->nb_devices, new_device)) < 0) {
+                !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);

Keyboard shortcuts