diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:02:17 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 13:02:17 +0100 |
| commit | f2d31917dab4616d47e8c25771f780f272dee07d (patch) | |
| tree | 6fba781d2f01fec1ff96f15a7ae3cf2e2d1f2e9f | |
| parent | 3866bd51bf7e622594ff4831664c28d80f711cb3 (diff) | |
| parent | c1760db6bbd07086177679b2be4b2d307657ddce (diff) | |
| download | rsyslog-f2d31917dab4616d47e8c25771f780f272dee07d.tar.gz rsyslog-f2d31917dab4616d47e8c25771f780f272dee07d.tar.xz rsyslog-f2d31917dab4616d47e8c25771f780f272dee07d.zip | |
Merge branch 'v4-stable' into tmp
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 2 | ||||
| -rw-r--r-- | runtime/stringbuf.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -641,6 +641,11 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-?? - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!) +- bugfix: abort if imfile reads file line of more than 64KiB + Thanks to Peter Eisentraut for reporting and analysing this problem. + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221 +- bugfix: omlibdbi did not use password from rsyslog.con + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 - some improvements thanks to clang's static code analyzer o overall cleanup (mostly unnecessary writes and otherwise unused stuff) o bugfix: fixed a very remote problem in msg.c which could occur when diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c index 6f130f54..67b1edf9 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -287,7 +287,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) if(dbName != NULL) if((pData->dbName = (uchar*) strdup((char*)dbName)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); if(pwd != NULL) - if((pData->pwd = (uchar*) strdup((char*)"")) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); + if((pData->pwd = (uchar*) strdup((char*)pwd)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_RQD_TPL_OPT_SQL, (uchar*) " StdDBFmt")); diff --git a/runtime/stringbuf.c b/runtime/stringbuf.c index ccf115c1..2b6815a4 100644 --- a/runtime/stringbuf.c +++ b/runtime/stringbuf.c @@ -156,7 +156,7 @@ rsRetVal rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded) { uchar *pNewBuf; - unsigned short iNewSize; + size_t iNewSize; DEFiRet; /* first compute the new size needed */ |