# HG changeset patch # User Bram Moolenaar # Date 1297266291 -3600 # Node ID 6cc8a093e4a9b14df444effaef7274d2318d00d1 # Parent a041f68d05909431f0a525eace55307214c33d43 updated for version 7.3.115 Problem: Vim can crash when tmpnam() returns NULL. Solution: Check for NULL. (Hong Xu) diff --git a/src/fileio.c b/src/fileio.c --- a/src/fileio.c +++ b/src/fileio.c @@ -7483,8 +7483,11 @@ vim_tempname(extra_char) # else /* WIN3264 */ # ifdef USE_TMPNAM + char_u *p; + /* tmpnam() will make its own name */ - if (*tmpnam((char *)itmp) == NUL) + p = tmpnam((char *)itmp); + if (p == NULL || *p == NUL) return NULL; # else char_u *p; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 115, +/**/ 114, /**/ 113,