diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2016-07-01 10:30:20 +0800 |
---|---|---|
committer | Xiang, Haihao <haihao.xiang@intel.com> | 2016-08-22 13:04:29 +0800 |
commit | b5221fc19e464cf0ad59d47137ad3d73948e3d5b (patch) | |
tree | fbe7cd61f4f518ef8e705ca7064e967d837d1b47 | |
parent | ef5e1f1c9103d87a975f893e18e1d651be2ecd8a (diff) |
check memory allocation and initialize to zero value in save_recyuv (v2)
v2:
Remove not necessary check dst_Y against NULL for sencond free(NULL).
Remove not necessary check dst_Y and dst_U against NULL for second free(NULL)
and third free(NULL).
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
(cherry picked from commit 8c0973050d825fb6a0734dd62fdf8b209aee8ad0)
-rw-r--r-- | test/encode/h264encode.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/test/encode/h264encode.c b/test/encode/h264encode.c index ce96f92..9e20919 100644 --- a/test/encode/h264encode.c +++ b/test/encode/h264encode.c @@ -1940,13 +1940,47 @@ static int save_recyuv(VASurfaceID surface_id, if (srcyuv_fourcc == VA_FOURCC_NV12) { int uv_size = 2 * (frame_width/2) * (frame_height/2); dst_Y = malloc(2*uv_size); + if(dst_Y == NULL) { + printf("Failed to allocate memory for dst_Y\n"); + exit(1); + } + dst_U = malloc(uv_size); + if(dst_U == NULL) { + printf("Failed to allocate memory for dst_U\n"); + free(dst_Y); + exit(1); + } + + memset(dst_Y, 0, 2*uv_size); + memset(dst_U, 0, uv_size); } else if (srcyuv_fourcc == VA_FOURCC_IYUV || srcyuv_fourcc == VA_FOURCC_YV12) { int uv_size = (frame_width/2) * (frame_height/2); dst_Y = malloc(4*uv_size); + if(dst_Y == NULL) { + printf("Failed to allocate memory for dst_Y\n"); + exit(1); + } + dst_U = malloc(uv_size); + if(dst_U == NULL) { + printf("Failed to allocate memory for dst_U\n"); + free(dst_Y); + exit(1); + } + dst_V = malloc(uv_size); + if(dst_V == NULL) { + printf("Failed to allocate memory for dst_V\n"); + free(dst_Y); + free(dst_U); + exit(1); + } + + memset(dst_Y, 0, 4*uv_size); + memset(dst_U, 0, uv_size); + memset(dst_V, 0, uv_size); } else { printf("Unsupported source YUV format\n"); exit(1); |