diff options
| author | Alan Modra <amodra@gmail.com> | 2020-08-03 10:59:38 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-08-03 10:59:38 +0930 |
| commit | ee44c2ac7b3efdfd28c41cd32d7fb935b0582a97 (patch) | |
| tree | ff9262170c720c2e0453664a2ac5a1d481d2b394 | |
| parent | bfd133d0d8432d80ea1cbfc1fc38adee0d502ba3 (diff) | |
| download | binutils-gdb-ee44c2ac7b3efdfd28c41cd32d7fb935b0582a97.tar.gz | |
Use xmalloc rather than malloc
As far as I can tell, the following comment is false nowadays.
/* Calls to m-alloc get turned by sed into xm-alloc. */
Remove it, and call xmalloc.
* ldlex.l (yy_create_string_buffer): Use xmalloc rather than malloc.
* lexsup.c (parse_args): Likewise.
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ldlex.l | 5 | ||||
| -rw-r--r-- | ld/lexsup.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index eeee6d08a6c..0a574db7b03 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2020-08-03 Alan Modra <amodra@gmail.com> + * ldlex.l (yy_create_string_buffer): Use xmalloc rather than malloc. + * lexsup.c (parse_args): Likewise. + +2020-08-03 Alan Modra <amodra@gmail.com> + PR 26328 * configure.ac: AC_CHECK_DECLS asprintf. * configure: Regenerate. diff --git a/ld/ldlex.l b/ld/ldlex.l index 0fcbe84c8b5..4bd523eda65 100644 --- a/ld/ldlex.l +++ b/ld/ldlex.l @@ -515,14 +515,13 @@ yy_create_string_buffer (const char *string, size_t size) { YY_BUFFER_STATE b; - /* Calls to m-alloc get turned by sed into xm-alloc. */ - b = malloc (sizeof (struct yy_buffer_state)); + b = xmalloc (sizeof (struct yy_buffer_state)); b->yy_input_file = 0; b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = malloc ((unsigned) (b->yy_buf_size + 3)); + b->yy_ch_buf = xmalloc ((size_t) b->yy_buf_size + 3); b->yy_ch_buf[0] = '\n'; strcpy (b->yy_ch_buf+1, string); diff --git a/ld/lexsup.c b/ld/lexsup.c index 2c2d0fc8ac0..b9cc8a1e957 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -617,7 +617,7 @@ parse_args (unsigned argc, char **argv) longopts = (struct option *) xmalloc (sizeof (*longopts) * (OPTION_COUNT + 1)); really_longopts = (struct option *) - malloc (sizeof (*really_longopts) * (OPTION_COUNT + 1)); + xmalloc (sizeof (*really_longopts) * (OPTION_COUNT + 1)); /* Starting the short option string with '-' is for programs that expect options and other ARGV-elements in any order and that care about |