]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] s5p-jpeg: don't return a random width/height
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 18 May 2017 13:40:00 +0000 (10:40 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 19 May 2017 10:10:50 +0000 (07:10 -0300)
Gcc 7.1 complains about:

drivers/media/platform/s5p-jpeg/jpeg-core.c: In function 's5p_jpeg_parse_hdr.isra.9':
drivers/media/platform/s5p-jpeg/jpeg-core.c:1207:12: warning: 'width' may be used uninitialized in this function [-Wmaybe-uninitialized]
  result->w = width;
  ~~~~~~~~~~^~~~~~~
drivers/media/platform/s5p-jpeg/jpeg-core.c:1208:12: warning: 'height' may be used uninitialized in this function [-Wmaybe-uninitialized]
  result->h = height;
  ~~~~~~~~~~^~~~~~~~

Indeed the code would allow it to return a random value (although
it shouldn't happen, in practice). So, explicitly set both to zero,
just in case.

Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/s5p-jpeg/jpeg-core.c

index 52dc7941db652347ed00269a067bf2c37dd517b1..1da2c94e1dca1623cbe6ab2944a85a1bbcf7b4c8 100644 (file)
@@ -1099,10 +1099,10 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
                               struct s5p_jpeg_ctx *ctx)
 {
        int c, components = 0, notfound, n_dht = 0, n_dqt = 0;
-       unsigned int height, width, word, subsampling = 0, sos = 0, sof = 0,
-                    sof_len = 0;
-       unsigned int dht[S5P_JPEG_MAX_MARKER], dht_len[S5P_JPEG_MAX_MARKER],
-                    dqt[S5P_JPEG_MAX_MARKER], dqt_len[S5P_JPEG_MAX_MARKER];
+       unsigned int height = 0, width = 0, word, subsampling = 0;
+       unsigned int sos = 0, sof = 0, sof_len = 0;
+       unsigned int dht[S5P_JPEG_MAX_MARKER], dht_len[S5P_JPEG_MAX_MARKER];
+       unsigned int dqt[S5P_JPEG_MAX_MARKER], dqt_len[S5P_JPEG_MAX_MARKER];
        long length;
        struct s5p_jpeg_buffer jpeg_buffer;