diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
| commit | 6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (patch) | |
| tree | 9366ff2dea102dc28d90ffad1cf8dff3039650e0 /cmd-line-utils/readline/bind.c | |
| parent | 8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff) | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| download | mariadb-git-6aad537a6aa1381b73e87e53a5a17eda4ef1d452.tar.gz | |
Merge MySQL 5.1.39 into MariaDB 5.1.
Diffstat (limited to 'cmd-line-utils/readline/bind.c')
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index ea737749535..cea1d0d81f6 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -339,9 +339,7 @@ rl_generic_bind (type, keyseq, data, map) char *keys; int keys_len; register int i; - KEYMAP_ENTRY k; - - k.function = 0; + KEYMAP_ENTRY k= { 0, NULL }; /* If no keys to bind to, exit right away. */ if (keyseq == 0 || *keyseq == 0) @@ -776,7 +774,7 @@ _rl_read_file (filename, sizep) file_size = (size_t)finfo.st_size; /* check for overflow on very large files */ -if ((sizeof(off_t) > sizeof(size_t) && finfo.st_size > (off_t)(size_t)~0) || + if ((sizeof(off_t) > sizeof(size_t) && finfo.st_size > (off_t)(size_t)~0) || file_size + 1 < file_size) { if (file >= 0) |