diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/db_gdbm.c | 28 |
2 files changed, 21 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index bc4e6a0b2..c23e86f4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-03 Peter Stephenson <p.stephenson@samsung.com> + + * 34455: Src/Modules/db_gdbm.c: some further parameter bug fixes + including memory leak and unsetting old parameter too late. + 2015-02-02 Barton E. Schaefer <schaefer@zsh.org> * 34447: Src/Modules/db_gdbm.c: fix assignment of key-value array diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c index 2e2bd3a1e..76d4751bf 100644 --- a/Src/Modules/db_gdbm.c +++ b/Src/Modules/db_gdbm.c @@ -85,14 +85,7 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func)) } resource_name = OPT_ARG(ops, 'f'); - - dbf = gdbm_open(resource_name, 0, read_write, 0666, 0); - if(!dbf) { - zwarnnam(nam, "error opening database file %s", resource_name); - return 1; - } - - pmname = ztrdup(*args); + pmname = *args; if ((tied_param = (Param)paramtab->getnode(paramtab, pmname)) && !(tied_param->node.flags & PM_UNSET)) { @@ -100,13 +93,24 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func)) * Unset any existing parameter. Note there's no implicit * "local" here, but if the existing parameter is local * that will be reflected in the new one. + * + * We need to do this before attempting to open the DB + * in case this variable is already tied to a DB. + * + * This can fail if the variable is readonly or restricted. + * We could call unsetparam() and check errflag instead + * of the return status. */ - if (unsetparam_pm(tied_param, 0, 1)) { - zsfree(pmname); - gdbm_close(dbf); + if (unsetparam_pm(tied_param, 0, 1)) return 1; - } } + + dbf = gdbm_open(resource_name, 0, read_write, 0666, 0); + if(!dbf) { + zwarnnam(nam, "error opening database file %s", resource_name); + return 1; + } + if (!(tied_param = createspecialhash(pmname, &getgdbmnode, &scangdbmkeys, pmflags))) { zwarnnam(nam, "cannot create the requested parameter %s", pmname); |