[GNUnet-SVN] r12357 - libmicrohttpd/src/testcurl

[gnunet]

Author: grothoff
Date: 2010-07-27 14:55:20 +0200 (Tue, 27 Jul 2010)
New Revision: 12357

Modified:
   libmicrohttpd/src/testcurl/curl_version_check.c
Log:
cleaning

Modified: libmicrohttpd/src/testcurl/curl_version_check.c
===================================================================
--- libmicrohttpd/src/testcurl/curl_version_check.c     2010-07-27 09:22:25 UTC 
(rev 12356)
+++ libmicrohttpd/src/testcurl/curl_version_check.c     2010-07-27 12:55:20 UTC 
(rev 12357)
@@ -56,7 +56,7 @@
   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_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 @@
    */
 #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;