diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-07-08 11:28:53 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-07-08 14:12:34 +0300 |
| commit | 4aef6b36f862e46723403bc6422ac47058a5ef19 (patch) | |
| tree | fa7afe6ed8f1abf080fa764bda1bbc81e07f407b /src/gdbmfetch.c | |
| parent | 260102cf7f75db3c87d04a06eb8054853cacce97 (diff) | |
| download | gdbm-4aef6b36f862e46723403bc6422ac47058a5ef19.tar.gz gdbm-4aef6b36f862e46723403bc6422ac47058a5ef19.tar.bz2 | |
Fix error handling in gdbm_fetch, gdbm_firstkey, and gdbm_nextkey.
* src/gdbmfetch.c: Hanlde out of memory error.
* src/findkey.c: Set gdbm_errno to GDBM_ITEM_NOT_FOUND
if nothing was found.
* src/gdbmdelete.c: Don't set gdbm_errno after
_gdbm_findkey returns -1. It's been done already.
* src/gdbmexp.c (gdbm_export_to_file): Return -1 if
gdbm_fetch fails.
* src/gdbmseq.c (get_next_key): Set gdbm_errno to
GDBM_ITEM_NOT_FOUND if there's no next key.
Don't call _gdbm_fatal on out of memory condition.
(gdbm_nextkey): Set gdbm_errno to
GDBM_ITEM_NOT_FOUND if there's no next key.
* src/gdbmtool.c (fetch_handler)
(firstkey_handler,nextkey_handler): Check gdbm_errno.
* src/gdbmstore.c: Handle error return from _gdbm_findkey.
* tests/gtdump.c: Likewise.
* tests/gtfetch.c: Likewise.
* doc/gdbm.texi: Document changes.
* doc/gdbm.3: Likewise.
* configure.ac: Version 1.12.90
* NEWS: Update.
* .gitignore: Update.
Diffstat (limited to 'src/gdbmfetch.c')
| -rw-r--r-- | src/gdbmfetch.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gdbmfetch.c b/src/gdbmfetch.c index 83d4204..f9a2e91 100644 --- a/src/gdbmfetch.c +++ b/src/gdbmfetch.c @@ -1,8 +1,8 @@ /* gdbmfetch.c - Find a key and return the associated data. */ /* This file is part of GDBM, the GNU data base manager. - Copyright (C) 1990, 1991, 1993, 2007, 2011, 2013 Free Software Foundation, - Inc. + Copyright (C) 1990, 1991, 1993, 2007, 2011, + 2013, 2016 Free Software Foundation, Inc. GDBM is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -53,11 +53,13 @@ gdbm_fetch (GDBM_FILE dbf, datum key) return_val.dptr = (char *) malloc (1); else return_val.dptr = (char *) malloc (return_val.dsize); - if (return_val.dptr == NULL) _gdbm_fatal (dbf, _("malloc error")); + if (return_val.dptr == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; + return return_val; + } memcpy (return_val.dptr, find_data, return_val.dsize); } - - /* Check for an error and return. */ - if (return_val.dptr == NULL) gdbm_errno = GDBM_ITEM_NOT_FOUND; + return return_val; } |