Fix a small bug in follow_link().

* util.cxx (follow_link): Correctly terminate strings after calling
  readlink().

diff --git a/util.cxx b/util.cxx
index 43be61ca0385349920c2f37c7aa8d1187a553f5c..2e3f4aee2af56f1a3fc8fb0ab74641a85f6947be 100644 (file)
--- a/util.cxx
+++ b/util.cxx
@@ -460,7 +460,8 @@ follow_link(const string& name, const string& sysroot)
   if (linkname)
     {
       r = readlink(f, linkname, st.st_size + 1);
-      linkname[st.st_size] = '\0';
+      if (r != -1)
+       linkname[r] = '\0';
       /*
        * If we have non-empty sysroot and we got link that
        * points to absolute path name, we need to look at
@@ -487,7 +488,8 @@ follow_link(const string& name, const string& sysroot)
              if (linkname)
                {
                  r = readlink(f1, linkname, st.st_size + 1);
-                 linkname[st.st_size] = '\0';
+                 if (r != -1)
+                   linkname[r] = '\0';
                }
            }
          else