return NULL;
}
-uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
- int size)
+int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
+ uint8_t *data, size_t size)
{
AVPacketSideData *sd, *tmp;
int i;
- uint8_t *data = av_malloc(size);
-
- if (!data)
- return NULL;
for (i = 0; i < st->nb_side_data; i++) {
sd = &st->side_data[i];
av_freep(&sd->data);
sd->data = data;
sd->size = size;
- return sd->data;
+ return 0;
}
}
- tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp));
+ if ((unsigned)st->nb_side_data + 1 >= INT_MAX / sizeof(*st->side_data))
+ return AVERROR(ERANGE);
+
+ tmp = av_realloc(st->side_data, st->nb_side_data + 1 * sizeof(*tmp));
if (!tmp) {
- av_freep(&data);
- return NULL;
+ return AVERROR(ENOMEM);
}
st->side_data = tmp;
sd->type = type;
sd->data = data;
sd->size = size;
+
+ return 0;
+}
+
+uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
+ int size)
+{
+ int ret;
+ uint8_t *data = av_malloc(size);
+
+ if (!data)
+ return NULL;
+
+ ret = av_stream_add_side_data(st, type, data, size);
+ if (ret < 0) {
+ av_freep(&data);
+ return NULL;
+ }
+
return data;
}