summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorBALATON Zoltan2020-06-20 22:56:28 +0200
committerGerd Hoffmann2020-06-30 22:46:28 +0200
commit4decaad9d295c8598bbcba09c40d3fd4a115f1e8 (patch)
tree08b4f135ab507318d5c171d8e66923c266182aa0 /hw
parentsm501: Fix bounds checks (diff)
downloadqemu-4decaad9d295c8598bbcba09c40d3fd4a115f1e8.tar.gz
qemu-4decaad9d295c8598bbcba09c40d3fd4a115f1e8.tar.xz
qemu-4decaad9d295c8598bbcba09c40d3fd4a115f1e8.zip
sm501: Drop unneded variable
We don't need a separate variable to keep track if we allocated memory that needs to be freed as we can test the pointer itself. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: ff9136c3151a15cdfa1d9b7a68acf11cffb8efa4.1592686588.git.balaton@eik.bme.hu Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/display/sm501.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 5ceee4166f..5d2e019575 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -796,13 +796,12 @@ static void sm501_2d_operation(SM501State *s)
de = db + width + height * (width + dst_pitch);
if (rtl && ((db >= sb && db <= se) || (de >= sb && de <= se))) {
/* regions may overlap: copy via temporary */
- int free_buf = 0, llb = width * (1 << format);
+ int llb = width * (1 << format);
int tmp_stride = DIV_ROUND_UP(llb, sizeof(uint32_t));
uint32_t *tmp = tmp_buf;
if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_buf)) {
tmp = g_malloc(tmp_stride * sizeof(uint32_t) * height);
- free_buf = 1;
}
pixman_blt((uint32_t *)&s->local_mem[src_base], tmp,
src_pitch * (1 << format) / sizeof(uint32_t),
@@ -813,7 +812,7 @@ static void sm501_2d_operation(SM501State *s)
dst_pitch * (1 << format) / sizeof(uint32_t),
8 * (1 << format), 8 * (1 << format),
0, 0, dst_x, dst_y, width, height);
- if (free_buf) {
+ if (tmp != tmp_buf) {
g_free(tmp);
}
} else {