Merge lp:~dandrader/geis/lp1080386 into lp:geis

[Daniel d'Andrada]

Don't crash if a null filter is passed to geis_filter_delete()

Just as the following doesn't lead to a crash:
  int *foo = nullptr;
  delete foo;

Fixes lp:1080386

Fixes bug 1080386.

As I cannot really reproduce the bug by "natural" means, I tried it out on my test laptop by hardcoding geis_subscription_activate() to fail and it indeed a crash just like the one reported happens. Applying the this patches fixed it.

[Stephen M. Webb (bregma)]

OK

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 02:01:14 +0000
+++ debian/changelog	2012-12-07 19:08:20 +0000
@@ -1,3 +1,9 @@
+geis (2.2.15) UNRELEASED; urgency=low
+
+  *  Don't crash if a null filter is passed to geis_filter_delete() (LP: #1080386)
+
+ -- Daniel d'Andrada <[e-mail]>  Fri, 07 Dec 2012 16:44:58 -0200
+
 geis (2.2.15daily12.12.05-0ubuntu1) raring; urgency=low
 
   [ Stephen M. Webb ]

=== modified file 'libgeis/geis_filter.c'
--- libgeis/geis_filter.c	2012-12-04 12:39:16 +0000
+++ libgeis/geis_filter.c	2012-12-07 19:08:20 +0000
@@ -361,7 +361,7 @@
 {
   GeisStatus status = GEIS_STATUS_SUCCESS;
 
-  if (geis_filter_unref(filter) == 0)
+  if (filter && (geis_filter_unref(filter) == 0))
   {
     geis_unref(filter->geis);
     geis_backend_token_delete(filter->backend_token);

=== modified file 'testsuite/geis2/Makefile.am'
--- testsuite/geis2/Makefile.am	2012-09-05 14:42:06 +0000
+++ testsuite/geis2/Makefile.am	2012-12-07 19:08:20 +0000
@@ -52,7 +52,8 @@
 	gtest_gbe_deactivate_sub.cpp \
 	gtest_gbe_direct_touch_coords.cpp \
 	gtest_gbe_construction_finished.cpp \
-	gtest_gbe_outdated_events.cpp
+	gtest_gbe_outdated_events.cpp \
+	gtest_gbe_null_filter.cpp
 
 gtest_geis2_grail_backend_CPPFLAGS = \
 	--std=c++0x \

=== added file 'testsuite/geis2/gtest_gbe_null_filter.cpp'
--- testsuite/geis2/gtest_gbe_null_filter.cpp	1970-01-01 00:00:00 +0000
+++ testsuite/geis2/gtest_gbe_null_filter.cpp	2012-12-07 19:08:20 +0000
@@ -0,0 +1,34 @@
+#include "gtest_grail_backend.h"
+#include "x11_mocks.h"
+
+/*
+  Checks trying to delete a null filter doesn't cause problems.
+
+  Regression test for https://bugs.launchpad.net/nux/+bug/1080386
+ */
+
+class DeleteNullFilter : public Geis2GrailBackendBase
+{
+ protected:
+  virtual void OnEventInitComplete(GeisEvent event);
+};
+
+void DeleteNullFilter::OnEventInitComplete(GeisEvent event)
+{
+  GeisFilter filter = nullptr;
+  geis_filter_delete(filter); // please don't crash
+}
+
+TEST_F(DeleteNullFilter, Test)
+{
+  CreateXMockTouchScreenDevice();
+
+  _geis = geis_new(GEIS_INIT_GRAIL_BACKEND,
+                   GEIS_INIT_NO_ATOMIC_GESTURES,
+                   nullptr);
+  ASSERT_NE(nullptr, _geis);
+
+  Run();
+
+  DestroyXMockDevices();
+}