mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
avformat/mxfdec: Use ff_data_to_hex() for data->hex conversion
In this case it also stops pretending that the length of the output string is somehow checked (which is currently being done by using snprintf that is called with the amount of space needed instead of the amount of space actually available). Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
8823900b14
commit
6b5e3590c7
@ -2120,22 +2120,13 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor)
|
||||
|
||||
static int mxf_umid_to_str(UID ul, UID uid, char **str)
|
||||
{
|
||||
int i;
|
||||
char *p;
|
||||
p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1);
|
||||
if (!p)
|
||||
return AVERROR(ENOMEM);
|
||||
snprintf(p, 2 + 1, "0x");
|
||||
p += 2;
|
||||
for (i = 0; i < sizeof(UID); i++) {
|
||||
snprintf(p, 2 + 1, "%.2X", ul[i]);
|
||||
p += 2;
|
||||
|
||||
}
|
||||
for (i = 0; i < sizeof(UID); i++) {
|
||||
snprintf(p, 2 + 1, "%.2X", uid[i]);
|
||||
p += 2;
|
||||
}
|
||||
ff_data_to_hex(p + 2, ul, sizeof(UID), 0);
|
||||
ff_data_to_hex(p + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user