From 468b5a09d69a4e852ed23abceb992559104a2a69 Mon Sep 17 00:00:00 2001
From: Victor Kotlyar <Victor.Kotlyar@cern.ch>
Date: Tue, 4 Jun 2019 14:56:37 +0200
Subject: [PATCH] Fix snprintf size parameter for some rmcd messages.
The size mismatch worning was found by gcc gcc version 8.2.1.
---
mediachanger/castorrmc/rmc/rmc_procreq.c | 2 +-
mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c
index 46da40333d..7ecfd2d984 100644
--- a/mediachanger/castorrmc/rmc/rmc_procreq.c
+++ b/mediachanger/castorrmc/rmc/rmc_procreq.c
@@ -110,7 +110,7 @@ int rmc_srv_findcart(const struct rmc_srv_rqst_context *const rqst_context) {
unmarshall_LONG (rbp, type);
unmarshall_LONG (rbp, startaddr);
unmarshall_LONG (rbp, nbelem);
- snprintf (logbuf, CA_MAXVIDLEN+15, "findcart %s %d", template, nbelem);
+ snprintf (logbuf, sizeof(template)+15, "findcart %s %d", template, nbelem);
rmc_logreq (func, logbuf);
if (nbelem < 1) {
diff --git a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
index 7acc000161..f383c97b46 100644
--- a/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
+++ b/mediachanger/castorrmc/rmc/rmc_send_scsi_cmd.c
@@ -277,7 +277,7 @@ int rmc_send_scsi_cmd (
if ((sg_hd->sense_buffer[0] & 0x70) &&
((sg_hd->sense_buffer[2] & 0xE0) == 0 ||
(sg_hd->sense_buffer[2] & 0xF) != 0)) {
- char tmp_msgbuf[132];
+ char tmp_msgbuf[32];
snprintf (tmp_msgbuf, sizeof(tmp_msgbuf), "%s ASC=%X ASCQ=%X",
sk_msg[*(sense+2) & 0xF], *(sense+12), *(sense+13));
tmp_msgbuf[sizeof(tmp_msgbuf) - 1] = '\0';
--
GitLab