[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/barometer.c          |   42 +++++++++++++++++++++---------------------
 src/daemon/common.c      |   37 ++++++++++++++++++++++---------------
 src/daemon/utils_cache.c |    1 -
 src/utils_db_query.c     |   15 +++++++++------
 4 files changed, 52 insertions(+), 43 deletions(-)

New commits:
commit 38dc4293b77a5b26e9727fa5ab154fe8930a5a8c
Merge: 3489284 d6491cf
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 17:29:48 2015 +0200

    Merge branch 'collectd-5.5'

commit d6491cfcf52a74498e1becd7ef94fc8e0a5938b9
Merge: 8bf78cd efda0ff
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 17:29:38 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit efda0ff7c7035dbbe72014369d1ad8c9624e8616
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 17:28:39 2015 +0200

    src/utils_db_query.c: Fix use-after-free.
    
    "r_area->next" was evaluated after "r_area" was freed.

commit 8bf78cdeec00dde7769be38224cad3e835f7c59a
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 17:19:01 2015 +0200

    barometer plugin: Initialize output arrays.

commit dff336960f8b0466ebcdd21abbeddb451d29e1f9
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 16:19:25 2015 +0200

    src/daemon/common.c: Implement strjoin() with memcpy().
    
    The previous implementation used strncat() which has the unfortunate and
    unintuitive behavior of copying n+1 bytes to the buffer.

commit f0fbde90f3316fe2729f1f6f758a25b4b5cb7297
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jun 17 15:20:41 2015 +0200

    src/utils_cache.c: Remove incorrect free.
    
    "ce" is not updated / used in this loop, so it would be theoretically
    possible for "ce" to be freed twice.