0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001
  2. From: Werner Koch <wk@gnupg.org>
  3. Date: Sun, 18 Mar 2018 17:39:43 +0100
  4. Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list.
  5. * src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of
  6. NULL.
  7. --
  8. Fix
  9. Suggested-by: Jakub Wilk <jwilk@jwilk.net>
  10. Signed-off-by: Werner Koch <wk@gnupg.org>
  11. ---
  12. src/logging.c | 18 ++++++++++++++----
  13. 1 file changed, 14 insertions(+), 4 deletions(-)
  14. diff --git a/src/logging.c b/src/logging.c
  15. index 1a4f620..d01f974 100644
  16. --- a/src/logging.c
  17. +++ b/src/logging.c
  18. @@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void)
  19. /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print
  20. - * just the raw dump, with FMT being an empty string, print a trailing
  21. - * linefeed, otherwise print an entire debug line with the expanded
  22. - * FMT followed by a possible wrapped hexdump and a final LF. */
  23. + * just the raw dump (in this case ARG_PTR is not used), with FMT
  24. + * being an empty string, print a trailing linefeed, otherwise print
  25. + * an entire debug line with the expanded FMT followed by a possible
  26. + * wrapped hexdump and a final LF. */
  27. void
  28. _gpgrt_logv_printhex (const void *buffer, size_t length,
  29. const char *fmt, va_list arg_ptr)
  30. @@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
  31. va_end (arg_ptr);
  32. }
  33. else
  34. - _gpgrt_logv_printhex (buffer, length, NULL, NULL);
  35. + {
  36. + /* va_list is not necessary a pointer and thus we can't use NULL
  37. + * because that would conflict with platforms using a straight
  38. + * struct for it (e.g. arm64). We use a dummy variable instead;
  39. + * the static is a simple way zero it out so to not get
  40. + * complains about uninitialized use. */
  41. + static va_list dummy_argptr;
  42. +
  43. + _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr);
  44. + }
  45. }
  46. --
  47. 2.16.2