Merge upstream/development

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>

1 files changed, 12 insertions, 0 deletions

diff --git a/src/util.c b/src/util.c
index c9a8e5fe9..995daf314 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,6 +3,15 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+void git_strarray_free(git_strarray *array)
+{
+	size_t i;
+	for (i = 0; i < array->count; ++i)
+		free(array->strings[i]);
+
+	free(array->strings);
+}
+
 int git__fmt(char *buf, size_t buf_sz, const char *fmt, ...)
 {
 	va_list va;
@@ -214,6 +223,9 @@ void git__joinpath_n(char *buffer_out, int count, ...)
 		int len;
 
 		path = va_arg(ap, const char *);
+
+		assert((i == 0) || path != buffer_start);
+
 		if (i > 0 && *path == '/' && buffer_out > buffer_start && buffer_out[-1] == '/')
 			path++;