[Spice-commits] src/channel-display.c

[Frediano Ziglio]

 src/channel-display.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ef9538efd36aa025bc4d7d3fe9f6a111f6a9a09c
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Aug 11 13:44:18 2016 +0100

    streaming: Check the stream id in display_update_stream_report() too
    
    It's safer and more consistent than assuming the caller has done the
    check already.
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/src/channel-display.c b/src/channel-display.c
index cf9c583..b4c9ec0 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1222,9 +1222,16 @@ void stream_display_frame(display_stream *st, SpiceMsgIn *frame_msg,
 static void display_update_stream_report(SpiceDisplayChannel *channel, uint32_t stream_id,
                                          uint32_t frame_time, int32_t latency)
 {
-    display_stream *st = channel->priv->streams[stream_id];
+    SpiceDisplayChannelPrivate *c = channel->priv;
+    display_stream *st;
     guint64 now;
 
+    g_return_if_fail(c != NULL);
+    g_return_if_fail(c->streams != NULL);
+    g_return_if_fail(c->nstreams > stream_id);
+
+    st = channel->priv->streams[stream_id];
+
     if (!st->report_is_active) {
         return;
     }