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
index 1360fde0cc2d043247d60d81acb55fac47ddf900..0d4511ad5d7fa82f34ae9a9b7d4beb7d20f10802 100644 (file)
--- 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
index 728dadf5a0ee093b62d47fdb9fae3e1e7f2dc597..6c1bc857f9af9481b02f288fbe209987c11ac269 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    115,
 /**/
     114,
 /**/