]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
windows-nat: Remove SO_NAME_MAX_PATH_SIZE limit
authorPedro Alves <pedro@palves.net>
Fri, 22 Mar 2024 19:46:59 +0000 (19:46 +0000)
committerPedro Alves <pedro@palves.net>
Fri, 22 Mar 2024 19:46:59 +0000 (19:46 +0000)
There is no need to limit shared library path sizes to
SO_NAME_MAX_PATH_SIZE nowadays.  windows_solib::name and
windows_solib::original_name are std::strings nowadays, and so are
solib::so_name and solib::so_original_name in the core solib code.

This commit reworks the code to remove that limit.  This also fixes a
leak where we were not releasing 'rname' in the realpath branch if the
'rname' string was larger than SO_NAME_MAX_PATH_SIZE.

Note: I tested the cygwin_conv_path with a manual hack to force that
path, and then stepping through the code.  You only get to that path
if Windows doesn't report an absolute path for ntdll.dll, and on my
machine (running Windows 10), it always does.

Approved-By: John Baldwin <jhb@FreeBSD.org>
Change-Id: I79e9862d5a7646eebfef7ab5b05b96318a7ca0c5

gdb/windows-nat.c

index a01011248c1fb0a18e8106ea567a0d1019bd3cc9..278bfb0e1f1fb6b5619e9ff8edea6d0c07557dec 100644 (file)
@@ -874,22 +874,32 @@ windows_make_so (const char *name, LPVOID load_addr)
     }
   if (buf[0])
     {
-      char cname[SO_NAME_MAX_PATH_SIZE];
-      cygwin_conv_path (CCP_WIN_W_TO_POSIX, buf, cname,
-                       SO_NAME_MAX_PATH_SIZE);
-      so->name = cname;
+      bool ok = false;
+
+      /* Check how big the output buffer has to be.  */
+      ssize_t size = cygwin_conv_path (CCP_WIN_W_TO_POSIX, buf, nullptr, 0);
+      if (size > 0)
+       {
+         /* SIZE includes the null terminator.  */
+         so->name.resize (size - 1);
+         if (cygwin_conv_path (CCP_WIN_W_TO_POSIX, buf, so->name.data (),
+                               size) == 0)
+           ok = true;
+       }
+      if (!ok)
+       so->name = so->original_name;
     }
   else
     {
       char *rname = realpath (name, NULL);
-      if (rname && strlen (rname) < SO_NAME_MAX_PATH_SIZE)
+      if (rname != nullptr)
        {
          so->name = rname;
          free (rname);
        }
       else
        {
-         warning (_("dll path for \"%s\" too long or inaccessible"), name);
+         warning (_("dll path for \"%s\" inaccessible"), name);
          so->name = so->original_name;
        }
     }