X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Funixsock.c;h=1a4373abb4ee92bc38b0cb23982f36d93b61f490;hb=fcb70978d61d92c8e8b74d9a41205bd4aef718d0;hp=da992c94b51601024bc03e2988ca9ff8d7a1e9d8;hpb=012b412eb5165f331dc378e9b6d00517b8003e0b;p=sysdb.git

diff --git a/src/utils/unixsock.c b/src/utils/unixsock.c
index da992c9..1a4373a 100644
--- a/src/utils/unixsock.c
+++ b/src/utils/unixsock.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/error.h"
 #include "utils/unixsock.h"
 
@@ -113,7 +117,7 @@ sdb_unixsock_parse_cell(char *string, int type, sdb_data_t *data)
 		case SDB_TYPE_BINARY:
 			/* we don't support any binary information containing 0-bytes */
 			data->data.binary.length = strlen(string);
-			data->data.binary.datum = (const unsigned char *)string;
+			data->data.binary.datum = (unsigned char *)string;
 			break;
 		default:
 			sdb_log(SDB_LOG_ERR, "unixsock: Unexpected type %i while "
@@ -320,7 +324,7 @@ sdb_unixsock_client_recv(sdb_unixsock_client_t *client,
 	buffer[buflen - 1] = '\0';
 
 	buflen = strlen(buffer);
-	while ((buffer[buflen - 1] == '\n') || (buffer[buflen - 1] == '\r')) {
+	while (buflen && ((buffer[buflen - 1] == '\n') || (buffer[buflen - 1] == '\r'))) {
 		buffer[buflen - 1] = '\0';
 		--buflen;
 	}