X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Flookups%2Fmysql.c;h=ba8ecba11c77482f0b1881660c6d9fa596f663d4;hb=d7978c0f8af20ff4c3f770589b1bb81568aecff3;hp=0d3d92aa8c76e1ade62597f1188bdc1c55d04ba6;hpb=acec9514b1006e352ef283f205ecec75a9b6ff0d;p=exim.git

diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index 0d3d92aa8..ba8ecba11 100644
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Thanks to Paul Kelly for contributing the original code for these
@@ -19,12 +19,12 @@ and *_BASE_STR (char*). It's a bit of guesswork. Especially for mariadb
 with versions before 10.2, as they do not define there there specific symbols.
 */
 
-// Newer (>= 10.2) MariaDB
+/* Newer (>= 10.2) MariaDB */
 #if defined                   MARIADB_VERSION_ID
 #define EXIM_MxSQL_VERSION_ID MARIADB_VERSION_ID
 
-// MySQL defines MYSQL_VERSION_ID, and MariaDB does so
-// https://dev.mysql.com/doc/refman/5.7/en/c-api-server-client-versions.html
+/* MySQL defines MYSQL_VERSION_ID, and MariaDB does so */
+/* https://dev.mysql.com/doc/refman/5.7/en/c-api-server-client-versions.html */
 #elif defined                 LIBMYSQL_VERSION_ID
 #define EXIM_MxSQL_VERSION_ID LIBMYSQL_VERSION_ID
 #elif defined                 MYSQL_VERSION_ID
@@ -34,18 +34,18 @@ with versions before 10.2, as they do not define there there specific symbols.
 #define EXIM_MYSQL_VERSION_ID  0
 #endif
 
-// Newer (>= 10.2) MariaDB
+/* Newer (>= 10.2) MariaDB */
 #ifdef                         MARIADB_CLIENT_VERSION_STR
 #define EXIM_MxSQL_VERSION_STR MARIADB_CLIENT_VERSION_STR
 
-// Mysql uses MYSQL_SERVER_VERSION
+/* Mysql uses MYSQL_SERVER_VERSION */
 #elif defined                  LIBMYSQL_VERSION
 #define EXIM_MxSQL_VERSION_STR LIBMYSQL_VERSION
 #elif defined                  MYSQL_SERVER_VERSION
 #define EXIM_MxSQL_VERSION_STR MYSQL_SERVER_VERSION
 
 #else
-#define EXIM_MxSQL_VERSION_STR  "N.A."
+#define EXIM_MxSQL_VERSION_STR  "unknown"
 #endif
 
 #if defined                 MARIADB_BASE_VERSION
@@ -152,7 +152,7 @@ database, user, password. We can write to the string, since it is in a
 nextinlist temporary buffer. The copy of the string that is used for caching
 has the password removed. This copy is also used for debugging output. */
 
-for (i = 3; i > 0; i--)
+for (int i = 3; i > 0; i--)
   {
   uschar *pp = Ustrrchr(server, '/');
   if (pp == NULL)
@@ -281,7 +281,7 @@ we return the number of rows affected by the command. In this event, we do NOT
 want to cache the result; also the whole cache for the handle must be cleaned
 up. Setting do_cache zero requests this. */
 
-if ((mysql_result = mysql_use_result(mysql_handle)) == NULL)
+if (!(mysql_result = mysql_use_result(mysql_handle)))
   {
   if ( mysql_field_count(mysql_handle) == 0 )
     {
@@ -314,34 +314,32 @@ while ((mysql_row_data = mysql_fetch_row(mysql_result)))
   if (result)
     result = string_catn(result, US"\n", 1);
 
-  if (num_fields == 1)
-    {
-    if (mysql_row_data[0] != NULL)    /* NULL value yields nothing */
-      {
-      result = string_catn(result, US mysql_row_data[0],
-        lengths[0]);
-      (void) string_from_gstring(result);
-      }
-    }
+  if (num_fields != 1)
+    for (int i = 0; i < num_fields; i++)
+      result = lf_quote(US fields[i].name, US mysql_row_data[i], lengths[i],
+			result);
 
-  else for (i = 0; i < num_fields; i++)
-    result = lf_quote(US fields[i].name, US mysql_row_data[i], lengths[i], result);
+  else if (mysql_row_data[0] != NULL)    /* NULL value yields nothing */
+      result = string_catn(result, US mysql_row_data[0], lengths[0]);
   }
 
 /* more results? -1 = no, >0 = error, 0 = yes (keep looping)
    This is needed because of the CLIENT_MULTI_RESULTS on mysql_real_connect(),
    we don't expect any more results. */
 
-while((i = mysql_next_result(mysql_handle)) >= 0) {
-   if(i == 0) {   /* Just ignore more results */
-     DEBUG(D_lookup) debug_printf("MYSQL: got unexpected more results\n");
-     continue;
-   }
+while((i = mysql_next_result(mysql_handle)) >= 0)
+  {
+  if(i == 0)	/* Just ignore more results */
+    {
+    DEBUG(D_lookup) debug_printf("MYSQL: got unexpected more results\n");
+    continue;
+    }
 
-   *errmsg = string_sprintf("MYSQL: lookup result error when checking for more results: %s\n",
-       mysql_error(mysql_handle));
-   goto MYSQL_EXIT;
-}
+  *errmsg = string_sprintf(
+	"MYSQL: lookup result error when checking for more results: %s\n",
+	mysql_error(mysql_handle));
+  goto MYSQL_EXIT;
+  }
 
 /* If result is NULL then no data has been found and so we return FAIL.
 Otherwise, we must terminate the string which has been built; string_cat()
@@ -352,11 +350,6 @@ if (!result)
   yield = FAIL;
   *errmsg = US"MYSQL: no data found";
   }
-else
-  {
-  (void) string_from_gstring(result);
-  store_reset(result->s + result->ptr + 1);
-  }
 
 /* Get here by goto from various error checks and from the case where no data
 was read (e.g. an update query). */
@@ -372,7 +365,8 @@ if (mysql_result) mysql_free_result(mysql_result);
 
 if (result)
   {
-  *resultptr = result->s;
+  *resultptr = string_from_gstring(result);
+  store_reset(result->s + (result->size = result->ptr + 1));
   return OK;
   }
 else