diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
| commit | 9ed218dc2ce9826e60d345482a5cdaabd25f4163 (patch) | |
| tree | 430cd7b85c1a01c809eb0f61a5ba7d5ef9b5c3a1 /runtime/librsgt.c | |
| parent | 7f846c53d6519476b6118282ba6b3bad625e43a3 (diff) | |
| parent | 40254dcc8cf3d9ab17f30f417a95709cbf9204bf (diff) | |
| download | rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.gz rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.bz2 rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.zip | |
Merge branch 'master' into master-tcp-compress-stream
Diffstat (limited to 'runtime/librsgt.c')
| -rw-r--r-- | runtime/librsgt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/librsgt.c b/runtime/librsgt.c index afafe2f2..ae0b0df6 100644 --- a/runtime/librsgt.c +++ b/runtime/librsgt.c @@ -148,6 +148,7 @@ rsgtfileConstruct(gtctx ctx) goto done; gf->ctx = ctx; gf->hashAlg = ctx->hashAlg; + gf->blockSizeLimit = ctx->blockSizeLimit; gf->bKeepRecordHashes = ctx->bKeepRecordHashes; gf->bKeepTreeHashes = ctx->bKeepTreeHashes; gf->x_prev = NULL; @@ -775,7 +776,7 @@ done: static int timestampIt(gtfile gf, GTDataHash *hash) { - unsigned char *der; + unsigned char *der = NULL; size_t lenDer; int r = GT_OK; int ret = 0; |