mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
7b1c02318e
- Segfault because of passing a 64-bit pointer to 32 bit integer. - Add new include config_readline.h which will calculate some new defines based on what is found in config.h - This file was originally included in readline 4.3 as config.h.in, only the part that makes new defines have been moved to this file. cmd-line-utils/readline/bind.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/callback.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/complete.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/display.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/funmap.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histexpand.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histfile.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/history.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/histsearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/input.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/isearch.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/keymaps.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/kill.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/macro.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/mbutil.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/misc.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/nls.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/parens.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/readline.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/rltty.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/search.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/shell.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/signals.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/terminal.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/text.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/tilde.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/undo.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/util.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/vi_mode.c: Include local config_readline.h instead of config.h cmd-line-utils/readline/xmalloc.c: Include local config_readline.h instead of config.h
86 lines
2.2 KiB
C
86 lines
2.2 KiB
C
/* xmalloc.c -- safe versions of malloc and realloc */
|
|
|
|
/* Copyright (C) 1991 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Readline, a library for reading lines
|
|
of text with interactive input and history editing.
|
|
|
|
Readline is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
Readline is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with Readline; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
|
#define READLINE_LIBRARY
|
|
|
|
#include "config_readline.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#include "xmalloc.h"
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Memory Allocation and Deallocation. */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
static void
|
|
memory_error_and_abort (fname)
|
|
char *fname;
|
|
{
|
|
fprintf (stderr, "%s: out of virtual memory\n", fname);
|
|
exit (2);
|
|
}
|
|
|
|
/* Return a pointer to free()able block of memory large enough
|
|
to hold BYTES number of bytes. If the memory cannot be allocated,
|
|
print an error message and abort. */
|
|
PTR_T
|
|
xmalloc (bytes)
|
|
size_t bytes;
|
|
{
|
|
PTR_T temp;
|
|
|
|
temp = malloc (bytes);
|
|
if (temp == 0)
|
|
memory_error_and_abort ("xmalloc");
|
|
return (temp);
|
|
}
|
|
|
|
PTR_T
|
|
xrealloc (pointer, bytes)
|
|
PTR_T pointer;
|
|
size_t bytes;
|
|
{
|
|
PTR_T temp;
|
|
|
|
temp = pointer ? realloc (pointer, bytes) : malloc (bytes);
|
|
|
|
if (temp == 0)
|
|
memory_error_and_abort ("xrealloc");
|
|
return (temp);
|
|
}
|
|
|
|
/* Use this as the function to call when adding unwind protects so we
|
|
don't need to know what free() returns. */
|
|
void
|
|
xfree (string)
|
|
PTR_T string;
|
|
{
|
|
if (string)
|
|
free (string);
|
|
}
|