X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fmalloc.c;h=51b8ff6aecf93e7015b08ed2c13cf9d653d91122;hb=a534996c7f304b219c3c3c41d97f6c20051871f2;hp=0dd4eb0db6e31b4768f70d47cab7024a85f26ee8;hpb=c0eb12ae8965571be6afe8c02e5f9d9cc70d073a;p=catta diff --git a/avahi-common/malloc.c b/avahi-common/malloc.c index 0dd4eb0..51b8ff6 100644 --- a/avahi-common/malloc.c +++ b/avahi-common/malloc.c @@ -31,6 +31,14 @@ #include "malloc.h" +#ifndef va_copy +#ifdef __va_copy +#define va_copy(DEST,SRC) __va_copy((DEST),(SRC)) +#else +#define va_copy(DEST,SRC) memcpy(&(DEST), &(SRC), sizeof(va_list)) +#endif +#endif + static const AvahiAllocator *allocator = NULL; static void oom(void) AVAHI_GCC_NORETURN; @@ -206,8 +214,8 @@ char *avahi_strdup_vprintf(const char *fmt, va_list ap) { va_list ap2; va_copy (ap2, ap); - - n = vsnprintf(buf, len, fmt, ap); + n = vsnprintf(buf, len, fmt, ap2); + va_end (ap2); if (n >= 0 && n < (int) len) return buf;