GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash with built-in [v]asprintf().

Browse Source 
* src/vasprintf.c (__gpgme_vasprintf): Copy the va_list.
--
Not sure why it needs to be done. Maybe because of dereferencing the
pointer while doing va_copy() int_vasprintf()? If we remove the
_BSD_VA_LIST stuff and pass a regular va_list all is fine.
This commit is contained in:
Ben Kibbey 2014-10-16 19:26:41 -04:00
parent aea2c168fc
commit fff2049c1b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/vasprintf.c
View File

@ -26,8 +26,6 @@ Boston, MA 02111-1307, USA. */
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include "mem.h"
#ifndef va_copy /* According to POSIX, va_copy is a macro. */ #ifndef va_copy /* According to POSIX, va_copy is a macro. */
#if defined (__GNUC__) && defined (__PPC__) \ #if defined (__GNUC__) && defined (__PPC__) \
@ -42,7 +40,14 @@ Boston, MA 02111-1307, USA. */
#ifdef TEST #ifdef TEST
#define _gpgme_malloc malloc
#define _gpgme_calloc calloc
#define _gpgme_realloc realloc
#define _gpgme_strdup strdup
#define _gpgme_free free
int global_total_width; int global_total_width;
#else
#include "mem.h"
#endif #endif
static int int_vasprintf (char **, const char *, va_list *); static int int_vasprintf (char **, const char *, va_list *);
@ -161,7 +166,17 @@ _gpgme_vasprintf (result, format, args)
va_list args; va_list args;
#endif #endif
{ {
return int_vasprintf (result, format, &args); #if defined (_BSD_VA_LIST_) && defined (__FreeBSD__)
_BSD_VA_LIST_ cp;
#else
va_list cp;
#endif
int ret;
va_copy(cp, args);
ret = int_vasprintf (result, format, &cp);
va_end(cp);
return ret;
} }