[Support] Treat truncation of fullpath as error
authorJonas Hahnfeld <hahnjo@hahnjo.de>
Wed, 13 Mar 2019 10:37:56 +0000 (10:37 +0000)
committerJonas Hahnfeld <hahnjo@hahnjo.de>
Wed, 13 Mar 2019 10:37:56 +0000 (10:37 +0000)
If the concatenation of arguments dir and bin has at least PATH_MAX
characters the call to snprintf will truncate. The result will usually
not exist, but if it does it's actually incorrect to return that the
path exists.
(Motivated by GCC compiler warning about format truncation.)

Differential Revision: https://reviews.llvm.org/D58835

llvm-svn: 356036

llvm/lib/Support/Unix/Path.inc

index 5eba86d..57385ba 100644 (file)
@@ -107,7 +107,11 @@ test_dir(char ret[PATH_MAX], const char *dir, const char *bin)
   struct stat sb;
   char fullpath[PATH_MAX];
 
-  snprintf(fullpath, PATH_MAX, "%s/%s", dir, bin);
+  int chars = snprintf(fullpath, PATH_MAX, "%s/%s", dir, bin);
+  // We cannot write PATH_MAX characters because the string will be terminated
+  // with a null character. Fail if truncation happened.
+  if (chars >= PATH_MAX)
+    return 1;
   if (!realpath(fullpath, ret))
     return 1;
   if (stat(fullpath, &sb) != 0)