From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Sun, 27 Nov 2005 03:45:04 +0000 (+0000)
Subject: Fix bugs in ics{wcs,mbs}to{mbs,wcs}.
X-Git-Tag: 0.1~73
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=96cf7d1f9a98dfbb68c8cfd47f3b774da7306b8b

Fix bugs in ics{wcs,mbs}to{mbs,wcs}.


git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@519 959494ce-11ee-0310-bf91-de5d638817bd
---

diff --git a/daemon/utils.c b/daemon/utils.c
index 878fb61..d084db6 100644
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -190,7 +190,7 @@ wchar_t *icsmbstowcs(char *mbs, char *charset, wchar_t *def)
 	free(buf);
     if((buf = icmbstowcs(mbs, charset)) == NULL)
     {
-	if(*def == '~')
+	if((def != NULL) && (*def == L'~'))
 	{
 	    flog(LOG_WARNING, "icsmbstowcs: could not convert wcs string into charset %s: %s", charset, strerror(errno));
 	    def++;
@@ -264,7 +264,7 @@ char *icswcstombs(wchar_t *wcs, char *charset, char *def)
 	free(buf);
     if((buf = icwcstombs(wcs, charset)) == NULL)
     {
-	if(*def == '~')
+	if((def != NULL) && (*def == '~'))
 	{
 	    flog(LOG_WARNING, "icswcstombs: could not convert mbs string from charset %s: %s", charset, strerror(errno));
 	    def++;