FFmpeg

108882 Commits

37 Branches

400 Tags

484 MiB

Tag: Branch: Tree: b71e2e42ef

Commit Graph

Author	SHA1	Message	Date
Andreas Rheinhardt	187cd27832	avutil/dict: Error out in case of key == NULL Up until now, using NULL as key in av_dict_get() on a non-empty AVDictionary would crash; using NULL as key in av_dict_set() would also crash for a non-empty AVDictionary unless AV_DICT_MULTIKEY was set; in case the dictionary was initially empty or AV_DICT_MULTIKEY was set, it was even possible for av_dict_set() to succeed when adding a NULL key, namely when one uses a value != NULL and the AV_DICT_DONT_STRDUP_VAL flag. Using av_dict_get() on such an AVDictionary will usually lead to crashes, though. Fix this by actually checking for key in both functions; error out if they are NULL. While just at it, also stop relying on av_strdup(NULL) to return NULL in av_dict_set(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	2 years ago
Michael Niedermayer	afebf470ca	avutil/tests/dict: Check return of av_dict_parse_string() Fixes: CID1396402 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	8 years ago

Author

SHA1

Message

Date

Andreas Rheinhardt

187cd27832

avutil/dict: Error out in case of key == NULL

Up until now, using NULL as key in av_dict_get() on a non-empty
AVDictionary would crash; using NULL as key in av_dict_set()
would also crash for a non-empty AVDictionary unless AV_DICT_MULTIKEY
was set; in case the dictionary was initially empty or AV_DICT_MULTIKEY
was set, it was even possible for av_dict_set() to succeed when
adding a NULL key, namely when one uses a value != NULL and
the AV_DICT_DONT_STRDUP_VAL flag. Using av_dict_get() on such
an AVDictionary will usually lead to crashes, though.

Fix this by actually checking for key in both functions; error out
if they are NULL.

While just at it, also stop relying on av_strdup(NULL) to return NULL
in av_dict_set().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

2 years ago

Michael Niedermayer

afebf470ca

avutil/tests/dict: Check return of av_dict_parse_string()

Fixes: CID1396402

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

8 years ago

3 Commits (b71e2e42ef85a1803faea9c0c4e4b0ebb90c4251)