summaryrefslogtreecommitdiffabout
path: root/src/gdbmstore.c
authorSergey Poznyakoff <gray@gnu.org.ua>2016-07-08 08:28:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2016-07-08 11:12:34 (GMT)
commit4aef6b36f862e46723403bc6422ac47058a5ef19 (patch) (side-by-side diff)
treefa7afe6ed8f1abf080fa764bda1bbc81e07f407b /src/gdbmstore.c
parent260102cf7f75db3c87d04a06eb8054853cacce97 (diff)
downloadgdbm-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/gdbmstore.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/gdbmstore.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gdbmstore.c b/src/gdbmstore.c
index 8c6064d..3cb7560 100644
--- a/src/gdbmstore.c
+++ b/src/gdbmstore.c
@@ -1,8 +1,8 @@
/* gdbmstore.c - Add a new key/data pair to the database. */
/* 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
@@ -99,7 +99,8 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags)
return 1;
}
}
-
+ else if (gdbm_errno != GDBM_ITEM_NOT_FOUND)
+ return -1;
/* Get the file address for the new space.
(Current bucket's free space is first place to look.) */

Return to:

Send suggestions and report system problems to the System administrator.