updated for version 7.3.1262
Problem: Crash and compilation warnings with Cygwin.
Solution: Check return value of XmbTextListToTextProperty(). Add type casts.
Adjust #ifdefs. (Lech Lorens)
diff --git a/src/ui.c b/src/ui.c
index 49bc56b..714d193 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -2366,14 +2366,20 @@
{
XTextProperty text_prop;
char *string_nt = (char *)alloc((unsigned)*length + 1);
+ int conv_result;
/* create NUL terminated string which XmbTextListToTextProperty wants */
mch_memmove(string_nt, string, (size_t)*length);
string_nt[*length] = NUL;
- XmbTextListToTextProperty(X_DISPLAY, (char **)&string_nt, 1,
- XCompoundTextStyle, &text_prop);
+ conv_result = XmbTextListToTextProperty(X_DISPLAY, (char **)&string_nt,
+ 1, XCompoundTextStyle, &text_prop);
vim_free(string_nt);
XtFree(*value); /* replace with COMPOUND text */
+ if (conv_result != Success)
+ {
+ vim_free(string);
+ return False;
+ }
*value = (XtPointer)(text_prop.value); /* from plain text */
*length = text_prop.nitems;
*type = compound_text_atom;