Bug 93184: read_EncodingInfo invalid free

Free the correct bits of memory if we run out and need to unwind Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93184Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Bug 93184: read_EncodingInfo invalid free
8d6d95d7 · Alan Coopersmith · Ulrich Sibiller · 8339e680 · 8d6d95d7
Commit 8d6d95d7 authored Dec 03, 2015 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

omGeneric.c nx-X11/lib/X11/omGeneric.c +4 -3

No files found.
--- a/nx-X11/lib/X11/omGeneric.c
+++ b/nx-X11/lib/X11/omGeneric.c
@@ -1877,13 +1877,13 @@ read_EncodingInfo(
 {
    FontData font_data,ret;
    char *buf, *bufptr,*scp;
-    int len;
+    int len, i;
    font_data = Xcalloc(count, sizeof(FontDataRec));
    if (font_data == NULL)
        return NULL;

    ret = font_data;
-    for ( ; count-- > 0; font_data++) {
+    for (i = 0; i < count; i++, font_data++) {
 /*
        strcpy(buf, *value++);
 */
@@ -1895,7 +1895,8 @@ read_EncodingInfo(
            len = strlen(buf);
        font_data->name = Xmalloc(len + 1);
        if (font_data->name == NULL) {
-            Xfree(font_data);
+            free_fontdataOM(ret, i + 1);
+            Xfree(ret);
            return NULL;
 	}
        strncpy(font_data->name, buf,len);