[FFmpeg-devel] [PATCH v7 01/12] avdevice/dshow: prevent NULL access

[Roger Pack]

These LGTM, could someone apply them for me?
Thanks!

On Tue, Dec 21, 2021 at 6:54 AM Diederick Niehorster <dcnieho at gmail.com> wrote:
>
> list_options true would crash when both a video and an audio device were
> specified as input. Crash would occur on line 784 because
> ctx->device_unique_name[otherDevType] would be NULL
>
> Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
> ---
>  libavdevice/dshow.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index ef78781865..cc0bef0474 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -708,9 +708,9 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum,
>      if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name)) < 0)
>          return r;
>      ctx->device_filter[devtype] = device_filter;
> +    ctx->device_unique_name[devtype] = device_unique_name;
>      if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0)
>          return r;
> -    av_freep(&device_unique_name);
>      return 0;
>  }
>
> @@ -1143,6 +1143,7 @@ static int dshow_read_header(AVFormatContext *avctx)
>                  }
>              }
>          }
> +        // don't exit yet, allow it to list crossbar options in dshow_open_device
>      }
>      if (ctx->device_name[VideoDevice]) {
>          if ((r = dshow_open_device(avctx, devenum, VideoDevice, VideoSourceDevice)) < 0 ||
> --
> 2.28.0.windows.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".