D13835.id37871.diff
No OneTemporary
Actions

Size

848 B

Referenced Files

None

Subscribers

None

D13835.id37871.diff
View Options

	Index: sys/dev/drm2/drm_mem_util.h
	===================================================================
	--- sys/dev/drm2/drm_mem_util.h
	+++ sys/dev/drm2/drm_mem_util.h
	@@ -36,19 +36,15 @@

	static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
	{
	- if (size != 0 && nmemb > SIZE_MAX / size)
	- return NULL;

	- return malloc(nmemb * size, DRM_MEM_DRIVER, M_NOWAIT \| M_ZERO);
	+ return mallocarray(nmemb, size, DRM_MEM_DRIVER, M_NOWAIT \| M_ZERO);
	}

	/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
	static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
	{
	- if (size != 0 && nmemb > SIZE_MAX / size)
	- return NULL;

	- return malloc(nmemb * size, DRM_MEM_DRIVER, M_NOWAIT);
	+ return mallocarray(nmemb, size, DRM_MEM_DRIVER, M_NOWAIT);
	}

	static __inline void drm_free_large(void *ptr)