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

Florian Forster octo at verplant.org
Wed May 16 15:52:21 CEST 2018


 Makefile.am                                |    3 +-
 src/ipmi.c                                 |   11 +-
 src/libcollectdclient/collectd/stdendian.h |  262 ++++++++++++++++++++++++++++
 src/libcollectdclient/network_parse.c      |    2 +-
 src/netlink.c                              |   16 +-
 src/stdendian.h                            |  262 ----------------------------
 src/table.c                                |   16 +-
 src/utils_cmd_listval.c                    |    6 -
 src/utils_cmd_listval.h                    |    3 -
 src/utils_cmds.c                           |    4 +-
 src/utils_cmds.h                           |   18 +-
 src/virt.c                                 |    2 +-
 12 files changed, 303 insertions(+), 302 deletions(-)

New commits:
commit 06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4
Merge: 9ae06bc 0d9f395
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed May 16 15:19:05 2018 +0200

    Merge branch 'collectd-5.8'
    
    Conflicts:
    	src/ipmi.c

commit 9ae06bc2026e041e937828379daa232d3c0afbf7
Merge: aadf9ba 6d0548b
Author: collectd bot <32910397+collectd-bot at users.noreply.github.com>
Date:   Wed May 16 15:13:12 2018 +0200

    Auto-Merge pull request #2779 from rpv-tomsk/tmpfix
    
    Automatically merged due to "Automerge" label

commit 6d0548b0bb10958408ff018b52b52cda26b67d44
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Wed May 16 19:44:16 2018 +0700

    cleanup: code formatting

commit aaa294ed9419515d6f84d20e891bc7cb0a49d4da
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Wed May 16 19:40:08 2018 +0700

    Remove empty `cmd_listval_t` data structure and related no-op code.
    
    Closes: #2739

commit 0d9f395599348e735e6f461e1c328293bef0d060
Merge: d545623 a73e5d6
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Wed May 16 19:25:13 2018 +0700

    Merge pull request #2742 from elfiesmelfie/ipmi_bugfix_sensor_option
    
    ipmi plugin: Fix for segmentation fault for wrong data type in Sensor section.

commit aadf9ba1040ee6ac3347bd7627d311f6e01a0af0
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed May 16 13:24:55 2018 +0200

    Fix make distcheck on Mac OS
    
      CC       src/libcollectdclient/libcollectdclient_la-network_parse.lo
    ../../src/libcollectdclient/network_parse.c:49:10: fatal error: 'stdendian.h' file not found
             ^~~~~~~~~~~~~
    1 error generated.
    
    Fixes #2608

commit a73e5d6532bed1216e86af5c15b0acd9fb555026
Author: Mariusz Szafranski <mariuszx.szafranski at intel.com>
Date:   Thu Mar 29 09:45:46 2018 +0100

    ipmi plugin: Fix for segmentation fault for wrong data type in Sensor section.
    
    Incorrect, malicious data in the Sensor section can cause a segmentation fault.
    Error message is generated instead of crash after applying this patch.
    
    Change-Id: Ibc387b5594f9453f1fc957ed37ceb09cfa34ded5
    Signed-off-by: Mariusz Szafranski <mariuszx.szafranski at intel.com>

commit 4cf5858f09f55f06b891c67b7bb5ddcb5de4608f
Merge: c2f3995 a976589
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed May 16 11:45:20 2018 +0200

    Merge pull request #2777 from rubenk/fix-truncation-warnings
    
    Fix truncation warnings

commit a97658980166d9b19b6dda048a7969e163daf58b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 22:03:00 2018 +0200

    table plugin: fix truncation warnings
    
      CC       src/table.lo
    src/table.c: In function ‘tbl_read_table’:
    src/table.c:396:66: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
           snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
                                                                      ^
    src/table.c:396:7: note: ‘snprintf’ output 2 or more bytes (assuming 129) into a destination of size 128
           snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                    res->instance_prefix, instances_str);
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

commit 1edb3b9f2c98067d26a0ec47246650a09a026b23
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 21:20:24 2018 +0200

    virt plugin: fix truncation warning
    
    src/virt.c: In function ‘refresh_lists’:
    src/virt.c:2123:61: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 5 [-Wformat-truncation=]
       snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                                 ^~
    src/virt.c:2123:50: note: directive argument in the range [1, 2147483647]
       snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                      ^~~~~~~~~~~~~~
    src/virt.c:2123:3: note: ‘snprintf’ output between 12 and 21 bytes into a destination of size 15
       snprintf(number_string, sizeof(number_string), "interface-%u", number);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

commit a3dd3831138a4167ceb8782a63ef123832e8bfba
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 21:05:27 2018 +0200

    netlink plugin: fix truncation warnings
    
      CC       src/netlink_la-netlink.lo
    src/netlink.c: In function ‘qos_filter_cb’:
    src/netlink.c:544:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
           snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                              ^~            ~~~~~~~
    src/netlink.c:544:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
           snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    src/netlink.c:577:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
           snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                              ^~            ~~~~~~~
    src/netlink.c:577:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
           snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      CCLD     netlink.la




More information about the collectd-changes mailing list