[PATCH 01/16] Fix memory leak with broken bitmap files in XReadBitmapFileData

Ander Conselvan de Oliveira ander.conselvan-de-oliveira at nokia.com
Wed Mar 30 06:11:54 PDT 2011


Bitmap file data is read looping through the lines in the input file. If
there is extra data after the bitmap, these lines will be processed and
if this data represents another bitmap it will replace the one read
before causing the memory allocated for bits to leak.

This changes the code to stop processing the file once a bitmap was
read.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
---
 src/RdBitF.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/RdBitF.c b/src/RdBitF.c
index 07967ae..ab7d800 100644
--- a/src/RdBitF.c
+++ b/src/RdBitF.c
@@ -216,6 +216,11 @@ XReadBitmapFileData (
 		*ptr=value;
 	    }
 	}
+
+	/* If we got to this point, we read a full bitmap file. Break so we don't
+	 * start reading another one from the same file and leak the memory
+	 * allocated for the previous one. */
+	break;
     }					/* end while */
 
     fclose(fstream);
-- 
1.7.0.4



More information about the xorg-devel mailing list