0001-logger.c-initialize-rport.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. From b3431c4fcaf65e66fda80ef89b79ff3da1912b4f Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sat, 25 Dec 2021 20:05:29 +0100
  4. Subject: [PATCH] logger.c: initialize rport
  5. Fix the following build failure raised since version 1.6.11 and
  6. https://github.com/memcached/memcached/commit/617d7cd64d04698b76fee74882627690017e20ad:
  7. logger.c: In function '_logger_parse_cce':
  8. logger.c:297:13: error: 'rport' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  9. 297 | total = snprintf(scratch, LOGGER_PARSE_SCRATCH,
  10. | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  11. 298 | "ts=%d.%d gid=%llu type=conn_close rip=%s rport=%hu transport=%s reason=%s cfd=%d\n",
  12. | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  13. 299 | (int) e->tv.tv_sec, (int) e->tv.tv_usec, (unsigned long long) e->gid,
  14. | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  15. 300 | rip, rport, transport_map[le->transport],
  16. | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  17. 301 | reason_map[le->reason], le->sfd);
  18. | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  19. Fixes:
  20. - http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2
  21. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  22. Upstream: https://github.com/memcached/memcached/pull/1077
  23. ---
  24. logger.c | 4 ++--
  25. 1 file changed, 2 insertions(+), 2 deletions(-)
  26. diff --git a/logger.c b/logger.c
  27. index 667f3c7..394adae 100644
  28. --- a/logger.c
  29. +++ b/logger.c
  30. @@ -269,7 +269,7 @@ static int _logger_parse_extw(logentry *e, char *scratch) {
  31. static int _logger_parse_cne(logentry *e, char *scratch) {
  32. int total;
  33. - unsigned short rport;
  34. + unsigned short rport = 0;
  35. char rip[64];
  36. struct logentry_conn_event *le = (struct logentry_conn_event *) e->data;
  37. const char * const transport_map[] = { "local", "tcp", "udp" };
  38. @@ -286,7 +286,7 @@ static int _logger_parse_cne(logentry *e, char *scratch) {
  39. static int _logger_parse_cce(logentry *e, char *scratch) {
  40. int total;
  41. - unsigned short rport;
  42. + unsigned short rport = 0;
  43. char rip[64];
  44. struct logentry_conn_event *le = (struct logentry_conn_event *) e->data;
  45. const char * const transport_map[] = { "local", "tcp", "udp" };
  46. --
  47. 2.33.0