virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cigaes/master'

Browse Source 
* cigaes/master:
  lavu/opt: check int lists length for overflow.
  lavu: add parens to macro argument.
  lavu: add av_pure to av_int_list_length_for_size.
  lavfi/buffersink: factor checks for lists sizes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-13 20:38:26 +02:00
commit 38e66af43b
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavfilter/buffersink.c
View File

@ -384,6 +384,13 @@ static av_cold int vsink_init(AVFilterContext *ctx, void *opaque)
return common_init(ctx); return common_init(ctx);
} }
#define CHECK_LIST_SIZE(field) \
if (buf->field ## _size % sizeof(*buf->field)) { \
av_log(ctx, AV_LOG_ERROR, "Invalid size for " #field ": %d, " \
"should be multiple of %d\n", \
buf->field ## _size, (int)sizeof(*buf->field)); \
return AVERROR(EINVAL); \
}
static int vsink_query_formats(AVFilterContext *ctx) static int vsink_query_formats(AVFilterContext *ctx)
{ {
BufferSinkContext *buf = ctx->priv; BufferSinkContext *buf = ctx->priv;
@ -391,11 +398,7 @@ static int vsink_query_formats(AVFilterContext *ctx)
unsigned i; unsigned i;
int ret; int ret;
if (buf->pixel_fmts_size % sizeof(*buf->pixel_fmts)) { CHECK_LIST_SIZE(pixel_fmts)
av_log(ctx, AV_LOG_ERROR, "Invalid size for format list\n");
return AVERROR(EINVAL);
}
if (buf->pixel_fmts_size) { if (buf->pixel_fmts_size) {
for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++) for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++)
if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0)
@ -433,23 +436,10 @@ static int asink_query_formats(AVFilterContext *ctx)
unsigned i; unsigned i;
int ret; int ret;
if (buf->sample_fmts_size % sizeof(*buf->sample_fmts) || CHECK_LIST_SIZE(sample_fmts)
buf->sample_rates_size % sizeof(*buf->sample_rates) || CHECK_LIST_SIZE(sample_rates)
buf->channel_layouts_size % sizeof(*buf->channel_layouts) || CHECK_LIST_SIZE(channel_layouts)
buf->channel_counts_size % sizeof(*buf->channel_counts)) { CHECK_LIST_SIZE(channel_counts)
av_log(ctx, AV_LOG_ERROR, "Invalid size for format lists\n");
#define LOG_ERROR(field) \
if (buf->field ## _size % sizeof(*buf->field)) \
av_log(ctx, AV_LOG_ERROR, " " #field " is %d, should be " \
"multiple of %d\n", \
buf->field ## _size, (int)sizeof(*buf->field));
LOG_ERROR(sample_fmts);
LOG_ERROR(sample_rates);
LOG_ERROR(channel_layouts);
LOG_ERROR(channel_counts);
#undef LOG_ERROR
return AVERROR(EINVAL);
}
if (buf->sample_fmts_size) { if (buf->sample_fmts_size) {
for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++) for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++)

4
libavutil/avutil.h
View File

@ -261,7 +261,7 @@ static inline void *av_x_if_null(const void *p, const void *x)
* @return length of the list, in elements, not counting the terminator * @return length of the list, in elements, not counting the terminator
*/ */
unsigned av_int_list_length_for_size(unsigned elsize, unsigned av_int_list_length_for_size(unsigned elsize,
const void *list, uint64_t term); const void *list, uint64_t term) av_pure;
/** /**
* Compute the length of an integer list. * Compute the length of an integer list.
@ -271,7 +271,7 @@ unsigned av_int_list_length_for_size(unsigned elsize,
* @return length of the list, in elements, not counting the terminator * @return length of the list, in elements, not counting the terminator
*/ */
#define av_int_list_length(list, term) \ #define av_int_list_length(list, term) \
av_int_list_length_for_size(sizeof(*list), list, term) av_int_list_length_for_size(sizeof(*(list)), list, term)
/** /**
* @} * @}

6
libavutil/opt.h
View File

@ -668,8 +668,10 @@ int av_opt_set_video_rate(void *obj, const char *name, AVRational val, int searc
* @param flags search flags * @param flags search flags
*/ */
#define av_opt_set_int_list(obj, name, val, term, flags) \ #define av_opt_set_int_list(obj, name, val, term, flags) \
av_opt_set_bin(obj, name, (const uint8_t *)val, \ (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
av_int_list_length(val, term) * sizeof(*val), flags) AVERROR(EINVAL) : \
av_opt_set_bin(obj, name, (const uint8_t *)(val), \
av_int_list_length(val, term) * sizeof(*(val)), flags))
/** /**
* @} * @}
*/ */