diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-01 18:32:18 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-01 18:32:18 +0200 |
commit | 8a819d6a0623c0854462dd2dc632700f9a5c576c (patch) | |
tree | 0552c35a1863eb7b8741b8e4896ba84a6f6f8028 /plugins/omoracle | |
parent | 70b8624c86e7d204d7c1ff91d030ee7c69569eb7 (diff) | |
download | rsyslog-8a819d6a0623c0854462dd2dc632700f9a5c576c.tar.gz rsyslog-8a819d6a0623c0854462dd2dc632700f9a5c576c.tar.xz rsyslog-8a819d6a0623c0854462dd2dc632700f9a5c576c.zip |
some small changes (as suggestion)
Diffstat (limited to 'plugins/omoracle')
-rw-r--r-- | plugins/omoracle/omoracle.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/plugins/omoracle/omoracle.c b/plugins/omoracle/omoracle.c index 6ec023e2..ea910d3a 100644 --- a/plugins/omoracle/omoracle.c +++ b/plugins/omoracle/omoracle.c @@ -253,11 +253,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1); CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_RQD_TPL_OPT_SQL, " StdFmt")); CHKiRet(createInstance(&pData)); - pData->connection = strdup(db_name); - if (pData->connection == NULL) { - iRet = RS_RET_OUT_OF_MEMORY; - goto finalize_it; - } + CHKmalloc(pData->connection = strdup(db_name)); CHKiRet(startSession(pData, db_name, db_user, db_password)); dbgprintf ("omoracle module got all its resources allocated " @@ -304,11 +300,13 @@ resetConfigVariables(uchar __attribute__((unused)) *pp, { int n; DEFiRet; - free(db_user); - free(db_name); + if(db_user != NULL) + free(db_user); + if(db_name != NULL) + free(db_name); if (db_password != NULL) { n = strlen(db_password); - memset(db_password, n, sizeof *db_password); + memset(db_password, 0, n); free(db_password); } db_name = db_user = db_password = NULL; |