From patchwork Fri Sep 13 16:34:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 15059 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 B4179447DF4 for ; Fri, 13 Sep 2019 19:34:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 796C96881D8; Fri, 13 Sep 2019 19:34:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D1E3688155 for ; Fri, 13 Sep 2019 19:34:11 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id r17so2258375wme.0 for ; Fri, 13 Sep 2019 09:34:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ex/1JBQ4GDswUHNksytpFkl5zfg6E6Rr3kU02izq3u4=; b=PQSdh4KnFcUDrn2SsjinQjvtHSSsKCwpYWio8MFt8FPKPy7VFXF4fCMbmbQrcYaZej ude6RelvADLJyDQvTC1Cxg8AoODuQxrANFoFHS8eoAqFkciDkuoAW4azszvkW+XO8Y1l kHwvFOS7/0wY2hjVrYEFfY7LjuPYvkcrKtYUGsnAqYC1dTWc0EGu/FUxBmvFvpBYlGtB AF7qIAQ8BQOJrXLB+zZL7v+zrNquE59FI3tSpirX/EqmUrsLOKFBsuTpD0wiEzVqO6ae YwuzW+Z33AbGzmxdzyyZP4Fp5n4sK6YVn+F3MgNUZS+oXu8c2NlbZJD7dzuLbUDZshka NWGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ex/1JBQ4GDswUHNksytpFkl5zfg6E6Rr3kU02izq3u4=; b=ZTgyVLJ6jl0y5TIsp62b/jhsqAox7E33viJqIT8xReNQOg/5tpbmjy6Eh1QXXnlLoB k6sEN4N3QWfcxUIYQz/sAIDpBmR1IIQgYzDWllEuZPF0LgFSejy/XEcWWFSsxeaVK6gN 9+8idBcCSejFfm9t9KcTi4AoTGtKrCtpsjwGYSCCd/W30YDCNwIdCuftoH/XoaV9ybJC 4ikZDosFQjZIBZcjpwbF+QjfE0BY655GZyECV7mt5iWXN6pssFhuBwR2RzcnJXCxATz+ pjmg3Qs1extw6iRpDd1XS1cMYVzOJWelj//2ElNLsTbupUmC/biPwI2RVWR5v0UEirxH XF4g== X-Gm-Message-State: APjAAAWyBagtWBEYAPXpM4oqgsVxzVqdeDTtqYtZkLMBVEZ8/c/1xvcv w5+wz9vJb781MyDSR8cKN/YuE8SWSvg= X-Google-Smtp-Source: APXvYqwv/GcyY0MllbuWueyl6Z/qpPHm/k5jTrtRjqzXBJPJnUW+luNwZ2Awodom1s/U6zp974zTuA== X-Received: by 2002:a7b:cc13:: with SMTP id f19mr4316297wmh.141.1568392450755; Fri, 13 Sep 2019 09:34:10 -0700 (PDT) Received: from localhost.localdomain (78-32-249-178.static.enta.net. [78.32.249.178]) by smtp.gmail.com with ESMTPSA id a144sm3225089wme.13.2019.09.13.09.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Sep 2019 09:34:10 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Sep 2019 17:34:02 +0100 Message-Id: <20190913163402.91777-1-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dashdec: fix pointer being freed was not allocated 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 Cc: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" prevent attempt to call xmlFree if val was not allocated fixes: 8135 Signed-off-by: vectronic --- libavformat/dashdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 4f725ba09a..8022ba9afe 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1185,6 +1185,7 @@ static int parse_programinformation(AVFormatContext *s, xmlNodePtr node) node = xmlFirstElementChild(node); while (node) { + val = NULL; if (!av_strcasecmp(node->name, "Title")) { val = xmlNodeGetContent(node); if (val) { @@ -1202,7 +1203,9 @@ static int parse_programinformation(AVFormatContext *s, xmlNodePtr node) } } node = xmlNextElementSibling(node); - xmlFree(val); + if (val) { + xmlFree(val); + } } return 0; }