← Back to branch summary

~ubuntu-branches/debian/sid/rsyslog/sid

« back to all changes in this revision

Viewing changes to plugins/omhiredis/omhiredis.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Daniel Pocock
  • Date: 2014-03-11 19:52:49 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20140311195249-phbsh9be8lebawti
Tags: 7.4.8-1
http://bugs.debian.org/740869
http://bugs.debian.org/721277
[ Michael Biebl ]
* New upstream release.
* Update Build-Depends:
  - Bump libestr-dev to (>= 0.1.9).
  - Tighten liblognorm-dev to (<< 1.0.0).
  - Replace libjson0-dev with libjson-c-dev, we no longer need the
    transitional package.
* Bump Standards-Version to 3.9.5. No further changes.

[ Daniel Pocock ]
* Make template parameter not mandatory in mongodb output plugin. Patch
  cherry-picked from upstream Git. (Closes: #740869, #721277)
* Ensure JSON templates are NUL terminated. Patch cherry-picked from
  upstream Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/omhiredis/omhiredis.c
97
97
CODESTARTfreeInstance
98
98
        closeHiredis(pData);
99
99
        free(pData->server);
100
 
        free(pData->tplName);
101
100
ENDfreeInstance
102
101
 
103
102
 
196
195
    for ( i = 0; i < pData->count; i++ ) {
197
196
        redisGetReply ( pData->conn, (void *)&pData->replies[i] );
198
197
        /*  TODO: add error checking here! */
199
 
        free ( pData->replies[i] );
 
198
        freeReplyObject ( pData->replies[i] );
200
199
    }
201
200
    free ( pData->replies );
202
201
    pData->count = 0;