1 files changed, 16 insertions, 13 deletions

diff --git a/nx-X11/lib/X11/ICWrap.c b/nx-X11/lib/X11/ICWrap.c
index 1eacfa5f1..69f080d87 100644
--- a/nx-X11/lib/X11/ICWrap.c
+++ b/nx-X11/lib/X11/ICWrap.c
@@ -128,7 +128,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
 	return;
     }
 
-    args = (XIMArg *)Xmalloc((unsigned)(max_count + 1) * sizeof(XIMArg));
+    args = Xmalloc(((unsigned)max_count + 1) * sizeof(XIMArg));
     *args_return = args;
     if (!args) return;
 
@@ -169,7 +169,7 @@ XSetIMValues(XIM im, ...)
     va_list var;
     int     total_count;
     XIMArg *args;
-    char   *ret;
+    char   *ret = NULL;
 
     /*
      * so count the stuff dangling here
@@ -185,8 +185,9 @@ XSetIMValues(XIM im, ...)
     _XIMVaToNestedList(var, total_count, &args);
     va_end(var);
 
-    ret = (*im->methods->set_values) (im, args);
-    if (args) Xfree((char *)args);
+    if (im && im->methods)
+	ret = (*im->methods->set_values) (im, args);
+    Xfree(args);
     return ret;
 }
 
@@ -196,7 +197,7 @@ XGetIMValues(XIM im, ...)
     va_list var;
     int     total_count;
     XIMArg *args;
-    char   *ret;
+    char   *ret = NULL;
 
     /*
      * so count the stuff dangling here
@@ -212,8 +213,9 @@ XGetIMValues(XIM im, ...)
     _XIMVaToNestedList(var, total_count, &args);
     va_end(var);
 
-    ret = (*im->methods->get_values) (im, args);
-    if (args) Xfree((char *)args);
+    if (im && im->methods)
+	ret = (*im->methods->get_values) (im, args);
+    Xfree(args);
     return ret;
 }
 
@@ -228,7 +230,7 @@ XCreateIC(XIM im, ...)
     va_list var;
     int     total_count;
     XIMArg *args;
-    XIC     ic;
+    XIC     ic = NULL;
 
     /*
      * so count the stuff dangling here
@@ -244,8 +246,9 @@ XCreateIC(XIM im, ...)
     _XIMVaToNestedList(var, total_count, &args);
     va_end(var);
 
-    ic = (XIC) (*im->methods->create_ic) (im, args);
-    if (args) Xfree((char *)args);
+    if (im && im->methods)
+	ic = (XIC) (*im->methods->create_ic) (im, args);
+    Xfree(args);
     if (ic) {
 	ic->core.next = im->core.ic_chain;
 	im->core.ic_chain = ic;
@@ -271,7 +274,7 @@ XDestroyIC(XIC ic)
 	    }
 	}
     }
-    Xfree ((char *) ic);
+    Xfree (ic);
 }
 
 char *
@@ -300,7 +303,7 @@ XGetICValues(XIC ic, ...)
     va_end(var);
 
     ret = (*ic->methods->get_values) (ic, args);
-    if (args) Xfree((char *)args);
+    Xfree(args);
     return ret;
 }
 
@@ -330,7 +333,7 @@ XSetICValues(XIC ic, ...)
     va_end(var);
 
     ret = (*ic->methods->set_values) (ic, args);
-    if (args) Xfree((char *)args);
+    Xfree(args);
     return ret;
 }