[Spice-devel] [spice-gtk v1 8/9] debug: don't segfault on CHANNEL_DEBUG

Victor Toso victortoso at redhat.com
Thu May 19 11:21:48 UTC 2016


On a test environment, not always we have the channel present on
CHANNEL_DEBUG which could cause a crash in the code. Just defaults to
"no-channel" should be enough.
---
 src/spice-channel-priv.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/spice-channel-priv.h b/src/spice-channel-priv.h
index 526b661..f0bb017 100644
--- a/src/spice-channel-priv.h
+++ b/src/spice-channel-priv.h
@@ -41,7 +41,9 @@ G_BEGIN_DECLS
 #define MAX_SPICE_DATA_HEADER_SIZE sizeof(SpiceDataHeader)
 
 #define CHANNEL_DEBUG(channel, fmt, ...) \
-    SPICE_DEBUG("%s: " fmt, SPICE_CHANNEL(channel)->priv->name, ## __VA_ARGS__)
+    SPICE_DEBUG("%s: " fmt, \
+            (channel) ? SPICE_CHANNEL(channel)->priv->name : "no-channel", \
+            ## __VA_ARGS__)
 
 struct _SpiceMsgOut {
     int                   refcount;
-- 
2.5.5



More information about the Spice-devel mailing list