Merge git://ozlabs.org/~paulus/gitk

diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 19200291a2632554223b1a675d5324b4682248ab..6fc6bcdf7f014a52703fcd44677a705c824bc0b0 100644 (file)
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -12,7 +12,7 @@ static char *create_temp_file(unsigned char *sha1)
        if (!buf || type != OBJ_BLOB)
                die("unable to read blob object %s", sha1_to_hex(sha1));
 
-       strcpy(path, ".merge_file_XXXXXX");
+       xsnprintf(path, sizeof(path), ".merge_file_XXXXXX");
        fd = xmkstemp(path);
        if (write_in_full(fd, buf, size) != size)
                die_errno("unable to write temp-file");