From b2df3b492e91e161d6fcdfee8cd553e0a1433815 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 4 Jan 2017 10:16:18 +0100
Subject: [PATCH] Compilation fixes.

---
 coreapi/Makefile.am       | 2 +-
 coreapi/message_storage.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 775a34005..d6d76099b 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -47,7 +47,7 @@ liblinphone_la_SOURCES=\
 	event.c \
 	friend.c \
 	friendlist.c \
-	im_notify_policy.c \
+	im_notif_policy.c \
 	info.c \
 	ldapprovider.c \
 	linphonecall.c \
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 67f1213be..179524fb3 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -419,7 +419,7 @@ static int linphone_chat_room_get_messages_count(LinphoneChatRoom *cr, bool_t un
 	int numrows=0;
 	char *peer;
 	char *buf;
-	char *option;
+	char *option = NULL;
 	sqlite3_stmt *selectStatement;
 	int returnValue;
 
@@ -447,7 +447,7 @@ static int linphone_chat_room_get_messages_count(LinphoneChatRoom *cr, bool_t un
 	 * because it has been tested above */
 	if(unread_only) {
 		cr->unread_count = numrows;
-		bctbx_free(option);
+		if (option) bctbx_free(option);
 	}
 
 	return numrows;