From 2fbf23c17ffbc03c5a4d4aa1bda55586e8f41a8e Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Fri, 30 Jan 2004 09:59:32 +0000
Subject: [PATCH] memory leaks fixed

---
 ChangeLog   | 4 ++++
 rfbserver.c | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 72a10b5..248eaa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-30  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* Thanks to Paul Fox from Bright Star Engineering,
+	  a few more memory leaks were fixed.
+
 2004-01-29  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
 	* Honour the check for libz and libjpeg again.
 
diff --git a/rfbserver.c b/rfbserver.c
index 1b11e6b..7a40a7b 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -1213,6 +1213,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
             int h = rect.y2 - y;
 	    nUpdateRegionRects += (((h-1) / (ZLIB_MAX_SIZE( w ) / w)) + 1);
 	}
+	sraRgnReleaseIterator(i);
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
     } else if (cl->preferredEncoding == rfbEncodingTight) {
 	nUpdateRegionRects = 0;
@@ -1296,24 +1297,28 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
         case rfbEncodingRaw:
             if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
                 return FALSE;
             }
             break;
         case rfbEncodingRRE:
             if (!rfbSendRectEncodingRRE(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
                 return FALSE;
             }
             break;
         case rfbEncodingCoRRE:
             if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
                 return FALSE;
             }
             break;
         case rfbEncodingHextile:
             if (!rfbSendRectEncodingHextile(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
                 return FALSE;
             }
             break;
@@ -1321,6 +1326,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
 	case rfbEncodingZlib:
 	    if (!rfbSendRectEncodingZlib(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
 		return FALSE;
 	    }
 	    break;
@@ -1328,6 +1334,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
 	case rfbEncodingTight:
 	    if (!rfbSendRectEncodingTight(cl, x, y, w, h)) {
 	        sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
 		return FALSE;
 	    }
 	    break;
@@ -1337,6 +1344,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
        case rfbEncodingZRLE:
            if (!rfbSendRectEncodingZRLE(cl, x, y, w, h)) {
 	       sraRgnDestroy(updateRegion);
+		sraRgnReleaseIterator(i);
                return FALSE;
            }
            break;