From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Feb 2011 15:44:51 +0000 (+0100)
Subject: updated for version 7.3.115
X-Git-Tag: v7.3.115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95474ca34c542d58d3f08703b7d96ad21b05beea;p=vim

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 1360fde0c..0d4511ad5 100644
--- 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 728dadf5a..6c1bc857f 100644
--- 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,
 /**/