[Spice-devel] [spice v13 01/29] server: Correctly handle and trace stream report errors

[Francois Gouget]

We may get stream reports after the stream has been closed, and even, in
extreme cases, after a new stream has started reusing the same stream
id. Neither case should cause the server to crash.
So restore dcc_handle_stream_report() to how it was before being moved
to dcc.c.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 server/dcc.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/dcc.c b/server/dcc.c
index 91c3f82..36048da 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -1380,15 +1380,25 @@ static int dcc_handle_stream_report(DisplayChannelClient *dcc,
     StreamAgent *agent;
 
     if (report->stream_id >= NUM_STREAMS) {
+        spice_warning("stream_report: invalid stream id %u",
+                      report->stream_id);
         return FALSE;
     }
 
     agent = &dcc->stream_agents[report->stream_id];
     if (!agent->mjpeg_encoder) {
+        spice_info("stream_report: no encoder for stream id %u. "
+                   "The stream has probably been destroyed",
+                   report->stream_id);
         return TRUE;
     }
 
-    spice_return_val_if_fail(report->unique_id == agent->report_id, TRUE);
+    if (report->unique_id != agent->report_id) {
+        spice_warning("stream_report: unique id mismatch: local (%u) != msg (%u) "
+                      "The old stream was probably replaced by a new one",
+                      agent->report_id, report->unique_id);
+        return TRUE;
+    }
 
     mjpeg_encoder_client_stream_report(agent->mjpeg_encoder,
                                        report->num_frames,
-- 
2.8.0.rc3