Fix null deref on server conn create failure

chaos · Jun 14, 2011 · 6c6521b · 6c6521b
1 parent a489bc2
commit 6c6521b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libdiod/diod_sock.c b/libdiod/diod_sock.c
@@ -195,7 +195,7 @@ diod_sock_startfd (Npsrv *srv, int fd, char *client_id)
     conn = np_conn_create (srv, trans, client_id);
     if (!conn) {
         errn (np_rerror (), "error creating connection for %s", client_id);
-        np_trans_destroy (trans);
+	/* trans is destroyed in np_conn_create on failure */
         return;
     }
 }

diff --git a/libnpfs/conn.c b/libnpfs/conn.c
@@ -50,7 +50,7 @@ np_conn_create(Npsrv *srv, Nptrans *trans, char *client_id)
 	int err;
 
 	if (!(conn = malloc(sizeof(*conn)))) {
-		errno = ENOMEM;
+		np_uerror(ENOMEM);
 		return NULL;
 	}
 	pthread_mutex_init(&conn->lock, NULL);
@@ -63,7 +63,7 @@ np_conn_create(Npsrv *srv, Nptrans *trans, char *client_id)
 	conn->shutdown = 0;
 	if (!(conn->fidpool = np_fidpool_create())) {
 		free (conn);
-		errno = ENOMEM;
+		np_uerror(ENOMEM);
 		return NULL;
 	}
 	snprintf(conn->client_id, sizeof(conn->client_id), "%s", client_id);
@@ -76,7 +76,7 @@ np_conn_create(Npsrv *srv, Nptrans *trans, char *client_id)
 	err = pthread_create(&conn->rthread, NULL, np_conn_read_proc, conn);
 	if (err != 0) {
 		np_conn_destroy (conn);
-		errno = err;
+		np_uerror (err);
 		return NULL;
 	}