From patchwork Thu May 31 22:24:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9209 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp163079jad; Thu, 31 May 2018 15:27:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKLMg0yKvN7haRkRdMxjvRMxCCV3/J9uix7FSTikdYlzzz0oBMfb0opyxdlFwJp/jV/qkty X-Received: by 2002:adf:8854:: with SMTP id e20-v6mr7250802wre.30.1527805641826; Thu, 31 May 2018 15:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805641; cv=none; d=google.com; s=arc-20160816; b=P5tINwifbgeUCUETvCjHz0Oa/xhSys6sB3zy76DN81/V/0278i4iZQnSNzv8xis1UL LkhZsiOs90KRkObNyB4FUEdz6Sj4Zr6bo7pu5oHtCuUo+gVsdPvG2BqPngO7vUqhdhOn +gYdLUBxM3+Tg/uhV3nbCeGaZzkLO0nfH/ljqZRAKk74SvpWoGOsJElKhEJlkGqU/4C0 W2k/reqHjQqyA4/IbGAVHkOiuodKfZ7KLRJ1NF2yQLgS7+m0mjpl0eV6GgjSWqv/YjZk OsUPzA/Xsn+y1B96Y3QZNSp1FgMWHHoBqZak/osNnoQaP5SdSaej0ilfXwq1jyjKlUBD Id+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=gQ1oYoTfBWCw8rDHAYebCyoS82IvA3XfHkBWxUasB6Q=; b=sQR5tVvl/K04oLEYb5le4uQ+c8i3AwUOi6MjBCvk7cond8znqwZF9MGjfApJ3of44Z JrwXTlzV4VUhExMK44edU5rxwrkxidkVsEwwyk/1EvQDsSPXZYAZDTstpvDEcLrlsWp1 3HBgCJsty0lCgij6OTyPETHsqmP2xGCqdpm065Y6pRmrJwa/3YEstbw8m8LwZ6QdHxJt 2tajc9DxBzI1GcKvV0PHYaMM6wmqZDqudiSFt3MEdh02sKHjZpJV+bDV+4XSomMpTM+c 2nUQufUOVUcgFSLQEELq3lJzuLNH+VpmyD9IJP4qWd63889ua29XYxJHihGbqJs7I254 FRAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=oX8xef97; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f2-v6si333773wme.27.2018.05.31.15.27.21; Thu, 31 May 2018 15:27:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=oX8xef97; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF36468A52A; Fri, 1 Jun 2018 01:24:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AEEA68A517 for ; Fri, 1 Jun 2018 01:24:08 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id w7-v6so22511109wrn.6 for ; Thu, 31 May 2018 15:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UXPZHKR0xMgMjOnCBxShAUV8ayqlG4UANLGp0LTfovo=; b=oX8xef97/+Oy2AnpGveCm7QLZysHXOIcmUL1YugbBLRVlV/Y8olmLLZnqHepZS0Hse VqD1N0p/DMulNPowGfkiktQGsgdb4e6sgMJwseiw+EkxUMe8zqbxYTO2i8bZb3VVzPZg XJLnY5+fjeMbXDPPxWevknBv5P/JL85r7zNR38bKsJKy21OkAdnh63Ha+PM+Dd6L0+F5 nBZCLwp0FXTuNEPmzToZ/wL8RvzlhtjGy6DaB8tTGsLOIQFhI6Tb+VAga5g4GbPV8Miq rEn8uJj58eCOweANL4a/Yg0cwC145jFwP4drlwuMbFDnm1qRvHt4Ynd3GqDcVfWdzUaj JoEA== 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:in-reply-to :references; bh=UXPZHKR0xMgMjOnCBxShAUV8ayqlG4UANLGp0LTfovo=; b=K8PuDbtz4SXWnpY08/qiX92hnkVH303URiTqanvbBW3coUV4HcXD2cOy2+qgAsEi/k Gk1qkyYTduo9e4cG6jKrLK51pi7VR6jp/va65eGf89jc7GbAMSfCiZo4fuLwlHNFU/HZ YJvGJl7OZ69Swnh0j4OSeTeotmOTzJUQwhN/h6yWwSNb5IKgHYfzPgc9X0PcJcLjY2Qb +ctg0XS1MwndCuhWxOT66GLutXJksfn1jnvjye/FDT06d7OgFKdYuszGN0GzOvHxdCCX 6JTr3lN8TkfOAcOeEjFHKY4TtK+WtgfJlexJckXzGWnNxQORYRTr5cK/A+MtMuXF1KyT PPXQ== X-Gm-Message-State: ALKqPwc//G7jTR+ueqLLFgqrfnZEvj84vToBCFFXgcILPKl/CifssNOr pxD5ToKArBdZ0JuEmcwCxP4Mdg== X-Received: by 2002:a5d:4b4b:: with SMTP id w11-v6mr395683wrs.87.1527805492501; Thu, 31 May 2018 15:24:52 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:51 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:14 +0200 Message-Id: <20180531222415.24966-22-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 21/22] lavfhttpd.c: Remove superfluous null-checks before av_free() 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- lavfhttpd.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lavfhttpd.c b/lavfhttpd.c index 9f56620..bc856af 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -95,10 +95,8 @@ int lavfhttpd_accept(void *server, struct HTTPClient **client, int reply_code) av_log(client_ctx, AV_LOG_WARNING, "Failed to set reply_code: %s.\n", av_err2str(ret)); } } - if (client_http->method) - av_free(client_http->method); - if (client_http->resource) - av_free(client_http->resource); + av_free(client_http->method); + av_free(client_http->resource); client_http->method = av_strdup(method); client_http->resource = av_strdup(resource); av_free(method); @@ -141,10 +139,8 @@ void lavfhttpd_close(void *server, struct HTTPClient *client) { AVIOContext *client_ctx = (AVIOContext*) client->httpd_data; avio_close(client_ctx); - if (client->method) - av_free(client->method); - if (client->resource) - av_free(client->resource); + av_free(client->method); + av_free(client->resource); av_free(client); }