From patchwork Thu Sep 5 20:48:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Potakhov X-Patchwork-Id: 14941 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1F3D844944A for ; Thu, 5 Sep 2019 23:56:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC8BE687F67; Thu, 5 Sep 2019 23:56:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f196.google.com (mail-yb1-f196.google.com [209.85.219.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 270E8687F67 for ; Thu, 5 Sep 2019 23:56:32 +0300 (EEST) Received: by mail-yb1-f196.google.com with SMTP id u68so1396001ybg.1 for ; Thu, 05 Sep 2019 13:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=potahov.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=3wmdLvTzru2cOJm0NlhTCwdZklbToQDOYyGXkPJqBIE=; b=K/jiqwmDgmLIWd0gTfha8zpSYiL5oxXlvs1mHT01wshhcxWnyg3059J+LdM5KgS0Vh YeGRqGDJRk/R4tBLYdj9bRKO4QLqugNBBHI+pmZz8QaMVi1Q1W0AcLWS4J2EACPPkzpE fl9nn65vWNgqpzu2VN0kDgoiPTmD5iUQ++9kU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=3wmdLvTzru2cOJm0NlhTCwdZklbToQDOYyGXkPJqBIE=; b=g16kULe7mMMsRF9+mYzxqcHE/VraRRb3S6TCmyhmjhQDFfr+wpdBkCJFzi3iGrzsu0 cTjls6XuwMe4n6IBIX8TGq/SAYC89moGue54IJ8OaOgA3yMQ6+xshxAEDkCQzsDWiezQ paTkvb9u39pq74fqIzWOLzkYsFPEEeziiigf9PSPdOllrfOJXKIaAsjAs9u6D0fZKyro 2QwWlR9OlH7Kkt/OlptYOE72GZFttORCEc0Mm3VZAI6LPVKt/YGk+ZvZrTv1Usbocwk4 /YrJ3MjD5dKOYlzhbUilzJxqlpMjNUiCUlUH7QswAG6ihlNkG45s8IAcuQiNdXzuRyqC zEXA== X-Gm-Message-State: APjAAAVtsh5/ucX1fWDBu2NS4kzzQ8OO+hDP0L3FD2ByRk84PnTA66iC 6bniKG/Gz117XL1HaGJJOnjDfL42jS2d4L2In4V7+rprJe+Y/w== X-Google-Smtp-Source: APXvYqwqYJFpNkTWujNYhLCk1Vmer+HfROwNwWcl2gjFai62v67L8jZXxb1t5j8Mj+mbS6ckoJzzNGvS2ylOcOgqXLE= X-Received: by 2002:a25:730e:: with SMTP id o14mr4066538ybc.490.1567716514393; Thu, 05 Sep 2019 13:48:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Alexey Potakhov Date: Thu, 5 Sep 2019 16:48:21 -0400 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] Fixing rare dshow input crash X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" re-sending without tabs. On Wed, Sep 4, 2019 at 6:22 PM Carl Eugen Hoyos wrote: > > Am Do., 5. Sept. 2019 um 00:08 Uhr schrieb Alexey Potakhov : > > > In some rare cases when IAMStreamConfig_GetStreamCaps returns > > an error avformat_open_input() crashes with access violation. > > Tabs are rejected by our repository, please remove them and resend. > > Carl Eugen > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". From c15f00b4e70c60ac38009905b4d2c2f3032967a6 Mon Sep 17 00:00:00 2001 From: Alexey Potakhov Date: Wed, 4 Sep 2019 17:54:24 -0400 Subject: [PATCH] Fixing rare dshow input crash --- libavdevice/dshow.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index d7f5bd7069..d1ae63b310 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -340,8 +340,10 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, for (i = 0; i < n && !format_set; i++) { r = IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps); - if (r != S_OK) - goto next; + if (r != S_OK) { + type = NULL; + goto next; + } #if DSHOWDEBUG ff_print_AM_MEDIA_TYPE(type); #endif @@ -450,9 +452,11 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, goto next; format_set = 1; next: - if (type->pbFormat) - CoTaskMemFree(type->pbFormat); - CoTaskMemFree(type); + if (type) { + if (type->pbFormat) + CoTaskMemFree(type->pbFormat); + CoTaskMemFree(type); + } } end: IAMStreamConfig_Release(config);