diff options
| author | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2017-02-02 23:57:29 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@imgtec.com> | 2017-02-28 13:38:09 +0000 |
| commit | 5ee9cb4b4b6964bcd463b0490f3027e6ccfbf45a (patch) | |
| tree | f68fc4433d362a1479b2061debf65b06ad9b7dab /intel | |
| parent | 1bf96af525436d3727d44d137fe922b491512b14 (diff) | |
intel: avoid null pointer dereference
Move the dereference after the null check.
Fixes: 028715ee707469189505 ("intel: Avoid the need for most overflow
checks by using a scratch page.")
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Diffstat (limited to 'intel')
| -rw-r--r-- | intel/intel_decode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 803d2029..2721ffd7 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3899,7 +3899,7 @@ drm_intel_decode(struct drm_intel_decode *ctx) int ret; unsigned int index = 0; uint32_t devid; - int size = ctx->base_count * 4; + int size; void *temp; if (!ctx) @@ -3909,6 +3909,7 @@ drm_intel_decode(struct drm_intel_decode *ctx) * the batchbuffer. This lets us avoid a bunch of length * checking in statically sized packets. */ + size = ctx->base_count * 4; temp = malloc(size + 4096); memcpy(temp, ctx->base_data, size); memset((char *)temp + size, 0xd0, 4096); |