[FFmpeg-devel] [PATCH 1/3] lavu/hwcontext_opencl: clear dangling pointers on map failure
Anton Khirnov
anton at khirnov.net
Wed Jan 19 15:40:40 EET 2022
---
untested
---
libavutil/hwcontext_opencl.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index 26a3a24593..40ee611943 100644
--- a/libavutil/hwcontext_opencl.c
+++ b/libavutil/hwcontext_opencl.c
@@ -2146,6 +2146,7 @@ fail:
clReleaseMemObject(mapping->frame.planes[p]);
}
av_free(mapping);
+ memset(dst->data, 0, sizeof(dst->data));
return err;
}
@@ -2317,6 +2318,7 @@ fail:
if (desc->planes[p])
clReleaseMemObject(desc->planes[p]);
av_freep(&desc);
+ memset(dst->data, 0, sizeof(dst->data));
return err;
}
@@ -2407,6 +2409,7 @@ fail:
0, NULL, &event);
if (cle == CL_SUCCESS)
opencl_wait_events(dst_fc, &event, 1);
+ memset(dst->data, 0, sizeof(dst->data));
return err;
}
@@ -2562,6 +2565,7 @@ fail:
0, NULL, &event);
if (cle == CL_SUCCESS)
opencl_wait_events(dst_fc, &event, 1);
+ memset(dst->data, 0, sizeof(dst->data));
return err;
}
@@ -2793,6 +2797,7 @@ fail:
clReleaseMemObject(mapping->object_buffers[i]);
}
av_free(mapping);
+ memset(dst->data, 0, sizeof(dst->data));
return err;
}
--
2.33.0
More information about the ffmpeg-devel
mailing list