updated for version 7.2-035

diff --git a/src/gui_x11.c b/src/gui_x11.c
index 2842fa092bd1460ebd95d83c0cf6989f4e264742..b56c9436c3f64a73f13d2256950e80379173a134 100644 (file)
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2450,7 +2450,7 @@ find_closest_color(colormap, colorPtr)
        *colorPtr = colortable[closest];
     }
 
-    free(colortable);
+    vim_free(colortable);
     return OK;
 }
 

diff --git a/src/mbyte.c b/src/mbyte.c
index 923571406ade96e5d098c0b3470b0284ce9178ac..134a9560040fec40ed8601a660dcbc082f6bb5a1 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5384,7 +5384,7 @@ preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
                        draw_feedback = (char *)alloc(draw_data->chg_first
                                                              + text->length);
                    else
-                       draw_feedback = realloc(draw_feedback,
+                       draw_feedback = vim_realloc(draw_feedback,
                                         draw_data->chg_first + text->length);
                    if (draw_feedback != NULL)
                    {

diff --git a/src/misc2.c b/src/misc2.c
index 10c77a7529e09bc00ec40386f489020f0fcb462d..4d40ad207e1e08505562ad524a6d2961a35a2aea 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -873,7 +873,7 @@ lalloc(size, message)
            /* 3. check for available memory: call mch_avail_mem() */
            if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
            {
-               vim_free((char *)p);    /* System is low... no go! */
+               free((char *)p);        /* System is low... no go! */
                p = NULL;
            }
            else

diff --git a/src/os_unix.c b/src/os_unix.c
index 1edad601a965236d220f11e56cad5af6ab98ade9..2191e2e8f2973ec6dd6aff83a21656b15f98530c 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2905,7 +2905,7 @@ mch_early_init()
      * Ignore any errors.
      */
 #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
-    signal_stack = malloc(SIGSTKSZ);
+    signal_stack = (char *)alloc(SIGSTKSZ);
     init_signal_stack();
 #endif
 }
@@ -6814,7 +6814,8 @@ xsmp_close()
     if (xsmp_icefd != -1)
     {
        SmcCloseConnection(xsmp.smcconn, 0, NULL);
-       vim_free(xsmp.clientid);
+       if (xsmp.clientid != NULL)
+           free(xsmp.clientid);
        xsmp.clientid = NULL;
        xsmp_icefd = -1;
     }

diff --git a/src/version.c b/src/version.c
index ace1c18cc2a737fef58396b8a174d87c25002fb9..b1049255b284f058e68e4e11c6b906eee5aceecb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    35,
 /**/
     34,
 /**/