[Spice-commits] 2 commits - src/controller src/spice-client-glib-usb-acl-helper.c

[Fabiano Fidêncio]

 src/controller/test.c                  |    2 +-
 src/spice-client-glib-usb-acl-helper.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ab36a2a0283ce4c74b67d73f27ba1ffcc6a6a9e6
Author: Fabiano Fidêncio <fidencio at redhat.com>
Date:   Mon Apr 4 07:30:36 2016 +0200

    coverity: identical code for different branches
    
    Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/spice-client-glib-usb-acl-helper.c b/src/spice-client-glib-usb-acl-helper.c
index c2baeda..03a0317 100644
--- a/src/spice-client-glib-usb-acl-helper.c
+++ b/src/spice-client-glib-usb-acl-helper.c
@@ -139,8 +139,7 @@ update:
     /* update record */
     acl_calc_mask(&acl);
     ret = acl_set_file(filename, ACL_TYPE_ACCESS, acl);
-    if (ret != 0)
-        goto out;
+
 out:
     acl_free(acl);
     return ret;
commit a4cd7693bfcb9d63a5a681833371bf73c8d508f3
Author: Fabiano Fidêncio <fidencio at redhat.com>
Date:   Fri Apr 1 23:48:39 2016 +0200

    coverity: avoid out of bounds access
    
    Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/controller/test.c b/src/controller/test.c
index 9a45581..7c43f1b 100644
--- a/src/controller/test.c
+++ b/src/controller/test.c
@@ -256,7 +256,7 @@ int main (int argc, char *argv[])
     send_data (CONTROLLER_PASSWORD, (uint8_t*)PWD, strlen(PWD) + 1);
     send_data (CONTROLLER_SECURE_CHANNELS, (uint8_t*)SECURE_CHANNELS, strlen(SECURE_CHANNELS) + 1);
     send_data (CONTROLLER_DISABLE_CHANNELS, (uint8_t*)DISABLED_CHANNELS, strlen(DISABLED_CHANNELS) + 1);
-    send_data (CONTROLLER_TLS_CIPHERS, (uint8_t*)TLS_CIPHERS, sizeof(TLS_CIPHERS) + 1);
+    send_data (CONTROLLER_TLS_CIPHERS, (uint8_t*)TLS_CIPHERS, strlen(TLS_CIPHERS) + 1);
     send_data (CONTROLLER_CA_FILE, (uint8_t*)CA_FILE, strlen(CA_FILE) + 1);
     send_data (CONTROLLER_HOST_SUBJECT, (uint8_t*)HOST_SUBJECT, strlen(HOST_SUBJECT) + 1);
     send_data (CONTROLLER_SET_TITLE, (uint8_t*)TITLE, strlen(TITLE) + 1);