This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Better handling for realpath() failures in windows_make_so() on Cygwin
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: gdb-patches at sourceware dot org
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Wed, 20 Jan 2016 15:52:26 +0000
- Subject: [PATCH] Better handling for realpath() failures in windows_make_so() on Cygwin
- Authentication-results: sourceware.org; auth=none
Fix a memory leak which would occur in the case when the result of realpath() is
greater than or equal to SO_NAME_MAX_PATH_SIZE.
Distinguish between realpath() failing (returning NULL), and returning a path
greather than or equal to SO_NAME_MAX_PATH_SIZE.
Warn rather than stopping with an error in both those cases.
Original patch from Tim Chick. Memory leak fix by Corinna Vinschen.
See also https://cygwin.com/ml/cygwin/2015-11/msg00353.html
gdb/ChangeLog:
2016-01-20 Jon Turney <jon.turney@dronecode.org.uk>
* windows-nat.c (windows_make_so): Fix memory leak when realpath
returns a path >= SO_NAME_MAX_PATH_SIZE. Distinguish that case
from realpath failing. Warn rather than stopping with an error in
both cases.
---
gdb/ChangeLog | 7 +++++++
gdb/windows-nat.c | 15 ++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 71d6670..703b407 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -642,13 +642,22 @@ windows_make_so (const char *name, LPVOID load_addr)
else
{
char *rname = realpath (name, NULL);
- if (rname && strlen (rname) < SO_NAME_MAX_PATH_SIZE)
+ if (rname)
{
- strcpy (so->so_name, rname);
+ if (strlen (rname) < SO_NAME_MAX_PATH_SIZE)
+ strcpy (so->so_name, rname);
+ else
+ {
+ warning (_("dll path \"%s\" too long"), rname);
+ strcpy (so->so_name, so->so_original_name);
+ }
free (rname);
}
else
- error (_("dll path too long"));
+ {
+ warning (_("dll path for \"%s\" can not be evaluated"), name);
+ strcpy (so->so_name, so->so_original_name);
+ }
}
/* Record cygwin1.dll .text start/end. */
p = strchr (so->so_name, '\0') - (sizeof ("/cygwin1.dll") - 1);
--
2.7.0