X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fntpd.c;h=9b4ba60c947af5b87b36dd97480790dac7028dad;hb=d4a0fddd3a63ad75fb3e762a954fc9db57582f00;hp=48d7aa7209b29b6675fba8fbc26f8697095475b3;hpb=603d00c9b3956ccd8486d6e60c747e4dff1290f6;p=collectd.git

diff --git a/src/ntpd.c b/src/ntpd.c
index 48d7aa72..9b4ba60c 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -669,7 +669,7 @@ static int ntpd_send_request(int req_code, int req_items, int req_size,
         (void *)req_data);
 
   status = swrite(sd, (const char *)&req, REQ_LEN_NOMAC);
-  if (status < 0) {
+  if (status != 0) {
     DEBUG("`swrite' failed. Closing socket #%i", sd);
     close(sd);
     sock_descr = sd = -1;
@@ -832,11 +832,13 @@ static int ntpd_read(void) {
   if (status != 0) {
     ERROR("ntpd plugin: ntpd_do_query (REQ_GET_KERNEL) failed with status %i",
           status);
+    free(ik);
     return status;
   } else if ((ik == NULL) || (ik_num == 0) || (ik_size == 0)) {
     ERROR("ntpd plugin: ntpd_do_query returned unexpected data. "
           "(ik = %p; ik_num = %i; ik_size = %i)",
           (void *)ik, ik_num, ik_size);
+    free(ik);
     return -1;
   }