updates

diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c
index 450694b0171282a0d7434112e7f88f494ae41368..21d779e653576e750437739955bda79cdc2c55d1 100644 (file)
--- a/lib/silcutil/silcutil.c
+++ b/lib/silcutil/silcutil.c
@@ -164,13 +164,13 @@ uint64 silc_file_size(const char *filename)
   int ret;
   struct stat stats;
 
-#ifndef SILC_WIN32\r
+#ifndef SILC_WIN32
   ret = lstat(filename, &stats);
-#else\r
-  ret = stat(filename, &stats);\r
-#endif\r
-  if (ret < 0)\r
-    return 0;\r
+#else
+  ret = stat(filename, &stats);
+#endif
+  if (ret < 0)
+    return 0;
 
   return (uint64)stats.st_size;
 }
@@ -628,13 +628,16 @@ char *silc_id_render(void *id, uint16 type)
 int silc_string_compare(char *string1, char *string2)
 {
   int i;
-  int slen1 = strlen(string1);
-  int slen2 = strlen(string2);
+  int slen1;
+  int slen2;
   char *tmpstr1, *tmpstr2;
 
   if (!string1 || !string2)
     return FALSE;
 
+  slen1 = strlen(string1);
+  slen2 = strlen(string2);
+
   /* See if they are same already */
   if (!strncmp(string1, string2, strlen(string2)))
     return TRUE;

diff --git a/lib/silcutil/unix/silcunixutil.c b/lib/silcutil/unix/silcunixutil.c
index 3dddce37eb49bb17088b03f24b6819204d6d924b..cab2086ad838fa197b81a71bd86275c966c8171b 100644 (file)
--- a/lib/silcutil/unix/silcunixutil.c
+++ b/lib/silcutil/unix/silcunixutil.c
@@ -116,6 +116,9 @@ int silc_string_match(const char *string1, const char *string2)
   char *s1;
   int ret = FALSE;
 
+  if (!string1 || !string2)
+    return ret;
+
   s1 = silc_string_regexify(string1);
   ret = silc_string_regex_match(s1, string2);
   silc_free(s1);