diff options
| author | Simon Ser <contact@emersion.fr> | 2021-06-02 16:22:54 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-06-10 14:33:32 +0000 |
| commit | ba0c63dee86cf94272c7763d711695fe3af0f210 (patch) | |
| tree | cf59643a5dfd40367194dadc056c97730528f95e /src | |
| parent | cursor: fix crash with weird input files (diff) | |
| download | wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar.gz wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar.bz2 wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar.lz wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar.xz wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.tar.zst wayland-ba0c63dee86cf94272c7763d711695fe3af0f210.zip | |
shm: remove wl_shm_buffer.pool NULL checks
wl_shm_buffer.pool is never set to NULL. The only time it's set is
in shm_pool_create_buffer, and the pool is guaranteed to be non-NULL
there.
Signed-off-by: Simon Ser <contact@emersion.fr>
Diffstat (limited to 'src')
| -rw-r--r-- | src/wayland-shm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/wayland-shm.c b/src/wayland-shm.c index 7320bc9..aa64ff3 100644 --- a/src/wayland-shm.c +++ b/src/wayland-shm.c @@ -124,8 +124,7 @@ destroy_buffer(struct wl_resource *resource) { struct wl_shm_buffer *buffer = wl_resource_get_user_data(resource); - if (buffer->pool) - shm_pool_unref(buffer->pool, false); + shm_pool_unref(buffer->pool, false); free(buffer); } @@ -400,11 +399,6 @@ wl_shm_buffer_get_stride(struct wl_shm_buffer *buffer) WL_EXPORT void * wl_shm_buffer_get_data(struct wl_shm_buffer *buffer) { - assert(buffer->pool); - - if (!buffer->pool) - return NULL; - if (buffer->pool->external_refcount && (buffer->pool->size != buffer->pool->new_size)) wl_log("Buffer address requested when its parent pool " |