commit dceb94069087969461a3b8180eb63c2678270409
author Debargha Mukherjee <debargha@google.com> Wed Dec 02 11:55:26 2020 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Dec 02 21:56:48 2020 +0000
tree c0fba29dbab5dd5bf5cf6f71776fe80d2992e090
parent ae9c8832f66169f2c42781f05e436692f7c1ac45

Avoid some strncat warnings in lanczos resampler

BUG=aomedia:2886

Change-Id: Ie4c3e6cd04f4f1f702763cc011eb7e1c142c43da

tools/lanczos/lanczos_resample_y4m.c

diff --git a/tools/lanczos/lanczos_resample_y4m.c b/tools/lanczos/lanczos_resample_y4m.c
index 1438c3d..1e41597 100644
--- a/tools/lanczos/lanczos_resample_y4m.c
+++ b/tools/lanczos/lanczos_resample_y4m.c
@@ -19,6 +19,9 @@
 
 #include "tools/lanczos/lanczos_resample.h"
 
+#define Y4M_HDR_MAX_LEN 256
+#define Y4M_HDR_MAX_WORDS 16
+
 #define COEFF_PREC_BITS 12
 #define INT_EXTRA_PREC_BITS 2
 
@@ -106,10 +109,9 @@
 }
 
 static void join_words(char *dest, int len, char **words, int nwords) {
-  (void)len;
   for (int i = 0; i < nwords; ++i) {
-    strncat(dest, " ", 1);
-    strncat(dest, words[i], strlen(words[i]));
+    strncat(dest, " ", len - strlen(dest));
+    strncat(dest, words[i], len - strlen(dest));
   }
 }
 
@@ -160,9 +162,9 @@
   char *y4m_input = argv[1];
   char *y4m_output = argv[5];
 
-  char hdr[256];
+  char hdr[Y4M_HDR_MAX_LEN];
   int nhdrwords;
-  char *hdrwords[16];
+  char *hdrwords[Y4M_HDR_MAX_WORDS];
   FILE *fin = fopen(y4m_input, "rb");
   if (!fgets(hdr, sizeof(hdr), fin)) {
     printf("Invalid y4m file %s\n", y4m_input);
@@ -211,8 +213,9 @@
   printf("InputSize: %dx%d -> OutputSize: %dx%d\n", ywidth, yheight, rywidth,
          ryheight);
 
-  char rhdr[256];
-  get_resampled_hdr(rhdr, 256, hdrwords, nhdrwords, rywidth, ryheight);
+  char rhdr[Y4M_HDR_MAX_LEN];
+  get_resampled_hdr(rhdr, Y4M_HDR_MAX_LEN, hdrwords, nhdrwords, rywidth,
+                    ryheight);
   // printf("Resampled header = %s\n", rhdr);
   FILE *fout = fopen(y4m_output, "wb");
   fwrite(rhdr, strlen(rhdr), 1, fout);