On Mon, 11 May 2020, lance.lmw...@gmail.com wrote:
From: Limin Wang <lance.lmw...@gmail.com> These are similar to the existing FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO, but the elsize is calcuated by sizeof(*p) Signed-off-by: Limin Wang <lance.lmw...@gmail.com> --- libavutil/internal.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavutil/internal.h b/libavutil/internal.h index 4acbcf5..1be9001 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -173,6 +173,24 @@ }\ } +#define FF_ALLOC_TYPED_ARRAY_OR_GOTO(ctx, p, nelem, label)\
This should not duplicate functionality of FF_ALLOC_ARRAY_OR_GOTO, but it should be defined as
FF_ALLOC_ARRAY_OR_GOTO(ctx, p, nelem, sizeof(*(p)), label)
+{\ + p = av_malloc_array(nelem, sizeof(*p));\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#define FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(ctx, p, nelem, label)\
Same here Regards, Marton
+{\ + p = av_mallocz_array(nelem, sizeof(*p));\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + #include "libm.h" /** -- 1.8.3.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".