about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2012-11-17 15:53:48 -0800
committerJames Booth <boothj5@gmail.com>2012-11-17 15:53:48 -0800
commit430c9ad06034551f3b9663682c65c93132eb6420 (patch)
tree493c7ee89a73918cd4bd400b8695c41825474e7e
parent824eaa1678043afd8e31e4de529aaf61165295d7 (diff)
parent55c99c5cc6bf866cb9a3f07332933d233a2091df (diff)
downloadprofani-tty-430c9ad06034551f3b9663682c65c93132eb6420.tar.gz
Merge pull request #85 from pasis/dev
prevent double free of jabber_conn.status
-rw-r--r--src/jabber.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jabber.c b/src/jabber.c
index 86ea3901..4d2fcbbb 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -313,8 +313,10 @@ jabber_update_presence(jabber_presence_t status, const char * const msg)
             break;
     }
 
-    if (jabber_conn.status != NULL)
+    if (jabber_conn.status != NULL) {
         free(jabber_conn.status);
+        jabber_conn.status = NULL;
+    }
     if (msg != NULL)
         jabber_conn.status = strdup(msg);