diff options
| -rw-r--r-- | src/gui_x11.c | 2 | ||||
| -rw-r--r-- | src/mbyte.c | 2 | ||||
| -rw-r--r-- | src/misc2.c | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c index 2842fa092..b56c9436c 100644 --- 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 923571406..134a95600 100644 --- 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 10c77a752..4d40ad207 100644 --- 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 1edad601a..2191e2e8f 100644 --- 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 ace1c18cc..b1049255b 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 35, +/**/ 34, /**/ 33, |