From: Jon Turney <jon.turney@dronecode.org.uk>
To: gdb-patches@sourceware.org
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH] Better handling for realpath() failures in windows_make_so() on Cygwin
Date: Wed, 20 Jan 2016 15:54:00 -0000 [thread overview]
Message-ID: <1453305146-7364-1-git-send-email-jon.turney@dronecode.org.uk> (raw)
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
next reply other threads:[~2016-01-20 15:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 15:54 Jon Turney [this message]
2016-01-20 16:19 ` Pedro Alves
2016-03-09 17:49 ` Jon Turney
2016-03-09 18:09 ` Pedro Alves
2024-03-21 6:53 Orgad Shaneh
2024-03-21 7:22 ` Orgad Shaneh
2024-03-21 15:04 ` Tom Tromey
2024-03-21 14:45 ` Jon Turney
2024-03-21 16:13 ` Pedro Alves
2024-03-21 16:31 ` Orgad Shaneh
2024-03-22 19:07 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453305146-7364-1-git-send-email-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox