X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Fwildfire.c;h=1958f5920202085358cf509045f8071452f067f4;hb=f3674ba9dab07598fff196f7944d7ae5bd71933a;hp=623c3b7c23a25d40b1b75293b081b8e1eed108e7;hpb=56d69e5d8434e98835a2582c59b771ba69475431;p=citadel.git

diff --git a/libcitadel/lib/wildfire.c b/libcitadel/lib/wildfire.c
index 623c3b7c2..1958f5920 100644
--- a/libcitadel/lib/wildfire.c
+++ b/libcitadel/lib/wildfire.c
@@ -157,9 +157,13 @@ static int addr2lineBacktrace(StrBuf *Function,
 	pche = strchr(pch, ':');
 	FlushStrBuf(FileName);
 	StrBufAppendBufPlain(FileName, pch, pche - pch, 0);
-	pche++;
-	*FunctionLine = atoi(pche);
-
+	if (pche != NULL)
+	{
+		pche++;
+		*FunctionLine = atoi(pche);
+	}
+	else 
+		*FunctionLine = 0;
 	return 1;
 }
 
@@ -369,6 +373,8 @@ void WildFireSerializePayload(StrBuf *JsonBuffer, StrBuf *OutBuf, int *MsgCount,
 	const char *Cat;
 	StrBuf *Header;
 
+	if (OutBuf == NULL)
+		Header = NewStrBuf();
 	if (*MsgCount == 0) {
 		if (OutBuf != NULL) {
 			StrBufAppendBufPlain(OutBuf, 
@@ -388,7 +394,6 @@ void WildFireSerializePayload(StrBuf *JsonBuffer, StrBuf *OutBuf, int *MsgCount,
 						     "http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1\r\n"), 0);
 		}
 		else {
-			Header = NewStrBuf();
 			AddHdr("X-Wf-Protocol-1", 
 			       "http://meta.wildfirehq.org/Protocol/JsonStream/0.2");
 			AddHdr("X-Wf-1-Plugin-1",