1
0
mirror of https://github.com/git/git.git synced 2024-09-28 19:42:15 +02:00

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
This commit is contained in:
Junio C Hamano 2016-02-17 10:13:33 -08:00
commit b1a90b68cf

@ -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;
}