public inbox for elfutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] libdwfl: Fix memory leak in dwfl_module_getsrc_file on invalid DWARF.
@ 2016-04-14 20:03 Mark Wielaard
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Wielaard @ 2016-04-14 20:03 UTC (permalink / raw)
  To: elfutils-devel

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

If we allocated the match results array ourselves, then free it when
we detect invalid DWARF and return an error.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---
 libdwfl/ChangeLog                 | 5 +++++
 libdwfl/dwfl_module_getsrc_file.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 60ed700..bdfc92f 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,10 @@
 2016-04-14  Mark Wielaard  <mjw@redhat.com>
 
+	* dwfl_module_getsrc_file.c (dwfl_module_getsrc_file): Free match
+	on invalid DWARF if we allocated it.
+
+2016-04-14  Mark Wielaard  <mjw@redhat.com>
+
 	* linux-proc-maps.c (proc_maps_report): Free last_file on bad file
 	mapping.
 
diff --git a/libdwfl/dwfl_module_getsrc_file.c b/libdwfl/dwfl_module_getsrc_file.c
index 21a5915..4eaaeaf 100644
--- a/libdwfl/dwfl_module_getsrc_file.c
+++ b/libdwfl/dwfl_module_getsrc_file.c
@@ -87,6 +87,8 @@ dwfl_module_getsrc_file (Dwfl_Module *mod,
 
 	  if (unlikely (line->file >= line->files->nfiles))
 	    {
+	      if (*nsrcs == 0)
+		free (match);
 	      __libdwfl_seterrno (DWFL_E (LIBDW, DWARF_E_INVALID_DWARF));
 	      return -1;
 	    }
-- 
2.5.5

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] libdwfl: Fix memory leak in dwfl_module_getsrc_file on invalid DWARF.
@ 2016-04-25 11:46 Mark Wielaard
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Wielaard @ 2016-04-25 11:46 UTC (permalink / raw)
  To: elfutils-devel

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

On Thu, 2016-04-14 at 22:03 +0200, Mark Wielaard wrote:
> If we allocated the match results array ourselves, then free it when
> we detect invalid DWARF and return an error.

Pushed to master.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-04-25 11:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-14 20:03 [PATCH] libdwfl: Fix memory leak in dwfl_module_getsrc_file on invalid DWARF Mark Wielaard
2016-04-25 11:46 Mark Wielaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).