CDRIVER-1953 Escape double quotes in MONGOC_USER_SET_LDFLAGS/CC/CFLAGS

Author: bjori

src/mongoc/mongoc-handshake-compiler-private.h

@@ -17,10 +17,7 @@
 #define MONGOC_HANDSHAKE_COMPILER_PRIVATE_H
 
 #include "mongoc-config.h"
-
-/* Helper macros for stringifying things */
-#define MONGOC_STR(s) #s
-#define MONGOC_EVALUATE_STR(s) MONGOC_STR(s)
+#include "mongoc-util-private.h"
 
 /*
  * Thanks to:
@@ -55,7 +52,7 @@
 /* Portable C Compiler. Version may not be available */
    #define MONGOC_COMPILER "PCC"
 #else
-   #define MONGOC_COMPILER MONGOC_CC
+   #define MONGOC_COMPILER MONGOC_EVALUATE_STR (MONGOC_CC)
 /* Not defining COMPILER_VERSION. We'll fall back to values set at
  * configure-time */
 #endif

src/mongoc/mongoc-handshake.c

@@ -300,12 +300,14 @@ _set_platform_string (mongoc_handshake_t *handshake)
    bson_string_append_printf (str, " %s", MONGOC_COMPILER_VERSION);
 #endif
 
-   if (strlen (MONGOC_USER_SET_CFLAGS) > 0) {
-      bson_string_append_printf (str, " CFLAGS=%s", MONGOC_USER_SET_CFLAGS);
+   if (strlen (MONGOC_EVALUATE_STR (MONGOC_USER_SET_CFLAGS)) > 0) {
+      bson_string_append_printf (
+         str, " CFLAGS=%s", MONGOC_EVALUATE_STR (MONGOC_USER_SET_CFLAGS));
    }
 
-   if (strlen (MONGOC_USER_SET_LDFLAGS) > 0) {
-      bson_string_append_printf (str, " LDFLAGS=%s", MONGOC_USER_SET_LDFLAGS);
+   if (strlen (MONGOC_EVALUATE_STR (MONGOC_USER_SET_LDFLAGS)) > 0) {
+      bson_string_append_printf (
+         str, " LDFLAGS=%s", MONGOC_EVALUATE_STR (MONGOC_USER_SET_LDFLAGS));
    }
 
    handshake->platform = bson_string_free (str, false);

src/mongoc/mongoc-util-private.h

@@ -49,6 +49,10 @@
 # define MONGOC_RAND_R rand_r
 #endif
 
+/* Helper macros for stringifying things */
+#define MONGOC_STR(s) #s
+#define MONGOC_EVALUATE_STR(s) MONGOC_STR (s)
+
 BSON_BEGIN_DECLS