From fd31b41d3b4d6420b4edda0aa1ac5781d9cdb0fa Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Mon, 10 Jul 2017 17:13:45 +0100
Subject: [PATCH] Fix FLRig segfault and strlen cast

---
 dummy/flrig.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dummy/flrig.c b/dummy/flrig.c
index d4e9a55f0..e156076d6 100644
--- a/dummy/flrig.c
+++ b/dummy/flrig.c
@@ -250,7 +250,7 @@ static char *xml_build(char *cmd, char *value)
 
     strcat(xml, "</methodCall>\n");
     strcat(xmlpost, "Content-length: ");
-    sprintf(tmp, "%ld\n\n", strlen(xml));
+    sprintf(tmp, "%d\n\n", (int)strlen(xml));
     strcat(xmlpost, tmp);
     strcat(xmlpost, xml);
     rig_debug(RIG_DEBUG_VERBOSE, "XML:\n%s", xmlpost);
@@ -327,8 +327,14 @@ int flrig_init(RIG *rig)
 {
     rig_debug(RIG_DEBUG_TRACE, "%s\n", __FUNCTION__);
 
-    struct flrig_priv_data *priv = NULL;
+    struct flrig_priv_data *priv = (struct flrig_priv_data *)malloc(sizeof(struct flrig_priv_data));
+
+    if (!priv) {
+        return -RIG_ENOMEM;
+    }
+
     memset(priv, 0, sizeof(struct flrig_priv_data));
+
     /*
      * set arbitrary initial status
      */