om: Fix potential memory leak in init_om.

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>

om: Fix potential memory leak in init_om.
748cf894 · Ander Conselvan de Oliveira · Ulrich Sibiller · 6fe8d44c · 748cf894
Commit 748cf894 authored Mar 25, 2011 by Ander Conselvan de Oliveira Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

omGeneric.c nx-X11/lib/X11/omGeneric.c +12 -10

No files found.
--- a/nx-X11/lib/X11/omGeneric.c
+++ b/nx-X11/lib/X11/omGeneric.c
@@ -2094,22 +2094,24 @@ init_om(
    if (required_list == NULL)
 	return False;
-    bufptr = (char *) Xmalloc(length);
-    if (bufptr == NULL) {
-	Xfree(required_list);
-	return False;
-    }
    om->core.required_charset.charset_list = required_list;
    om->core.required_charset.charset_count = gen->data_num;
    count = gen->data_num;
    data = gen->data;
-    for ( ; count-- > 0; data++) {
+    if (count > 0) {
-	strcpy(bufptr, data->font_data->name);
+	bufptr = (char *) Xmalloc(length);
-	*required_list++ = bufptr;
+	if (bufptr == NULL) {
-	bufptr += strlen(bufptr) + 1;
+	    Xfree(required_list);
+	    return False;
+	}
+	for ( ; count-- > 0; data++) {
+	    strcpy(bufptr, data->font_data->name);
+	    *required_list++ = bufptr;
+	    bufptr += strlen(bufptr) + 1;
+	}
    }
    /* orientation list */