035-fix-getservby_r-result-pointer-value-on-error.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 8d7a3f40c8de414122eb8eb2131291782ee8ed15 Mon Sep 17 00:00:00 2001
  2. From: Daniel Sabogal <[email protected]>
  3. Date: Fri, 23 Sep 2016 21:10:07 -0400
  4. Subject: fix getservby*_r result pointer value on error
  5. this is a clone of the fix to the gethostby*_r functions in
  6. commit fe82bb9b921be34370e6b71a1c6f062c20999ae0. the man pages
  7. document that the getservby*_r functions set this pointer to
  8. NULL if there was an error or if no record was found.
  9. ---
  10. src/network/getservbyname_r.c | 2 ++
  11. src/network/getservbyport_r.c | 1 +
  12. 2 files changed, 3 insertions(+)
  13. diff --git a/src/network/getservbyname_r.c b/src/network/getservbyname_r.c
  14. index 056c2f3..ad3d616 100644
  15. --- a/src/network/getservbyname_r.c
  16. +++ b/src/network/getservbyname_r.c
  17. @@ -15,6 +15,8 @@ int getservbyname_r(const char *name, const char *prots,
  18. struct service servs[MAXSERVS];
  19. int cnt, proto, align;
  20. + *res = 0;
  21. +
  22. /* Align buffer */
  23. align = -(uintptr_t)buf & ALIGN-1;
  24. if (buflen < 2*sizeof(char *)+align)
  25. diff --git a/src/network/getservbyport_r.c b/src/network/getservbyport_r.c
  26. index a0a7cae..0ae0e41 100644
  27. --- a/src/network/getservbyport_r.c
  28. +++ b/src/network/getservbyport_r.c
  29. @@ -20,6 +20,7 @@ int getservbyport_r(int port, const char *prots,
  30. if (r) r = getservbyport_r(port, "udp", se, buf, buflen, res);
  31. return r;
  32. }
  33. + *res = 0;
  34. /* Align buffer */
  35. i = (uintptr_t)buf & sizeof(char *)-1;
  36. --
  37. cgit v0.11.2