summaryrefslogtreecommitdiff
path: root/sys/src/cmd/git
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2023-02-18 18:54:13 +0000
committerOri Bernstein <ori@eigenstate.org>2023-02-18 18:54:13 +0000
commitc3ba64f6935322f09b6de5c2285544fd471c605d (patch)
tree21cb968286852075ec25d545d9fb965e7057c35e /sys/src/cmd/git
parentcd5bafe7cbb4736ed53745e288bac44020902f13 (diff)
git: fix nil dereference in corrupt repositories
Diffstat (limited to 'sys/src/cmd/git')
-rw-r--r--sys/src/cmd/git/get.c2
-rw-r--r--sys/src/cmd/git/ref.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/src/cmd/git/get.c b/sys/src/cmd/git/get.c
index 77547c0c0..1c0d33627 100644
--- a/sys/src/cmd/git/get.c
+++ b/sys/src/cmd/git/get.c
@@ -280,7 +280,7 @@ fetchpack(Conn *c)
if(hasheq(&have[i], &Zhash) || oshas(&hadobj, have[i]))
continue;
if((o = readobject(have[i])) == nil)
- sysfatal("missing object we should have: %H", have[i]);
+ sysfatal("missing exected object: %H", have[i]);
if(fmtpkt(c, "have %H", o->hash) == -1)
sysfatal("write: %r");
enqueueparent(&haveq, o);
diff --git a/sys/src/cmd/git/ref.c b/sys/src/cmd/git/ref.c
index bf798e266..5dadbd27a 100644
--- a/sys/src/cmd/git/ref.c
+++ b/sys/src/cmd/git/ref.c
@@ -126,7 +126,7 @@ paint(Hash *head, int nhead, Hash *tail, int ntail, Object ***res, int *nres, in
for(i = 0; i < nhead; i++){
if((o = readobject(head[i])) == nil){
- fprint(2, "warning: %H does not point at commit\n", o->hash);
+ fprint(2, "warning: %H does not point at commit\n", head[i]);
werrstr("read head %H: %r", head[i]);
return -1;
}