Merge pull request #20211 from kstuedem:fix_dshow_memory_leak

4 years ago · 61e30c15a9
parent d332f33346 64c018507b
commit 61e30c15a9
1 changed files with 4 additions and 1 deletions
--- a/modules/videoio/src/cap_dshow.cpp
+++ b/modules/videoio/src/cap_dshow.cpp
@ -2496,7 +2496,10 @@ static void findClosestSizeAndSubtype(videoDevice * VD, int widthIn, int heightI
                   int tempH = 999999;

                   //Don't want to get stuck in a loop
-                   if(stepX < 1 || stepY < 1) continue;
+                   if(stepX < 1 || stepY < 1){
+                       MyDeleteMediaType(pmtConfig);
+                       continue;
+                    }

                   //DebugPrintOut("min is %i %i max is %i %i - res is %i %i\n", scc.MinOutputSize.cx, scc.MinOutputSize.cy,  scc.MaxOutputSize.cx,  scc.MaxOutputSize.cy, stepX, stepY);
                   //DebugPrintOut("min frame duration is %i  max duration is %i\n", scc.MinFrameInterval, scc.MaxFrameInterval);