aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2008-02-07 08:39:54 +0000
committerAlan Modra <amodra@gmail.com>2008-02-07 08:39:54 +0000
commitee832e1842a5b8022d6dbda856f986d8004a9713 (patch)
treedeaa3de99a1afd12a55b5415a906366855a5b7fa /binutils
parent516cb3d01efb6f72ffa445ada40003e4e9e8e23a (diff)
downloadgdb-ee832e1842a5b8022d6dbda856f986d8004a9713.zip
gdb-ee832e1842a5b8022d6dbda856f986d8004a9713.tar.gz
gdb-ee832e1842a5b8022d6dbda856f986d8004a9713.tar.bz2
* objdump.c (main): Don't pass unadorned NULL to concat.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/objdump.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2e84347..07e6e41 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-07 Alan Modra <amodra@bigpond.net.au>
+
+ * objdump.c (main): Don't pass unadorned NULL to concat.
+
2008-02-04 H.J. Lu <hongjiu.lu@intel.com>
PR 5715
diff --git a/binutils/objdump.c b/binutils/objdump.c
index e5ee5d2..8336133 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1,6 +1,6 @@
/* objdump.c -- dump information about an object file.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -3083,7 +3083,7 @@ main (int argc, char **argv)
if (disassembler_options)
/* Ignore potential memory leak for now. */
disassembler_options = concat (disassembler_options, ",",
- optarg, NULL);
+ optarg, (const char *) NULL);
else
disassembler_options = optarg;
break;