From patchwork Sat Jan 11 04:25:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17298 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 6DD2B44BDC6 for ; Sat, 11 Jan 2020 06:33:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B1F268AEA4; Sat, 11 Jan 2020 06:33:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DBB5688254 for ; Sat, 11 Jan 2020 06:33:50 +0200 (EET) Received: by mail-qt1-f196.google.com with SMTP id e12so4014596qto.2 for ; Fri, 10 Jan 2020 20:33:50 -0800 (PST) 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=So6h9Pk0NZAJmeipPeQHVQDdPpaHdMSadTjj//4rXF4=; b=es8zfgxfLIds1aABSPa47TB1U+4iofX/dgTnqg/dQlprUVGGM1lrFBfekp6eK6c89H dA2thgS1dYGMrpcu19v/1sFVYZOCNAbgQeiBy8I6kqFGFuQO9h9iodMMm/iVrVbas6qS OuRGXCX8Ep/ipnu3+zyfx79CbXxwBcKbSwJVhCOcxtfX+rud71KchtPXYE8HObZWoL6T DdwMGRKLJRC/klvQGwuxS1IVCluZbzbI6TnKKIFopRX2je09s8kmjf8GcnJ7bNxfg5eQ ifoqsFhmgIbOYZUYZz2/JL9vwf8D2qdrynnk62HPTh8Y4xNh5v/yXz2xmwoir6rjiasO LeQw== 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=So6h9Pk0NZAJmeipPeQHVQDdPpaHdMSadTjj//4rXF4=; b=at6XstSuAHvqPsf4BWqPLQJPS6fvRsWNQX3jK/qYaYRg2Z1ZGQvX3dX3sevRhbLpk2 cPS/ebjGqXJQj5RV3M00Dgd8G9HGtecSJb+JTZR0NOG0FLdWZ8Vu0sBuIYwTrvhBs6JQ TJY9uNhYN8TzvL3HXhnDAyddFiDqLoEJubTW9hnQHx+hmW8s4LPdcAeAFXzzg8oo4uNc l6fbYSSlAnagCgY8E73g2UpkoxEnrtm6t6WOCMVS95CuyaK+/WopJcAcMxeMjkJp4Xxy NUTwH1El8a+y/LPmuHlMrcj7tZqPjSAedPx33yxEfIUtlzh0EBRv2I62HIYKlGtJEN7T GWzA== X-Gm-Message-State: APjAAAV2okOn684R70is9AjKbm0/vX/IQztyGo8WIlIorXUFcU6viTWY uu/VKjhYlHtYomQ6v03fxHXzLJXv X-Google-Smtp-Source: APXvYqwXsQrhWlTIVhAvxp9Gtz7cqwG62rz5I5NNT7OzvGxC8iP9z9FOdPMz8GO2y9a1EsYtxIFiMg== X-Received: by 2002:ac8:958:: with SMTP id z24mr5521016qth.40.1578716753696; Fri, 10 Jan 2020 20:25:53 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id m10sm1833045qki.74.2020.01.10.20.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:25:53 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jan 2020 23:25:25 -0500 Message-Id: <20200111042526.32351-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/libzmq: Check return of zmq_setsockopt 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavformat/libzmq.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavformat/libzmq.c b/libavformat/libzmq.c index d86488293ff..2df55542c7e 100644 --- a/libavformat/libzmq.c +++ b/libavformat/libzmq.c @@ -123,7 +123,14 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) return AVERROR_EXTERNAL; } - zmq_setsockopt(s->socket, ZMQ_SUBSCRIBE, "", 0); + ret = zmq_setsockopt(s->socket, ZMQ_SUBSCRIBE, "", 0); + if (ret == -1) { + av_log(h, AV_LOG_ERROR, "Error occured during zmq_setsockopt(): %s\n", ZMQ_STRERROR); + zmq_close(s->socket); + zmq_ctx_term(s->context); + return AVERROR_EXTERNAL; + } + ret = zmq_connect(s->socket, uri); if (ret == -1) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_connect(): %s\n", ZMQ_STRERROR);