summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-17 10:13:33 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-17 10:13:33 -0800
commitb1a90b68cfa3f9e1e0769c2c9fe0db012a51c818 (patch)
treeb7b82b530ad2bde1eec649dd626a45a8237278ed /rerere.c
parent790dd332c6986693b731211e49479c74c8a1894c (diff)
parentf58316db0ef1b25506c8cd6cc86b3071243a672a (diff)
downloadgit-b1a90b68cfa3f9e1e0769c2c9fe0db012a51c818.tar.gz
Merge branch 'jk/rerere-xsnprintf'
Some calls to strcpy(3) triggers a false warning from static analysers that are less intelligent than humans, and reducing the number of these false hits helps us notice real issues. A few calls to strcpy(3) in "git rerere" that are already safe has been rewritten to avoid false wanings. * jk/rerere-xsnprintf: rerere: replace strcpy with xsnprintf
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rerere.c b/rerere.c
index 403c700c32..587b7e2717 100644
--- a/rerere.c
+++ b/rerere.c
@@ -48,7 +48,7 @@ static int has_rerere_resolution(const struct rerere_id *id)
static struct rerere_id *new_rerere_id_hex(char *hex)
{
struct rerere_id *id = xmalloc(sizeof(*id));
- strcpy(id->hex, hex);
+ xsnprintf(id->hex, sizeof(id->hex), "%s", hex);
return id;
}
@@ -904,7 +904,7 @@ int rerere_forget(struct pathspec *pathspec)
static struct rerere_id *dirname_to_id(const char *name)
{
static struct rerere_id id;
- strcpy(id.hex, name);
+ xsnprintf(id.hex, sizeof(id.hex), "%s", name);
return &id;
}