summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-04-21 16:12:06 +0200
committerBram Moolenaar <Bram@vim.org>2015-04-21 16:12:06 +0200
commit3cbac309f78f92434f75da5c4963d8caf4b6d3d3 (patch)
tree6837a5cd0d878a32dc6bf30b03f0b512d52dc8b9
parent5b14f89164fa2f40f52283226c98005887568317 (diff)
downloadvim-3cbac309f78f92434f75da5c4963d8caf4b6d3d3.zip
patch 7.4.707
Problem: Undo files can have their executable bit set. Solution: Strip of the executable bit. (Mikael Berthe)
-rw-r--r--src/undo.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/undo.c b/src/undo.c
index 034d16c14..c29832b7c 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1614,8 +1614,8 @@ u_write_undo(name, forceit, buf, hash)
#endif
}
- /* strip any s-bit */
- perm = perm & 0777;
+ /* strip any s-bit and executable bit */
+ perm = perm & 0666;
/* If the undo file already exists, verify that it actually is an undo
* file, and delete it. */
diff --git a/src/version.c b/src/version.c
index b6676b762..47015b142 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 707,
+/**/
706,
/**/
705,