Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I7ca7fb6143ec296c16a37a7be236470dbd1742a7

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 4bf448c31..27cdd84db 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -1116,8 +1116,8 @@ void DSCameraSession::updateSourceCapabilities()
                         long listSize = 0;
                         LONGLONG *frameRates = nullptr;
                         SIZE size = { resolution.width(), resolution.height() };
-                        if (SUCCEEDED(pVideoControl->GetFrameRateList(pPin, iIndex, size,
-                                                                      &listSize, &frameRates))) {
+                        hr = pVideoControl->GetFrameRateList(pPin, iIndex, size, &listSize, &frameRates);
+                        if (hr == S_OK && listSize > 0 && frameRates) {
                             for (long i = 0; i < listSize; ++i) {
                                 qreal fr = qreal(10000000) / frameRates[i];
                                 frameRateRanges.append(QCamera::FrameRateRange(fr, fr));
@@ -1126,6 +1126,8 @@ void DSCameraSession::updateSourceCapabilities()
                             // Make sure higher frame rates come first
                             std::sort(frameRateRanges.begin(), frameRateRanges.end(), qt_frameRateRangeGreaterThan);
                         }
+
+                        CoTaskMemFree(frameRates);
                         pPin->Release();
                     }
                 }