diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-05-02 01:31:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-02 05:14:03 (GMT) |
| commit | 0111ea38cbb9db0e4e245dcd5c86198186bab197 (patch) | |
| tree | 1b07e4777ce4d4db3b63d21cba3607ddd5d02993 /git-merge-ours.sh | |
| parent | 7bc70a590db6ed3069d52aa38d59938e7955901b (diff) | |
| download | git-0111ea38cbb9db0e4e245dcd5c86198186bab197.zip git-0111ea38cbb9db0e4e245dcd5c86198186bab197.tar.gz git-0111ea38cbb9db0e4e245dcd5c86198186bab197.tar.bz2 | |
cache-tree: replace a sscanf() by two strtol() calls
On one of my systems, sscanf() first calls strlen() on the buffer. But
this buffer is not terminated by NUL. So git crashed.
strtol() does not share that problem, as it stops reading after the
first non-digit.
[jc: original patch was wrong and did not read the cache-tree
structure correctly; this has been fixed up and tested minimally
with fsck-objects. ]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions