diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-17 15:55:57 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-23 19:42:03 +0200 |
| commit | 6b0c94780d8087772a718bfa8fdcb46b1770b987 (patch) | |
| tree | c83b745703521fdb076125e0743802340cb61296 | |
| parent | ae2537f53e8ebfa36345241b5b70c0b1aef66dd2 (diff) | |
| download | ffmpeg-6b0c94780d8087772a718bfa8fdcb46b1770b987.tar.gz | |
libavcodec/avpacket: Don't simply forward return value of av_dict_set()
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 <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/avpacket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 1b53451359..55b509108e 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -526,10 +526,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; @@ -542,11 +542,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, |