From 51c63587a16518fa322eb4fcdcc08102c8b0cc3e Mon Sep 17 00:00:00 2001
From: Matthew Ife <matthew.ife@ukfast.co.uk>
Date: Sun, 12 Dec 2010 23:34:02 +0000
Subject: [PATCH] rfbsrc: fail more gracefully if source gets disconnected or
 geometry changes

Don't get caught in an infinite loop if the source gets disconnected and also
support gracefully failing upon detecting the frame geometry has increased
(rather than segfaulting).

https://bugzilla.gnome.org/show_bug.cgi?id=635397
---
 gst/librfb/rfbdecoder.c | 14 +++++++++++++-
 gst/librfb/rfbdecoder.h |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index 36e47aa411..53de8d14aa 100644
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -79,6 +79,7 @@ rfb_decoder_new (void)
   decoder->rect_width = 0;
   decoder->rect_height = 0;
   decoder->shared_flag = TRUE;
+  decoder->disconnected = FALSE;
   decoder->data = NULL;
   decoder->data_len = 0;
 
@@ -129,6 +130,9 @@ rfb_decoder_connect_tcp (RfbDecoder * decoder, gchar * addr, guint port)
     return FALSE;
   }
   //rfb_decoder_use_file_descriptor (decoder, fd);
+
+  decoder->disconnected = FALSE;
+
   return TRUE;
 }
 
@@ -178,6 +182,7 @@ rfb_decoder_read (RfbDecoder * decoder, guint32 len)
     now = recv (decoder->fd, (char *) decoder->data + total, len - total, 0);
 #endif
     if (now <= 0) {
+      decoder->disconnected = TRUE;
       GST_WARNING ("rfb read error on socket");
       return NULL;
     }
@@ -620,6 +625,13 @@ rfb_decoder_state_framebuffer_update_rectangle (RfbDecoder * decoder)
   GST_DEBUG ("w:%d h:%d", w, h);
   GST_DEBUG ("encoding: %d", encoding);
 
+  if (((w * h) + (x * y)) > (decoder->width * decoder->height)) {
+    GST_ERROR ("Desktop resize is unsupported.");
+    decoder->state = NULL;
+    decoder->disconnected = TRUE;
+    return TRUE;
+  }
+
   switch (encoding) {
     case ENCODING_TYPE_RAW:
       rfb_decoder_raw_encoding (decoder, x, y, w, h);
@@ -641,7 +653,7 @@ rfb_decoder_state_framebuffer_update_rectangle (RfbDecoder * decoder)
       break;
   }
   decoder->n_rects--;
-  if (decoder->n_rects == 0) {
+  if (decoder->n_rects == 0 || decoder->disconnected == TRUE) {
     decoder->state = NULL;
   } else {
     decoder->state = rfb_decoder_state_framebuffer_update_rectangle;
diff --git a/gst/librfb/rfbdecoder.h b/gst/librfb/rfbdecoder.h
index c9fb5f55dc..33323ac260 100644
--- a/gst/librfb/rfbdecoder.h
+++ b/gst/librfb/rfbdecoder.h
@@ -48,6 +48,7 @@ struct _RfbDecoder
 
   /* settable properties */
   gboolean shared_flag;
+  gboolean disconnected;
 
   /* readable properties */
   gboolean inited;