0010-Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch 1.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 9f1dcb0c0473641730b871dee984016ff19d2c53 Mon Sep 17 00:00:00 2001
  2. From: Maxim Dounin <mdounin@mdounin.ru>
  3. Date: Tue, 25 May 2021 15:17:36 +0300
  4. Subject: [PATCH] Resolver: fixed off-by-one write in ngx_resolver_copy().
  5. Reported by Luis Merino, Markus Vervier, Eric Sesterhenn, X41 D-Sec GmbH.
  6. [peter@korsgaard.com: backport from upstream]
  7. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  8. ---
  9. src/core/ngx_resolver.c | 8 ++++----
  10. 1 file changed, 4 insertions(+), 4 deletions(-)
  11. diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
  12. index 79390701..63b26193 100644
  13. --- a/src/core/ngx_resolver.c
  14. +++ b/src/core/ngx_resolver.c
  15. @@ -4008,15 +4008,15 @@ done:
  16. n = *src++;
  17. } else {
  18. + if (dst != name->data) {
  19. + *dst++ = '.';
  20. + }
  21. +
  22. ngx_strlow(dst, src, n);
  23. dst += n;
  24. src += n;
  25. n = *src++;
  26. -
  27. - if (n != 0) {
  28. - *dst++ = '.';
  29. - }
  30. }
  31. if (n == 0) {
  32. --
  33. 2.20.1