CDRIVER-1044: passing an object that undergoes default argument promo…

…tion to 'va_start' has undefined behavior
moulo1982 · Nov 16, 2016 · d7df5df · d7df5df
1 parent 2212081
commit d7df5df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/yajl/yajl.c b/src/yajl/yajl.c
@@ -79,7 +79,7 @@ yajl_alloc(const yajl_callbacks * callbacks,
 }
 
 int
-yajl_config(yajl_handle h, yajl_option opt, ...)
+yajl_config(yajl_handle h, int opt, ...)
 {
     int rv = 1;
     va_list ap;

diff --git a/src/yajl/yajl_gen.c b/src/yajl/yajl_gen.c
@@ -48,7 +48,7 @@ struct yajl_gen_t
 };
 
 int
-yajl_gen_config(yajl_gen g, yajl_gen_option opt, ...)
+yajl_gen_config(yajl_gen g, int opt, ...)
 {
     int rv = 1;
     va_list ap;

diff --git a/src/yajl/yajl_gen.h b/src/yajl/yajl_gen.h
@@ -105,7 +105,7 @@ extern "C" {
      *  allocation (via yajl_alloc)
      *  \returns zero in case of errors, non-zero otherwise
      */
-    YAJL_API int yajl_gen_config(yajl_gen g, yajl_gen_option opt, ...);
+    YAJL_API int yajl_gen_config(yajl_gen g, int opt, ...);
 
     /** allocate a generator handle
      *  \param allocFuncs an optional pointer to a structure which allows

diff --git a/src/yajl/yajl_parse.h b/src/yajl/yajl_parse.h
@@ -165,7 +165,7 @@ extern "C" {
      *  allocation (via yajl_alloc)
      *  \returns zero in case of errors, non-zero otherwise
      */
-    YAJL_API int yajl_config(yajl_handle h, yajl_option opt, ...);
+    YAJL_API int yajl_config(yajl_handle h, int opt, ...);
 
     /** free a parser handle */
     YAJL_API void yajl_free(yajl_handle handle);