From a85fefcc920f837ce3a8e0010cfd09cf0b3523ce Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 13 Nov 2006 03:23:32 +0000 Subject: [PATCH] sync with Plan 9 --- kern/devmnt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kern/devmnt.c b/kern/devmnt.c index 6924dc8..9121bfd 100644 --- a/kern/devmnt.c +++ b/kern/devmnt.c @@ -196,7 +196,8 @@ mntversion(Chan *c, char *version, int msize, int returnlen) error("server tries to increase msize in fversion"); if(f.msize<256 || f.msize>1024*1024) error("nonsense value of msize in fversion"); - if(strncmp(f.version, v, strlen(f.version)) != 0) + k = strlen(f.version); + if(strncmp(f.version, v, k) != 0) error("bad 9P version returned from server"); /* now build Mnt associated with this connection */ @@ -220,7 +221,6 @@ mntversion(Chan *c, char *version, int msize, int returnlen) m->msize = f.msize; unlock(&mntalloc.lk); - k = strlen(f.version); if(returnlen > 0){ if(returnlen < k) error(Eshort); @@ -242,7 +242,6 @@ mntversion(Chan *c, char *version, int msize, int returnlen) poperror(); /* c */ qunlock(&c->umqlock); - free(msg); return k; }