buf_out is not valid until posix_net_init()

So don't check it in startup. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>

buf_out is not valid until posix_net_init()
So don't check it in startup. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
6d48414d · Eliot Blennerhassett · Alessandro Rubini · 6ad34b16 · 6d48414d · 6d48414d
Commit 6d48414d authored Mar 06, 2012 by Eliot Blennerhassett Committed by Alessandro Rubini Mar 07, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

posix-socket.c arch-gnu-linux/posix-socket.c +3 -0

posix-startup.c arch-gnu-linux/posix-startup.c +1 -2

No files found.
--- a/arch-gnu-linux/posix-socket.c
+++ b/arch-gnu-linux/posix-socket.c
@@ -364,6 +364,9 @@ int posix_net_init(struct pp_instance *ppi)
 	int i;

 	ppi->buf_out = calloc(1, PP_PACKET_SIZE + NP(ppi)->proto_ofst);
+	if (!ppi->buf_out)
+		return -1;
+
 	ppi->buf_out = PROTO_PAYLOAD(ppi->buf_out);

 	if (OPTS(ppi)->ethernet_mode) {

--- a/arch-gnu-linux/posix-startup.c
+++ b/arch-gnu-linux/posix-startup.c
@@ -47,8 +47,7 @@ int main(int argc, char **argv)

 	if ((!ppi->defaultDS) || (!ppi->currentDS) || (!ppi->parentDS)
 	    || (!ppi->portDS) || (!ppi->timePropertiesDS) || (!ppi->sent_seq_id)
-	    || (!ppi->net_path) || (!ppi->buf_out)
-	    || (!ppi->frgn_master) || (!ppi->arch_data)
+	    || (!ppi->net_path) || (!ppi->frgn_master) || (!ppi->arch_data)
 	   )
 		exit(__LINE__);