libmicrohttpd

commit 837986c67be1a79a1cf810ef70ac1f1db6df7713
parent 036178a5475a74412d6e343a9c29a6e1b1fe47c1
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 27 Jul 2010 12:55:20 +0000

cleaning

Diffstat:
M
src/testcurl/curl_version_check.c
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/testcurl/curl_version_check.c b/src/testcurl/curl_version_check.c
@@ -56,7 +56,7 @@ parse_version_string (const char *s, int *major, int *minor, int *micro)
   if (!s)
     return NULL;
   *major = parse_version_number (&s);
-  if (!s || *s != '.')
+  if (*s != '.')
     return NULL;
   s++;
   *minor = parse_version_number (&s);
@@ -96,8 +96,9 @@ curl_check_version (const char *req_version)
   curl_ver = strchr (ver, '/') + 1;
 
   /* Parse version numbers */
-  parse_version_string (req_version, &rq_major, &rq_minor, &rq_micro);
-  parse_version_string (curl_ver, &loc_major, &loc_minor, &loc_micro);
+  if ( (NULL == parse_version_string (req_version, &rq_major, &rq_minor, &rq_micro)) ||
+       (NULL == parse_version_string (curl_ver, &loc_major, &loc_minor, &loc_micro)) )
+    return -1;
 
   /* Compare version numbers.  */
   if ((loc_major > rq_major
@@ -119,7 +120,8 @@ curl_check_version (const char *req_version)
    */
 #if HTTPS_SUPPORT
   ssl_ver = strchr (curl_ver, ' ') + 1;
-
+  if (ssl_ver == NULL)
+    return -1;
   if (strncmp ("GnuTLS", ssl_ver, strlen ("GNUtls")) == 0)
     {
       ssl_ver = strchr (ssl_ver, '/') + 1;