[vlc-commits] [Git][videolan/vlc][master] 2 commits: dxva2_deinterlace: fix undefined behavior when psz_mode is NULL

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d0084e58 by Steve Lhomme at 2024-01-11T08:32:43+00:00
dxva2_deinterlace: fix undefined behavior when psz_mode is NULL

- - - - -
d91240b3 by Steve Lhomme at 2024-01-11T08:32:43+00:00
d3d11_deinterlace: fix undefined behavior when psz_mode is NULL

- - - - -


2 changed files:

- modules/hw/d3d11/d3d11_deinterlace.c
- modules/hw/d3d9/dxva2_deinterlace.c


Changes:

=====================================
modules/hw/d3d11/d3d11_deinterlace.c
=====================================
@@ -290,7 +290,7 @@ int D3D11OpenDeinterlace(filter_t *filter)
         msg_Dbg(filter, "unknown mode %s, trying blend", psz_mode);
         p_mode = GetFilterMode("blend");
     }
-    if (strcmp(p_mode->psz_mode, psz_mode))
+    if (psz_mode == NULL || strcmp(p_mode->psz_mode, psz_mode))
         msg_Dbg(filter, "using %s deinterlacing mode", p_mode->psz_mode);
 
     D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS rateCaps;
@@ -365,4 +365,3 @@ error:
 
     return VLC_EGENERIC;
 }
-


=====================================
modules/hw/d3d9/dxva2_deinterlace.c
=====================================
@@ -413,7 +413,7 @@ int D3D9OpenDeinterlace(filter_t *filter)
         msg_Dbg(filter, "unknown mode %s, trying blend", psz_mode);
         p_mode = GetFilterMode("blend");
     }
-    if (strcmp(p_mode->psz_mode, psz_mode))
+    if (psz_mode == NULL || strcmp(p_mode->psz_mode, psz_mode))
         msg_Dbg(filter, "using %s deinterlacing mode", p_mode->psz_mode);
 
     DXVA2_VideoProcessorCaps caps, best_caps;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/580f0b44836672ebae54163d5db0fbf97ec4891a...d91240b3de1ab2c4047c628ab17c835965058c84

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/580f0b44836672ebae54163d5db0fbf97ec4891a...d91240b3de1ab2c4047c628ab17c835965058c84
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance