[Spice-commits] 2 commits - src/spice-channel.c tests/Makefile.am

[Victor Toso de Carvalho]

 src/spice-channel.c |    5 ++++-
 tests/Makefile.am   |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7d7382ea45ffcd42d4d94b9c0ee49cce1a9698c3
Author: Victor Toso <victortoso at redhat.com>
Date:   Sat May 21 15:41:07 2016 +0200

    channel: avoid crash on spice_channel_wakeup due NULL channel
    
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/src/spice-channel.c b/src/spice-channel.c
index c555f75..61ab15c 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -1891,7 +1891,10 @@ error:
 G_GNUC_INTERNAL
 void spice_channel_wakeup(SpiceChannel *channel, gboolean cancel)
 {
-    GCoroutine *c = &channel->priv->coroutine;
+    GCoroutine *c;
+
+    g_return_if_fail(SPICE_IS_CHANNEL(channel));
+    c = &channel->priv->coroutine;
 
     if (cancel)
         g_coroutine_condition_cancel(c);
commit 756f1fe8aa76343350d281ce86756f8a71e2376d
Author: Victor Toso <victortoso at redhat.com>
Date:   Sat May 21 10:29:41 2016 +0200

    tests: fix build with smartcard enabled
    
    In file included from
    ../spice-common/common/client_marshallers.h:29:0,
    from ../src/spice-channel-priv.h:35,
    from ../src/spice-file-transfer-task-priv.h:28,
    from file-transfer.c:3:
    ../spice-common/common/messages.h:45:23: fatal error: libcacard.h: No such file or directory
    compilation terminated.
    
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c1d95c1..d56ff1b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@ noinst_PROGRAMS += $(TESTS)
 AM_CPPFLAGS =					\
 	$(COMMON_CFLAGS)			\
 	$(GIO_CFLAGS)				\
+	$(SMARTCARD_CFLAGS)			\
 	-I$(top_srcdir)/src			\
 	-I$(top_builddir)/src			\
 	-DG_LOG_DOMAIN=\"GSpice\"		\