diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:50:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:50:19 +0100 |
| commit | 2c172dcf820ade9665ecec2359de4fcdfd3f080f (patch) | |
| tree | 9dc0695f789914b2434984ed6b198940693b3e34 /runtime/conf.c | |
| parent | b029d4751ac77f7ee4c7035c522e6c85601035c1 (diff) | |
| parent | cbb9684731c1d56dbe3622141f397f3afbb0f6dc (diff) | |
| download | rsyslog-2c172dcf820ade9665ecec2359de4fcdfd3f080f.tar.gz rsyslog-2c172dcf820ade9665ecec2359de4fcdfd3f080f.tar.bz2 rsyslog-2c172dcf820ade9665ecec2359de4fcdfd3f080f.zip | |
Merge branch 'v4-stable' into v5-stable
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 d731c786..4bd18bf5 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> @@ -445,6 +445,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; |