highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavcodec/avpacket: Don't simply forward return value of av_dict_set()

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2020-04-17 15:55:57 +02:00
parent ae2537f53e
commit 6b0c94780d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/avpacket.c
View File

@ -526,10 +526,10 @@ fail:
int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict) int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict)
{ {
const uint8_t *end; const uint8_t *end;
int ret = 0; int ret;
if (!dict || !data || !size) if (!dict || !data || !size)
return ret; return 0;
end = data + size; end = data + size;
if (size && end[-1]) if (size && end[-1])
return AVERROR_INVALIDDATA; 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); ret = av_dict_set(dict, key, val, 0);
if (ret < 0) if (ret < 0)
break; return ret;
data = val + strlen(val) + 1; data = val + strlen(val) + 1;
} }
return ret; return 0;
} }
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,