shithub: 9pro

Info  •  Files  •  Log  •  Branches

9gc: make sure s is never NULL in ctxregistryR loop

--- a/9gc.c

+++ b/9gc.c

@@ -214,7 +214,7 @@

 static void

 ctxregistryR(C9ctx *ctx, C9r *r)

 {

-	char *s, *b;

+	char *s, *b, *e;

 	C9aux *a;

 	C9tag tag;

 	const char *path[2];

@@ -245,8 +245,8 @@

 				s = (char*)&r->read.data[r->read.size];

 			else

 				*s++ = 0;

-			if (strstr(b, "tlssrv") == NULL && (s = strchr(b, ' ')) != NULL) {

-				*s = 0;

+			if (strstr(b, "tlssrv") == NULL && (e = strchr(b, ' ')) != NULL) {

+				*e = 0;

 fallback:

 				close(a->f);

 				if ((a->f = dial(b)) < 0)