_xudc_code_to_glyph: check for NULL pointer *before* writing to it, not after

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

_xudc_code_to_glyph: check for NULL pointer before writing to it, not after
7ddc5b90 · Alan Coopersmith · Ulrich Sibiller · e18ccaaa · 7ddc5b90
Commit 7ddc5b90 authored Mar 08, 2013 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

udcInf.c nx-X11/lib/X11/udcInf.c +4 -4

No files found.
--- a/nx-X11/lib/X11/udcInf.c
+++ b/nx-X11/lib/X11/udcInf.c
@@ -702,14 +702,14 @@ int 		*num_gi;
    _XlcCloseConverter(conv);
    _XlcDestroyLC(lcd);
-    *gi = (_XUDCGIInf *)Xmalloc(sizeof(_XUDCGIInf));
+    *gi = Xmalloc(sizeof(_XUDCGIInf));
-    (*gi)->charset_str = (char *)Xmalloc(strlen(charsetname)+1);
-    strcpy((*gi)->charset_str,charsetname);
-    (*gi)->glyph_index = glyph;
    if(*gi == NULL){
 	_xudc_utyerrno = 0x03 ;
        return(_XUDC_ERROR);
    }
+    (*gi)->charset_str = Xmalloc(strlen(charsetname)+1);
+    strcpy((*gi)->charset_str,charsetname);
+    (*gi)->glyph_index = glyph;
    *num_gi = 1;
    return(0);
 }