Merge pull request #1435 from kamailio/cchance/presence

presence: delay freeing generated etag string

src/modules/presence/presentity.c

@@ -1100,10 +1100,6 @@ after_etag_generation:
 				}
 				if (sent_reply) *sent_reply= 1;
 
-				if(etag.s)
-					pkg_free(etag.s);
-				etag.s= NULL;
-
 				goto done;
 			}
 		}
@@ -1232,10 +1228,6 @@ after_etag_generation:
 		}
 		if (sent_reply) *sent_reply= 1;
 
-		if(etag.s)
-			pkg_free(etag.s);
-		etag.s= NULL;
-
 		if(!body)
 			goto done;
 	}
@@ -1266,6 +1258,10 @@ done:
 		pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL);
 	}
 
+	if(etag.s)
+		pkg_free(etag.s);
+	etag.s= NULL;
+
 	if(cur_ruid.s)
 		pkg_free(cur_ruid.s);
 	cur_ruid.s= NULL;