summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-05-22 16:01:02 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-05-22 16:01:02 +0200
commit052a2ffde4d8cf0d2b07c70956631d97875ad5ec (patch)
tree3012d2ca4f8789ab794a3b2e837d315ddc687b57 /src
parent9331f98acaffd377a8076ab111bed84ff89e8e72 (diff)
downloadlibgit2-cmn/index-add-modes.tar.gz
index: check for valid filemodes on addcmn/index-add-modes
Diffstat (limited to 'src')
-rw-r--r--src/index.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/index.c b/src/index.c
index 8a7f29279..b63a0bec6 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1104,6 +1104,15 @@ int git_index_remove_bypath(git_index *index, const char *path)
return 0;
}
+static bool valid_filemode(const int filemode)
+{
+ return (filemode == GIT_FILEMODE_BLOB ||
+ filemode == GIT_FILEMODE_BLOB_EXECUTABLE ||
+ filemode == GIT_FILEMODE_LINK ||
+ filemode == GIT_FILEMODE_COMMIT);
+}
+
+
int git_index_add(git_index *index, const git_index_entry *source_entry)
{
git_index_entry *entry = NULL;
@@ -1111,6 +1120,11 @@ int git_index_add(git_index *index, const git_index_entry *source_entry)
assert(index && source_entry && source_entry->path);
+ if (!valid_filemode(source_entry->mode)) {
+ giterr_set(GITERR_INDEX, "invalid filemode");
+ return -1;
+ }
+
if ((ret = index_entry_dup(&entry, source_entry)) < 0 ||
(ret = index_insert(index, &entry, 1)) < 0)
return ret;