public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdb: fix "passing NULL to memcpy" UBsan error in dwarf2/cooked-index.c
Date: Tue, 12 Apr 2022 18:42:09 +0000 (GMT)	[thread overview]
Message-ID: <20220412184209.7A8353858D28@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a8b7a1391135b63de73c1bf0e0a2f8f5dc8c6ba6

commit a8b7a1391135b63de73c1bf0e0a2f8f5dc8c6ba6
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Tue Apr 12 14:37:24 2022 -0400

    gdb: fix "passing NULL to memcpy" UBsan error in dwarf2/cooked-index.c
    
    Reading a simple file compiled with :
    
        $ gcc -DONE=1 -gdwarf-4 -g3  test.c
        $ gcc --version
        gcc (Ubuntu 9.4.0-1ubuntu1~20.04) 9.4.0
    
    I get:
    
        Reading symbols from /tmp/cwd/a.out...
        /home/smarchi/src/binutils-gdb/gdb/dwarf2/cooked-index.c:332:11: runtime error: null pointer passed as argument 2, which is declared to never be null
    
    It looks like even if the size is 0 (the size of the `entries` vector is
    0), we shouldn't be passing a NULL pointer to memcpy.  And
    `entries.data ()` returns NULL.
    
    Fix that by using std::vector::insert to insert the items of entries
    into m_entries.  I haven't checked, but it should essentially compile
    down to a memcpy, since the vector elements are trivially copyiable.
    
    Change-Id: I75f1c901e9b522e42e89eb5936e2c70d68eb21e5

Diff:
---
 gdb/dwarf2/cooked-index.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 784c06ea04b..b66ef5a1c64 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -327,10 +327,8 @@ cooked_index_vector::finalize ()
 	m_entries = std::move (entries);
       else
 	{
-	  size_t old_size = m_entries.size ();
-	  m_entries.resize (m_entries.size () + entries.size ());
-	  memcpy (m_entries.data () + old_size,
-		  entries.data (), entries.size () * sizeof (entries[0]));
+	  m_entries.reserve (m_entries.size () + entries.size ());
+	  m_entries.insert (m_entries.end (), entries.begin (), entries.end ());
 	}
     }


                 reply	other threads:[~2022-04-12 18:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220412184209.7A8353858D28@sourceware.org \
    --to=simark@sourceware.org \
    --cc=gdb-cvs@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).