Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a16e3772 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] s5p-jpeg: don't return a random width/height 



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: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 06eeefe8

drivers/media/platform/s5p-jpeg/jpeg-core.c

+4 −4
Original line number Diff line number Diff line
@@ -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;