From patchwork Thu Sep 5 18:27:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14931 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 96F1544A2ED for ; Thu, 5 Sep 2019 21:35:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8006F6807A0; Thu, 5 Sep 2019 21:35:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72A516804F5 for ; Thu, 5 Sep 2019 21:35:23 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id b2so3182352otq.10 for ; Thu, 05 Sep 2019 11:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RxSZ67A0abHUncyAD6B4f0aUOkvHjBktUJzXXKH8GAY=; b=hDS+HDEKJeYQg6tTENIKQOrdCk3A0Fjoq1DOzk0uh9yM/Tc9ISP8VSs17z+UXa0ipv RpQRfaIMrPR5VhBvGRwzcALD2776AoxGU6n/liD9HKg9ViwR3rwHf2d5XicdfhQIdCSv 5Sj32+RBhsTB9lxYe3DS0TN9eNSzPRJpbwL7F4OHZT5d+tQzY7aeCYwHhsT9+in/QOp0 PKqMSk54OPdb6FOG6b6kotDkJFMkGyph8i3OLsKDgrMdXjyJlaauzfvvAZKNU+YfnZIU ZNnaVVKO6CPt6/wMbR+KBqpx8zBNMrwwbdwJ20XqxitiePu334NpxlNjnLs76RfRrn5m HVBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=RxSZ67A0abHUncyAD6B4f0aUOkvHjBktUJzXXKH8GAY=; b=IzNL3FZ9m5xmkriC6D8aGeNMbbahwSpPP6qAUNy7FW85K8UgWNEPbdEUjTyoRWyJm5 B7bcZXj8QWe6nNVSa6ZlrrWRdUedocsA+YQCAWhYuUIIg3e/8IaDCLTl6Gu7f2WXDQuM ++47bKQgJRx07hiDv23bU1Tdf/m4YobLOovKxJ2xu6fEAOOsN2/c5WvGxNXueW0eiH6F UJR7F5H7ZzZbyBxfYqJf4I7/pc/+N+UT6YI/UtYkT9zdriGm1fH4uTxVCXIhJFb6kDQv 7n1yyLMehYwUgpPfDmdDSM3NXEgjXy8irC+lbYMNx3fWJZQg/+UZ1amRChzj6kDxvCs2 d/ag== X-Gm-Message-State: APjAAAV4wEwYIet33HdbSbA8VEtqanKFQ9y/r2I1d8Bir1U0Y6wnhTox IcQMa47oEBqN/cbhet8JxWxgS2sBcDIqzA== X-Google-Smtp-Source: APXvYqz75gO8j+FmDV2mwwA3FPpXH2vgGqw758WDARVeunx/E/3rJ3ZIIHZEk8VksVv/2lwrufK9oA== X-Received: by 2002:a9d:6acb:: with SMTP id m11mr3870682otq.40.1567708061260; Thu, 05 Sep 2019 11:27:41 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id z33sm993614otb.75.2019.09.05.11.27.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Sep 2019 11:27:40 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Sep 2019 11:27:30 -0700 Message-Id: <20190905182735.65987-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/mediacodec_surface: guard against NULL surface 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: matthieu.bouron@gmail.com, Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/mediacodec_surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodec_surface.c b/libavcodec/mediacodec_surface.c index aada1ecebe..efcc4dc63c 100644 --- a/libavcodec/mediacodec_surface.c +++ b/libavcodec/mediacodec_surface.c @@ -28,9 +28,11 @@ void *ff_mediacodec_surface_ref(void *surface, void *log_ctx) { JNIEnv *env = NULL; - void *reference = NULL; + if (!surface) + return NULL; + env = ff_jni_get_env(log_ctx); if (!env) { return NULL;