Mesa (master): Prevent zero sized wl_egl_window

Kristian Høgsberg krh at kemper.freedesktop.org
Tue Feb 18 22:16:36 UTC 2014


Module: Mesa
Branch: master
Commit: 6c9d6898fdfd7e23306762af9bf2501a5bca1974
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c9d6898fdfd7e23306762af9bf2501a5bca1974

Author: Sinclair Yeh <sinclair.yeh at intel.com>
Date:   Wed Feb 12 16:21:11 2014 -0800

Prevent zero sized wl_egl_window

It is illegal to create or resize a window to zero (or negative) width
and/or height.  This patch prevents such a request from happening.

---

 src/egl/wayland/wayland-egl/wayland-egl.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c
index 8bd49cf..ae78595 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl.c
@@ -9,6 +9,9 @@ wl_egl_window_resize(struct wl_egl_window *egl_window,
 		     int width, int height,
 		     int dx, int dy)
 {
+	if (width <= 0 || height <= 0)
+		return;
+
 	egl_window->width  = width;
 	egl_window->height = height;
 	egl_window->dx     = dx;
@@ -24,6 +27,9 @@ wl_egl_window_create(struct wl_surface *surface,
 {
 	struct wl_egl_window *egl_window;
 
+	if (width <= 0 || height <= 0)
+		return NULL;
+
 	egl_window = malloc(sizeof *egl_window);
 	if (!egl_window)
 		return NULL;




More information about the mesa-commit mailing list