diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
| commit | 2a813afa41cfda63896002b037742a67678584ad (patch) | |
| tree | 3b27af879f8e87fb5b60204ecdd512cb15803556 /runtime/conf.c | |
| parent | 1ae52ee0e386ee7991d65cd2ac46add2b84f3099 (diff) | |
| parent | 8716e36b12a851cbe6a8a3949dfdcad31aa5fc37 (diff) | |
| download | rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.gz rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.xz rsyslog-2a813afa41cfda63896002b037742a67678584ad.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
plugins/omprog/omprog.c
runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 7afc4f97..6b812573 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -27,7 +27,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define CFGLNSIZ 4096 /* the maximum size of a configuraton file line, after re-combination */ +#define CFGLNSIZ 64*1024 /* the maximum size of a configuraton file line, after re-combination */ #include "config.h" #include <stdlib.h> #include <stdio.h> @@ -448,6 +448,9 @@ processConfFile(uchar *pConfFile) if ((p - cbuf) > CFGLNSIZ - 30) { /* Oops the buffer is full - what now? */ cline = cbuf; + dbgprintf("buffer overflow extending config file\n"); + errmsg.LogError(0, RS_RET_CONFIG_ERROR, + "error: config file line %d too long", iLnNbr); } else { *p = 0; cline = p; |