Re: use libiberty xmalloc in bfd/doc/chew.c

["H.J. Lu" <hjl.tools@gmail.com>]

On Mon, May 30, 2022 at 2:36 AM Alan Modra via Binutils
<binutils@sourceware.org> wrote:
>
> Catch out-of-memory.
>
>         * doc/chew.c: Include libibery.h.
>         (init_string_with_size, nextword): Replace malloc with xmalloc.
>         (newentry, add_to_definition): Likewise.
>         (catchar, catbuf): Replace realloc with xrealloc.
>         (add_intrinsic): Replace strdup with xstrdup.
>         * doc/local.mk (LIBIBERTY): Define.
>         (chew): Link against libiberty.
>         * Makefile.in: Regenerate.
>
> diff --git a/bfd/Makefile.in b/bfd/Makefile.in
> index 741e08d603c..53cac75af0e 100644
> --- a/bfd/Makefile.in
> +++ b/bfd/Makefile.in
> @@ -1301,6 +1301,7 @@ doc_bfd_TEXINFOS = $(DOCFILES) doc/bfdsumm.texi
>  AM_MAKEINFOFLAGS = --no-split -I "$(srcdir)/doc" -I doc
>  TEXI2DVI = texi2dvi -I "$(srcdir)/doc" -I doc
>  MKDOC = doc/chew$(EXEEXT_FOR_BUILD)
> +LIBIBERTY = ../libiberty/libiberty.a

This breaks --enable-pgo-build since ../libiberty/libiberty.a is a host library
compiled with -fprofile-generate, but chew is a build program.  If we want
to use libiberty.a in a build program, we need to build a libiberty.a for build.

>  # We can't replace these rules with an implicit rule, because
>  # makes without VPATH support couldn't find the .h files in `..'.
> @@ -2487,7 +2488,7 @@ doc/chew.stamp: $(srcdir)/doc/chew.c doc/$(am__dirstamp)
>         $(AM_V_CCLD)$(CC_FOR_BUILD) -o doc/chw$$$$$(EXEEXT_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
>           $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
>           -I. -I$(srcdir) -Idoc -I$(srcdir)/../include -I$(srcdir)/../intl -I../intl \
> -         $(srcdir)/doc/chew.c && \
> +         $(srcdir)/doc/chew.c $(LIBIBERTY) && \
>         $(SHELL) $(srcdir)/../move-if-change \
>           doc/chw$$$$$(EXEEXT_FOR_BUILD) $(MKDOC) && \
>         touch $@
> diff --git a/bfd/doc/chew.c b/bfd/doc/chew.c
> index 22921e68431..9722a89f0e6 100644
> --- a/bfd/doc/chew.c
> +++ b/bfd/doc/chew.c
> @@ -82,6 +82,7 @@
>     Foo.  */
>
>  #include "ansidecl.h"
> +#include "libiberty.h"
>  #include <assert.h>
>  #include <stdio.h>
>  #include <ctype.h>
> @@ -141,7 +142,7 @@ init_string_with_size (string_type *buffer, unsigned int size)
>  {
>    buffer->write_idx = 0;
>    buffer->size = size;
> -  buffer->ptr = (char *) malloc (size);
> +  buffer->ptr = xmalloc (size);
>  }
>
>  static void
> @@ -201,7 +202,7 @@ catchar (string_type *buffer, int ch)
>    if (buffer->write_idx == buffer->size)
>      {
>        buffer->size *= 2;
> -      buffer->ptr = (char *) realloc (buffer->ptr, buffer->size);
> +      buffer->ptr = xrealloc (buffer->ptr, buffer->size);
>      }
>
>    buffer->ptr[buffer->write_idx++] = ch;
> @@ -223,7 +224,7 @@ catbuf (string_type *buffer, char *buf, unsigned int len)
>      {
>        while (buffer->write_idx + len >= buffer->size)
>         buffer->size *= 2;
> -      buffer->ptr = (char *) realloc (buffer->ptr, buffer->size);
> +      buffer->ptr = xrealloc (buffer->ptr, buffer->size);
>      }
>    memcpy (buffer->ptr + buffer->write_idx, buf, len);
>    buffer->write_idx += len;
> @@ -1102,7 +1103,7 @@ nextword (char *string, char **word)
>         }
>      }
>
> -  *word = (char *) malloc (length + 1);
> +  *word = xmalloc (length + 1);
>
>    dst = *word;
>    src = word_start;
> @@ -1216,11 +1217,11 @@ perform (void)
>  dict_type *
>  newentry (char *word)
>  {
> -  dict_type *new_d = (dict_type *) malloc (sizeof (dict_type));
> +  dict_type *new_d = xmalloc (sizeof (*new_d));
>    new_d->word = word;
>    new_d->next = root;
>    root = new_d;
> -  new_d->code = (stinst_type *) malloc (sizeof (stinst_type));
> +  new_d->code = xmalloc (sizeof (*new_d->code));
>    new_d->code_length = 1;
>    new_d->code_end = 0;
>    return new_d;
> @@ -1232,9 +1233,8 @@ add_to_definition (dict_type *entry, stinst_type word)
>    if (entry->code_end == entry->code_length)
>      {
>        entry->code_length += 2;
> -      entry->code =
> -       (stinst_type *) realloc ((char *) (entry->code),
> -                                entry->code_length * sizeof (stinst_type));
> +      entry->code = xrealloc (entry->code,
> +                             entry->code_length * sizeof (*entry->code));
>      }
>    entry->code[entry->code_end] = word;
>
> @@ -1244,7 +1244,7 @@ add_to_definition (dict_type *entry, stinst_type word)
>  void
>  add_intrinsic (char *name, void (*func) (void))
>  {
> -  dict_type *new_d = newentry (strdup (name));
> +  dict_type *new_d = newentry (xstrdup (name));
>    add_to_definition (new_d, func);
>    add_to_definition (new_d, 0);
>  }
> diff --git a/bfd/doc/local.mk b/bfd/doc/local.mk
> index 931942f874c..8c6932802f6 100644
> --- a/bfd/doc/local.mk
> +++ b/bfd/doc/local.mk
> @@ -82,12 +82,14 @@ TEXI2DVI = texi2dvi -I "$(srcdir)/%D%" -I %D%
>
>  MKDOC = %D%/chew$(EXEEXT_FOR_BUILD)
>
> +LIBIBERTY = ../libiberty/libiberty.a
> +
>  $(MKDOC): %D%/chew.stamp ; @true
>  %D%/chew.stamp: $(srcdir)/%D%/chew.c %D%/$(am__dirstamp)
>         $(AM_V_CCLD)$(CC_FOR_BUILD) -o %D%/chw$$$$$(EXEEXT_FOR_BUILD) $(CFLAGS_FOR_BUILD) \
>           $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
>           -I. -I$(srcdir) -I%D% -I$(srcdir)/../include -I$(srcdir)/../intl -I../intl \
> -         $(srcdir)/%D%/chew.c && \
> +         $(srcdir)/%D%/chew.c $(LIBIBERTY) && \
>         $(SHELL) $(srcdir)/../move-if-change \
>           %D%/chw$$$$$(EXEEXT_FOR_BUILD) $(MKDOC) && \
>         touch $@
>
> --
> Alan Modra
> Australia Development Lab, IBM



-- 
H.J.