Merge lp:~kruk87/glmark2/glmark2-fix-wayland into lp:glmark2/2011.11

[Rafal Mielniczuk]

This small patch checks whether pointers are not null, before dereferencing them.
When glmark is invoked with --help or --list option, those objects arent
allocated and crash glmark in the cleanup routines

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'src/native-state-wayland.cpp'
--- src/native-state-wayland.cpp	2013-04-29 16:07:13 +0000
+++ src/native-state-wayland.cpp	2013-06-18 17:17:28 +0000
@@ -49,23 +49,36 @@
 
 NativeStateWayland::~NativeStateWayland()
 {
-    wl_shell_surface_destroy(window_->shell_surface);
-    wl_surface_destroy(window_->surface);
-    wl_egl_window_destroy(window_->native);
-    delete window_;
-
-    wl_shell_destroy(display_->shell);
-    for (OutputsVector::iterator it = display_->outputs.begin();
-         it != display_->outputs.end(); ++it) {
-
-        wl_output_destroy((*it)->output);
-        delete *it;
-    }
-    wl_compositor_destroy(display_->compositor);
-    wl_registry_destroy(display_->registry);
-    wl_display_flush(display_->display);
-    wl_display_disconnect(display_->display);
-    delete display_;
+    if (window_) {
+        if (window_->shell_surface)
+            wl_shell_surface_destroy(window_->shell_surface);
+        if (window_->surface)
+            wl_surface_destroy(window_->surface);
+        if (window_->native)
+            wl_egl_window_destroy(window_->native);
+        delete window_;
+    }
+
+    if (display_) {
+        if (display_->shell)
+            wl_shell_destroy(display_->shell);
+
+        for (OutputsVector::iterator it = display_->outputs.begin();
+             it != display_->outputs.end(); ++it) {
+
+            wl_output_destroy((*it)->output);
+            delete *it;
+        }
+        if (display_->compositor)
+            wl_compositor_destroy(display_->compositor);
+        if (display_->registry)
+            wl_registry_destroy(display_->registry);
+        if (display_->display) {
+            wl_display_flush(display_->display);
+            wl_display_disconnect(display_->display);
+        }
+        delete display_;
+    }
 }
 
 void

=== modified file 'src/native-state-wayland.h'
--- src/native-state-wayland.h	2013-04-04 16:53:33 +0000
+++ src/native-state-wayland.h	2013-06-18 17:17:28 +0000
@@ -81,34 +81,6 @@
     shell_surface_handle_popup_done(void *data,
                                     struct wl_shell_surface *shell_surface);
 
-    static void
-    keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,
-                           uint32_t format, int32_t fd, uint32_t size);
-
-    static void
-    keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard,
-                          uint32_t serial, struct wl_surface *surface,
-                          struct wl_array *keys);
-
-    static void
-    keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard,
-                          uint32_t serial, struct wl_surface *surface);
-
-    static void
-    keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
-                        uint32_t serial, uint32_t time, uint32_t key,
-                        uint32_t state);
-
-    static void
-    keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard,
-                              uint32_t serial, uint32_t mods_depressed,
-                              uint32_t mods_latched, uint32_t mods_locked,
-                              uint32_t group);
-
-    static void
-    seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
-                             uint32_t capabilities);
-
     struct my_output {
         wl_output *output;
         int32_t width, height;