From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 31 Mar 2007 11:12:28 +0000 (+0000)
Subject: The info types cannot be checked for explicity by ANDing the types since they
X-Git-Tag: curl-7_16_2~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e535a71c71f77b1ae7eee0de17575febee5ced66;p=thirdparty%2Fcurl.git

The info types cannot be checked for explicity by ANDing the types since they
have not been properly defined to allow this! Instead of changing the defines
and break the ABI/API, I opted to modify the code to check for exact type
matches.
CID 10 coverity.com scan
---

diff --git a/lib/getinfo.c b/lib/getinfo.c
index 56b5d6f9fd..afe549380f 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -78,36 +78,36 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
 #ifdef MSG_PEEK
   char buf;
 #endif
+  CURLINFO type;
 
   if(!data)
     return CURLE_BAD_FUNCTION_ARGUMENT;
 
   va_start(arg, info);
 
-  switch(info&CURLINFO_TYPEMASK) {
-  default:
-    return CURLE_BAD_FUNCTION_ARGUMENT;
-  case CURLINFO_STRING:
+  type = info&CURLINFO_TYPEMASK;
+  if(type == CURLINFO_STRING) {
     param_charp = va_arg(arg, char **);
     if(NULL == param_charp)
       return CURLE_BAD_FUNCTION_ARGUMENT;
-    break;
-  case CURLINFO_LONG:
+  }
+  else if(type == CURLINFO_LONG) {
     param_longp = va_arg(arg, long *);
     if(NULL == param_longp)
       return CURLE_BAD_FUNCTION_ARGUMENT;
-    break;
-  case CURLINFO_DOUBLE:
+  }
+  else if(type == CURLINFO_DOUBLE) {
     param_doublep = va_arg(arg, double *);
     if(NULL == param_doublep)
       return CURLE_BAD_FUNCTION_ARGUMENT;
-    break;
-  case CURLINFO_SLIST:
+  }
+  else if(type == CURLINFO_SLIST) {
     param_slistp = va_arg(arg, struct curl_slist **);
     if(NULL == param_slistp)
       return CURLE_BAD_FUNCTION_ARGUMENT;
-    break;
   }
+  else
+    return CURLE_BAD_FUNCTION_ARGUMENT;
 
   switch(info) {
   case CURLINFO_EFFECTIVE_URL: