From bc8491c3dc939411546d0b5ee5fe25551bce424f Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Thu, 29 Jan 2015 21:05:17 +0000
Subject: 34430: parameter fixes for gdbm tied hash.
Probably fix the issue with correct parameter hiding or not hiding.
A little extra safety checking.
Possibly fixed a memory leak with untying.
---
Src/Modules/db_gdbm.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
(limited to 'Src/Modules')
diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c
index d75af980b..a6027deaf 100644
--- a/Src/Modules/db_gdbm.c
+++ b/Src/Modules/db_gdbm.c
@@ -105,7 +105,6 @@ static int
bin_zuntie(char *nam, char **args, Options ops, UNUSED(int func))
{
Param pm;
- GDBM_FILE dbf;
char *pmname;
int ret = 0;
@@ -116,12 +115,18 @@ bin_zuntie(char *nam, char **args, Options ops, UNUSED(int func))
ret = 1;
continue;
}
+ if (pm->gsu.h != &gdbm_hash_gsu) {
+ zwarnnam(nam, "not a tied gdbm hash: %s", pmname);
+ ret = 1;
+ continue;
+ }
- dbf = (GDBM_FILE)(pm->u.hash->tmpdata);
- gdbm_close(dbf);
- /* free(pm->u.hash->tmpdata); */
- pm->u.hash->tmpdata = NULL;
- paramtab->removenode(paramtab, pm->node.nam);
+ queue_signals();
+ if (unsetparam_pm(pm, 0, 1)) {
+ /* assume already reported */
+ ret = 1;
+ }
+ unqueue_signals();
}
return ret;
--
cgit 1.4.1