X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib.c;h=b57070be6707ace6d717bea72a54a10caf137710;hp=c5adcc3b10e61ecd098129c225b5f3be126b700a;hb=cdd5dd2b406b2af4359f7b1e7360d0c9aba13777;hpb=8b7093aff990803877b20e86826f0693817cbcaf diff --git a/lib.c b/lib.c index c5adcc3..b57070b 100644 --- a/lib.c +++ b/lib.c @@ -154,7 +154,7 @@ int safe_symlink (const char *oldpath, const char *newpath) char abs_oldpath[_POSIX_PATH_MAX]; if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) || - (mutt_strlen (abs_oldpath) + 1 + mutt_strlen (oldpath) + 1 > + (safe_strlen (abs_oldpath) + 1 + safe_strlen (oldpath) + 1 > sizeof abs_oldpath)) return -1; @@ -415,7 +415,7 @@ char *mutt_concat_path (char *d, const char *dir, const char *fname, size_t l) { const char *fmt = "%s/%s"; - if (!*fname || (*dir && dir[mutt_strlen (dir) - 1] == '/')) + if (!*fname || (*dir && dir[safe_strlen (dir) - 1] == '/')) fmt = "%s%s"; snprintf (d, l, fmt, dir, fname);