From e42047df2fef64310087296f2d1c29c041010320 Mon Sep 17 00:00:00 2001
From: Steinar Midtskogen <stemidts@cisco.com>
Date: Wed, 17 Jan 2018 09:59:02 +0100
Subject: [PATCH] Fix misc warnings

---
 dec/getbits.h    | 2 +-
 enc/strings.c    | 2 +-
 enc/write_bits.c | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dec/getbits.h b/dec/getbits.h
index 1377b11..a460025 100644
--- a/dec/getbits.h
+++ b/dec/getbits.h
@@ -37,7 +37,7 @@ typedef struct
   unsigned int inbfr;
   int incnt;
   int bitcnt;
-  int length;
+  uint32_t length;
 } stream_t;
 
 int initbits_dec(FILE *infile, stream_t *str);
diff --git a/enc/strings.c b/enc/strings.c
index 830e72e..6ae377f 100644
--- a/enc/strings.c
+++ b/enc/strings.c
@@ -85,7 +85,7 @@ static char **read_config_file(FILE *f, int *num_of_params)
     /* There is no double quote -> read next string */
     if (ret2 == 0)
     {
-      ret = fscanf(f, " %s", a);
+      ret = fscanf(f, " %1999s", a);
 
       if (ret < 1 || ret == EOF)
         break;
diff --git a/enc/write_bits.c b/enc/write_bits.c
index 38fcc02..9a535d2 100644
--- a/enc/write_bits.c
+++ b/enc/write_bits.c
@@ -156,10 +156,12 @@ void write_coeff(stream_t *stream,int16_t *coeff,int size,int type)
   int intra_flag = (type>>1)&1;
   int vlc_adaptive = intra_flag && !chroma_flag;
   unsigned int eob_pos = chroma_flag ? 0 : 2;
-  static int *zigzag[] = { 0, 0, zigzag16, zigzag64, zigzag256 };
+  static int *zigzag[] = { zigzag16, zigzag16, zigzag16, zigzag64, zigzag256 };
   int *zigzagptr = zigzag[log2i(qsize)];
   int runs = 0;
 
+  assert(size > 1);
+
   /* Zigzag scan */
   for (i = 0; i < qsize; i++)
     for (j = 0; j < qsize; j++)