diff options
| author | David Rientjes <rientjes@google.com> | 2006-08-17 11:54:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-17 14:23:53 -0700 |
| commit | a89fccd28197fa179828c8596791ff16e2268d20 (patch) | |
| tree | 4a6c2b256a986fc221c0e1d5fa7d910f3b31eee8 /builtin-commit-tree.c | |
| parent | d4baf9eaf47ea1ba204f1ab5ecd22326913dd081 (diff) | |
| download | git-a89fccd28197fa179828c8596791ff16e2268d20.tar.gz | |
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
Introduces global inline:
hashcmp(const unsigned char *sha1, const unsigned char *sha2)
Uses memcmp for comparison and returns the result based on the length of
the hash name (a future runtime decision).
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-commit-tree.c')
| -rw-r--r-- | builtin-commit-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index 9c98796671..e2e690a1ae 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -69,7 +69,7 @@ static int new_parent(int idx) int i; unsigned char *sha1 = parent_sha1[idx]; for (i = 0; i < idx; i++) { - if (!memcmp(parent_sha1[i], sha1, 20)) { + if (!hashcmp(parent_sha1[i], sha1)) { error("duplicate parent %s ignored", sha1_to_hex(sha1)); return 0; } |