Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1675955 > unrolled thread
| Started by | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| First post | 2017-06-27 18:10 +0200 |
| Last post | 2017-06-29 14:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v3 3/8] [media] s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() Thierry Escande <thierry.escande@collabora.com> - 2017-06-27 18:10 +0200
Re: [PATCH v3 3/8] [media] s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() Andrzej Pietrasiewicz <andrzej.p@samsung.com> - 2017-06-29 14:10 +0200
| From | Thierry Escande <thierry.escande@collabora.com> |
|---|---|
| Date | 2017-06-27 18:10 +0200 |
| Subject | [PATCH v3 3/8] [media] s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() |
| Message-ID | <tX1dW-2UD-57@gated-at.bofh.it> |
This patch modifies the s5p_jpeg_parse_hdr() function so it only
modifies the passed s5p_jpeg_q_data structure if the jpeg header parsing
is successful.
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
---
drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 ++++++++++++++++-------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 0d935f5..df3e5ee 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1206,22 +1206,9 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
break;
}
}
- result->w = width;
- result->h = height;
- result->sos = sos;
- result->dht.n = n_dht;
- while (n_dht--) {
- result->dht.marker[n_dht] = dht[n_dht];
- result->dht.len[n_dht] = dht_len[n_dht];
- }
- result->dqt.n = n_dqt;
- while (n_dqt--) {
- result->dqt.marker[n_dqt] = dqt[n_dqt];
- result->dqt.len[n_dqt] = dqt_len[n_dqt];
- }
- result->sof = sof;
- result->sof_len = sof_len;
- result->size = result->components = components;
+
+ if (notfound || !sos)
+ return false;
switch (subsampling) {
case 0x11:
@@ -1240,7 +1227,24 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
return false;
}
- return !notfound && sos;
+ result->w = width;
+ result->h = height;
+ result->sos = sos;
+ result->dht.n = n_dht;
+ while (n_dht--) {
+ result->dht.marker[n_dht] = dht[n_dht];
+ result->dht.len[n_dht] = dht_len[n_dht];
+ }
+ result->dqt.n = n_dqt;
+ while (n_dqt--) {
+ result->dqt.marker[n_dqt] = dqt[n_dqt];
+ result->dqt.len[n_dqt] = dqt_len[n_dqt];
+ }
+ result->sof = sof;
+ result->sof_len = sof_len;
+ result->size = result->components = components;
+
+ return true;
}
static int s5p_jpeg_querycap(struct file *file, void *priv,
--
2.7.4
[toc] | [next] | [standalone]
| From | Andrzej Pietrasiewicz <andrzej.p@samsung.com> |
|---|---|
| Date | 2017-06-29 14:10 +0200 |
| Subject | Re: [PATCH v3 3/8] [media] s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() |
| Message-ID | <tXGqK-7pH-3@gated-at.bofh.it> |
| In reply to | #1675955 |
W dniu 27.06.2017 o 18:08, Thierry Escande pisze:
> This patch modifies the s5p_jpeg_parse_hdr() function so it only
> modifies the passed s5p_jpeg_q_data structure if the jpeg header parsing
> is successful.
>
> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> ---
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 38 ++++++++++++++++-------------
> 1 file changed, 21 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index 0d935f5..df3e5ee 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -1206,22 +1206,9 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
> break;
> }
> }
> - result->w = width;
> - result->h = height;
> - result->sos = sos;
> - result->dht.n = n_dht;
> - while (n_dht--) {
> - result->dht.marker[n_dht] = dht[n_dht];
> - result->dht.len[n_dht] = dht_len[n_dht];
> - }
> - result->dqt.n = n_dqt;
> - while (n_dqt--) {
> - result->dqt.marker[n_dqt] = dqt[n_dqt];
> - result->dqt.len[n_dqt] = dqt_len[n_dqt];
> - }
> - result->sof = sof;
> - result->sof_len = sof_len;
> - result->size = result->components = components;
> +
> + if (notfound || !sos)
> + return false;
>
> switch (subsampling) {
> case 0x11:
> @@ -1240,7 +1227,24 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result,
> return false;
> }
>
> - return !notfound && sos;
> + result->w = width;
> + result->h = height;
> + result->sos = sos;
> + result->dht.n = n_dht;
> + while (n_dht--) {
> + result->dht.marker[n_dht] = dht[n_dht];
> + result->dht.len[n_dht] = dht_len[n_dht];
> + }
> + result->dqt.n = n_dqt;
> + while (n_dqt--) {
> + result->dqt.marker[n_dqt] = dqt[n_dqt];
> + result->dqt.len[n_dqt] = dqt_len[n_dqt];
> + }
> + result->sof = sof;
> + result->sof_len = sof_len;
> + result->size = result->components = components;
> +
> + return true;
> }
>
> static int s5p_jpeg_querycap(struct file *file, void *priv,
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web