From 1edb02101a9306fc711cd422ed507d18165b1691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 15 Jul 2017 11:25:39 +0200
Subject: move from support/1.0.27 to feature/1.0.27

---
 backend/dell1600n_net.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'backend/dell1600n_net.c')

diff --git a/backend/dell1600n_net.c b/backend/dell1600n_net.c
index d19059b..3586215 100644
--- a/backend/dell1600n_net.c
+++ b/backend/dell1600n_net.c
@@ -929,6 +929,7 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 {
 
   unsigned int i, j;
+  size_t lineBufFree;
 
   char itemBuf[16] = { 0 }, lineBuf[256] = { 0 };
 
@@ -943,7 +944,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 
       sprintf (itemBuf, "%02x ", (const unsigned int) buf[i]);
 
-      strncat (lineBuf, itemBuf, sizeof (lineBuf));
+      lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+      strncat (lineBuf, itemBuf, lineBufFree);
 
       if ((i + 1) % 16)
         continue;
@@ -960,7 +962,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
         {
           sprintf (itemBuf, ".");
         }
-    strncat (lineBuf, itemBuf, sizeof (lineBuf));
+      lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+      strncat (lineBuf, itemBuf, lineBufFree);
 
     } /* for j */
 
@@ -974,7 +977,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 
       for (j = (i % 16); j < 16; ++j)
         {
-          strncat (lineBuf, "   ", sizeof (lineBuf));
+          lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+          strncat (lineBuf, "   ", lineBufFree);
         }
       for (j = 1 + i - ((i + 1) % 16); j < i; ++j)
         {
@@ -986,7 +990,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
             {
               strcpy (itemBuf, ".");
             }
-          strncat (lineBuf, itemBuf, sizeof (lineBuf));
+          lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+          strncat (lineBuf, itemBuf, lineBufFree);
         }
       DBG (debugLevel, "%s\n", lineBuf);
     }
@@ -1335,7 +1340,7 @@ ProcessUdpResponse (unsigned char *pData, size_t size,
 {
 
   unsigned short messageSize, nameSize, valueSize;
-  unsigned char *pItem, *pEnd, *pValue;
+  unsigned char *pItem, *pEnd;
   char sockBuf[SOCK_BUF_SIZE], *pName;
   struct ComBuf tcpBuf;
   int nread;
@@ -1376,8 +1381,6 @@ ProcessUdpResponse (unsigned char *pData, size_t size,
       valueSize = (((unsigned short) pItem[0]) << 8) | pItem[1];
       pItem += 2;
 
-      pValue = pItem;
-
       pItem += valueSize;
 
       /* process the item */
-- 
cgit v1.2.3