From patchwork Fri Apr 17 14:05:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19027 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 1649F449330 for ; Fri, 17 Apr 2020 17:06:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7DAE68BE85; Fri, 17 Apr 2020 17:06:05 +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 9D37A68BC18 for ; Fri, 17 Apr 2020 17:06:03 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id v8so5028571wma.0 for ; Fri, 17 Apr 2020 07:06:03 -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=yhstBhcTmiAqNbw7hpcCXVMLAXd4XHr2+tnJpWIwHaA=; b=WCJraYx2AyRuYq9IPkN6ggTXYv4c2gcrwaoQ2CaOFkeBQdqvke4Fcaii3oPrKJ+ctY p/eONY0jEliOPK4aGbp0134C8McB2GtrrGXLG1McF+fGb8gDEejgJyQjdgc1xoLsboPp iCQbrKnV3PJ1nHyTF0dyaEoeU2M6vGnGl9r9io5/mPIBdQguT8Uh4OYEtyBEVEVW8hWJ OSXrwcZ3FZ6kl3U64oGHF9DaD67mh2DDNLXQ6rZHQ+iF4BkMglo2disRlk4QgJH8Wphv nAAUQOeqDRLZphODY0W9w9jz6KRicrZwUvrHILCedrMbobpuZuH2YBiA8b057o9l/NMp 0CWA== 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=yhstBhcTmiAqNbw7hpcCXVMLAXd4XHr2+tnJpWIwHaA=; b=kHzHxARAJFY1qLidgMR7+ORu3ovIGhwuQ/ab4MTY3NaMfCQcp0KHD49LczcYe+DRzz 302O3u0g9CHQPejvJ3MWvaKCa8iTNMZmIGBdoaRZOpA6WeLTV/OoZLAwzKcywHfjDeNn 8xbYJb+gNRgiOsPypugV19vGRVZSVgixGpVCbETxNIGhJ5Vl2Y/8DyOpllPyVzzOSmAl v8k4bIbiYbhYfPKxab1MmteU3Iha4bgWjzRoZBP5CxFpjRXrCfjxWcS5tZsVw0wKKmqV i+2av2DyacWrBfRoMXa3oHkXhTKL7Kn++zqVxuepfl0Og4qs8oayHWAPPL2H1nyDq+WT ECow== X-Gm-Message-State: AGi0PuZJuqjV/iWsvn8HOLSm/zI8OJlM76KFgbMAnDJ7A2bzwoq1/O+d UM4kMG4RZMDo0jefWxYWE/QHAV6Q X-Google-Smtp-Source: APiQypKJCxokFjRdo/LYZUn4t9ki4cWE032Nobp3/seY87dV+67dkH8jkSwylSdD/ReAeewpsiAdaw== X-Received: by 2002:a1c:80c3:: with SMTP id b186mr3874098wmd.117.1587132362782; Fri, 17 Apr 2020 07:06:02 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id t63sm2434031wmt.37.2020.04.17.07.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 07:06:01 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Apr 2020 16:05:55 +0200 Message-Id: <20200417140555.6181-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/avpacket: Don't simply forward return value of av_dict_set() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The documentation of av_dict_set() states that values >= 0 indicate success, whereas av_packet_unpack_dictionary() implies that return values > 0 are impossible. So only forward the return value of av_dict_set() in av_packet_unpack_dictionary() on error. (Btw: av_dict_set() does currently not return values > 0.) Signed-off-by: Andreas Rheinhardt --- libavcodec/avpacket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index ad020eef13..360722c365 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -525,10 +525,10 @@ fail: int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict) { const uint8_t *end; - int ret = 0; + int ret; if (!dict || !data || !size) - return ret; + return 0; end = data + size; if (size && end[-1]) return AVERROR_INVALIDDATA; @@ -541,11 +541,11 @@ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **di ret = av_dict_set(dict, key, val, 0); if (ret < 0) - break; + return ret; data = val + strlen(val) + 1; } - return ret; + return 0; } int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,