out.c: fix SEGFAULT for fl == NULL (flight info)

TLeconte · Apr 27, 2023 · 62f3c39 · 62f3c39
1 parent d3270f7
commit 62f3c39
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/out.c b/out.c
@@ -546,15 +546,16 @@ void out(msgblk_t * blk, unsigned char *hdata, int l)
 
 		vout( "%s from ", rep ? "Response" : "Command");
 		outaddr(faddr);
-		vout( "(%s) to ", fl->gnd ? "on ground" : "airborne");
+		vout( "(%s) to ", (fl && fl->gnd) ? "on ground" : "airborne");
 		outaddr(taddr);
 		vout( "\n");
 
 		outlinkctrl(hdata[9], rep);
 	}
 
-	if((jsonout || netOutJsonAddr) && !routeout)
-		buildjsonobj(faddr,taddr,fromair,rep,fl->gnd,blk);
+	if((jsonout || netOutJsonAddr) && !routeout) {
+		buildjsonobj(faddr,taddr,fromair,rep,(fl && fl->gnd),blk);
+    }
 
 	dec=0;