0001-Fix-163-unterminated-username-used-with-getpwnam.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001
  2. From: Joachim Wiberg <troglobit@gmail.com>
  3. Date: Fri, 2 Sep 2022 16:12:46 +0200
  4. Subject: [PATCH] Fix #163: unterminated username used with getpwnam()
  5. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  6. [Retrieved (and backported) from:
  7. https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b]
  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  9. ---
  10. src/confuse.c | 10 ++++++----
  11. 1 file changed, 6 insertions(+), 4 deletions(-)
  12. diff --git a/src/confuse.c b/src/confuse.c
  13. index 6d1fdbd..05566b5 100644
  14. --- a/src/confuse.c
  15. +++ b/src/confuse.c
  16. @@ -1894,18 +1894,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename)
  17. passwd = getpwuid(geteuid());
  18. file = filename + 1;
  19. } else {
  20. - /* ~user or ~user/path */
  21. - char *user;
  22. + char *user; /* ~user or ~user/path */
  23. + size_t len;
  24. file = strchr(filename, '/');
  25. if (file == 0)
  26. file = filename + strlen(filename);
  27. - user = malloc(file - filename);
  28. + len = file - filename - 1;
  29. + user = malloc(len + 1);
  30. if (!user)
  31. return NULL;
  32. - strncpy(user, filename + 1, file - filename - 1);
  33. + strncpy(user, &filename[1], len);
  34. + user[len] = 0;
  35. passwd = getpwnam(user);
  36. free(user);
  37. }