Fix memory leak with broken bitmap files in XReadBitmapFileData

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@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Fix memory leak with broken bitmap files in XReadBitmapFileData
0f714869 · Ander Conselvan de Oliveira · Ulrich Sibiller · 417e0411 · 0f714869
Commit 0f714869 authored Mar 23, 2011 by Ander Conselvan de Oliveira Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

RdBitF.c nx-X11/lib/X11/RdBitF.c +5 -0

No files found.
--- a/nx-X11/lib/X11/RdBitF.c
+++ b/nx-X11/lib/X11/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);